diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 11d015640..9e8bfc7d3 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -4728,7 +4728,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & !--- GFDL MP parameters Model%lgfdlmprad = lgfdlmprad - !--- Thompson,GFDL,NSSL MP parameter Model%lrefres = lrefres @@ -4825,7 +4824,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%exticeden = exticeden if (Model%exticeden .and. & (Model%imp_physics /= Model%imp_physics_gfdl .and. Model%imp_physics /= Model%imp_physics_thompson .and. & - Model%imp_physics /= Model%imp_physics_nssl)) then + Model%imp_physics /= Model%imp_physics_nssl )) then !see GFS_MP_generic_post.F90; exticeden is only compatible with GFDL, !Thompson, or NSSL MP print *,' Using exticeden = T is only valid when using GFDL, Thompson, or NSSL microphysics.' @@ -6171,7 +6170,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & ' mg_do_ice_gmao=', Model%mg_do_ice_gmao, ' mg_do_liq_liu=', Model%mg_do_liq_liu elseif (Model%imp_physics == Model%imp_physics_gfdl) then !GFDL microphysics - Model%npdf3d = 0 + Model%npdf3d = 0 if(Model%effr_in) then Model%num_p3d = 5 Model%nleffr = 1 @@ -6703,7 +6702,7 @@ subroutine control_print(Model) print *, ' ' endif if (Model%imp_physics == Model%imp_physics_gfdl) then - print *, ' GFDL microphysical parameters (version 1)' + print *, ' GFDL microphysical parameters' print *, ' GFDL MP radiation inter: ', Model%lgfdlmprad print *, ' lrefres : ', Model%lrefres print *, ' ' diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 40619a1cb..2fee7ba12 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4301,7 +4301,7 @@ long_name = choice of GFDL microphysics scheme units = flag dimensions = () - type = integer + type = integer [imp_physics_thompson] standard_name = identifier_for_thompson_microphysics_scheme long_name = choice of Thompson microphysics scheme