Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CCN-IN followup bugfix #99

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions gfsphysics/GFS_layer/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ module GFS_typedefs

character(len=32), pointer :: tracer_names(:) !< tracers names to dereference tracer id
!< based on name location in array
character(len=65) :: fn_nml !< namelist filename
character(len=64) :: fn_nml !< namelist filename
character(len=256), pointer :: input_nml_file(:) !< character string containing full namelist
!< for use with internal file reads
end type GFS_init_type
Expand Down Expand Up @@ -3330,6 +3330,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%ialb = ialb
Model%iems = iems
Model%iaer = iaer
Model%iaerclm = iaerclm
if (iaer/1000 == 1 .or. Model%iccn == 2) then
Model%iaerclm = .true.
ntrcaer = ntrcaerm
Expand Down Expand Up @@ -3662,7 +3663,11 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%iau_filter_increments = iau_filter_increments
Model%iau_drymassfixer = iau_drymassfixer
if(Model%me==0) print *,' model init,iaufhrs=',Model%iaufhrs


!--- debug flag
Model%debug = debug
Model%pre_rad = pre_rad

!--- tracer handling
Model%ntrac = size(tracer_names)
#ifdef CCPP
Expand Down Expand Up @@ -3782,10 +3787,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%ncnvcld3d = ncnvcld3d
Model%nctp = nctp

!--- debug flag
Model%debug = debug
Model%pre_rad = pre_rad

!--- set initial values for time varying properties
Model%ipt = 1
Model%lprnt = .false.
Expand Down Expand Up @@ -3824,11 +3825,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!--- ps is replaced with p0. The value of p0 uses that in http://www.emc.ncep.noaa.gov/officenotes/newernotes/on461.pdf
!--- ak/bk have been flipped from their original FV3 orientation and are defined sfc -> toa
Model%si = (ak + bk * con_p0 - ak(Model%levr+1)) / (con_p0 - ak(Model%levr+1))

if (Model%lsm == Model%lsm_noahmp) then
Model%yearlen = 365
Model%julian = -9999.
endif
#endif

#ifndef CCPP
Expand Down