Skip to content

Commit 40e83b4

Browse files
committed
update GFS_typedefs for fv3atm PR#899; update ccpp/physics and ccpp/framework submodule pointers
1 parent 0527047 commit 40e83b4

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

ccpp/framework

Submodule framework updated 118 files

scm/src/GFS_typedefs.F90

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,8 @@ module GFS_typedefs
800800
!< (yr, mon, day, t-zone, hr, min, sec, mil-sec)
801801
integer :: idate(4) !< initial date with different size and ordering
802802
!< (hr, mon, day, yr)
803+
logical :: gfs_phys_time_vary_is_init=.false. !< GFS_phys_time_vary interstitial initialization flag
804+
803805
!--- radiation control parameters
804806
real(kind=kind_phys) :: fhswr !< frequency for shortwave radiation (secs)
805807
real(kind=kind_phys) :: fhlwr !< frequency for longwave radiation (secs)
@@ -1026,7 +1028,7 @@ module GFS_typedefs
10261028
real(kind=kind_phys) :: dt_inner !< time step for the inner loop in s
10271029
logical :: sedi_semi !< flag for semi Lagrangian sedi of rain
10281030
integer :: decfl !< deformed CFL factor
1029-
logical :: thpsnmp_is_init !< Local scheme initialization flag
1031+
logical :: thompson_mp_is_init=.false. !< Local scheme initialization flag
10301032

10311033
!--- GFDL microphysical paramters
10321034
logical :: lgfdlmprad !< flag for GFDL mp scheme and radiation consistency
@@ -1216,6 +1218,7 @@ module GFS_typedefs
12161218
integer :: ichoice = 0 !< flag for closure of C3/GF deep convection
12171219
integer :: ichoicem = 13!< flag for closure of C3/GF mid convection
12181220
integer :: ichoice_s = 3 !< flag for closure of C3/GF shallow convection
1221+
logical :: gf_coldstart !< flag for cold start GF
12191222
integer :: conv_cf_opt !< option for convection scheme cloud fraction computation
12201223
!< 0: Chaboureau-Bechtold
12211224
!< 1: Xu-Randall
@@ -3996,6 +3999,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
39963999
integer :: ichoice = 0 !< flag for closure of C3/GF deep convection
39974000
integer :: ichoicem = 13!< flag for closure of C3/GF mid convection
39984001
integer :: ichoice_s = 3 !< flag for closure of C3/GF shallow convection
4002+
logical :: gf_coldstart = .false. !< flag for cold start GF
39994003

40004004
!-- chem nml variables for RRFS-SD
40014005
real(kind=kind_phys) :: dust_drylimit_factor = 1.0
@@ -4225,7 +4229,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
42254229
do_smoke_transport,smoke_conv_wet_coef,n_dbg_lines, &
42264230
add_fire_moist_flux, sc_factor, &
42274231
!--- C3/GF closures
4228-
ichoice,ichoicem,ichoice_s, &
4232+
ichoice,ichoicem,ichoice_s,gf_coldstart, &
42294233
!--- (DFI) time ranges with radar-prescribed microphysics tendencies
42304234
! and (maybe) convection suppression
42314235
fh_dfi_radar, radar_tten_limits, do_cap_suppress, &
@@ -4237,8 +4241,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
42374241
! do_land_iau, land_iau_delthrs, land_iau_inc_files, &
42384242
! land_iau_fhrs, land_iau_filter_increments, lsoil_incr, &
42394243
! land_iau_upd_stc, land_iau_upd_slc, &
4240-
! land_iau_do_stcsmc_adjustment, land_iau_min_T_increment
4241-
4244+
! land_iau_do_stcsmc_adjustment, land_iau_min_T_increment
4245+
42424246

42434247
!--- other parameters
42444248
integer :: nctp = 0 !< number of cloud types in CS scheme
@@ -4549,6 +4553,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
45494553
Model%ichoice_s = ichoice_s
45504554
Model%ichoicem = ichoicem
45514555
Model%ichoice = ichoice
4556+
Model%gf_coldstart = gf_coldstart
45524557

45534558
!--- integrated dynamics through earth's atmosphere
45544559
Model%lsidea = lsidea
@@ -6663,6 +6668,7 @@ subroutine control_print(Model)
66636668
print*,'ichoice_s : ', Model%ichoice_s
66646669
print*,'ichoicem : ', Model%ichoicem
66656670
print*,'ichoice : ', Model%ichoice
6671+
print*,'gf_coldstart : ', Model%gf_coldstart
66666672
endif
66676673
if(model%rrfs_sd) then
66686674
print *, ' '

scm/src/GFS_typedefs.meta

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4925,12 +4925,18 @@
49254925
units = count
49264926
dimensions = ()
49274927
type = integer
4928-
[thpsnmp_is_init]
4928+
[thompson_mp_is_init]
49294929
standard_name = flag_for_thompson_mp_scheme_initialization
49304930
long_name = flag carrying scheme initialization status
49314931
units = flag
49324932
dimensions = ()
49334933
type = logical
4934+
[gfs_phys_time_vary_is_init]
4935+
standard_name = flag_for_gfs_phys_time_vary_interstitial_initialization
4936+
long_name = flag carrying interstitial initialization status
4937+
units = flag
4938+
dimensions = ()
4939+
type = logical
49344940
[lgfdlmprad]
49354941
standard_name = flag_for_GFDL_microphysics_radiation_interaction
49364942
long_name = flag for GFDL microphysics-radiation interaction
@@ -5637,6 +5643,12 @@
56375643
units = flag
56385644
dimensions = ()
56395645
type = integer
5646+
[gf_coldstart]
5647+
standard_name = flag_for_cold_start_gf
5648+
long_name = flag to cold start G-F
5649+
units = flag
5650+
dimensions = ()
5651+
type = logical
56405652
[hwrf_samfdeep]
56415653
standard_name = flag_for_hurricane_specific_code_in_scale_aware_mass_flux_deep_convection
56425654
long_name = flag for hwrf samfdeepcnv scheme

0 commit comments

Comments
 (0)