Adopt progsigma "Add prognostic cumulus closure description in saSAS u…

…fs-community#1187" (#1) https://github.com/ufs-community/ufs-weather-model/pull/1187/files modified: FV3 modified: tests/default_vars.sh modified: tests/opnReqTests/dcp.sh modified: tests/parm/control.nml.IN new file: tests/parm/field_table/field_table_gfsv16_progsigma
DTC-phytne · Oct 13, 2022 · 02cce26 · 02cce26
1 parent 9454ef7
commit 02cce26
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 3 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -922,6 +922,7 @@ export HWRF_SAMFDEEP=.false.
 export RAS=.false.
 export RANDOM_CLDS=.false.
 export CNVCLD=.true.
+export PROGSIGMA=.false.
 
 # Aerosol convective scavenging
 export FSCAV_AERO="'*:0.0'"

diff --git a/tests/opnReqTests/dcp.sh b/tests/opnReqTests/dcp.sh
@@ -7,8 +7,9 @@ if [[ $application == 'global' ]]; then
     INPES=$JNPES
     JNPES=$temp
   else
-    INPES=6
-    JNPES=4
+    temp=$INPES
+    INPES=$JNPES
+    JNPES=$temp
   fi
 elif [[ $application == 'regional' ]]; then
   if [[ $CI_TEST == 'true' ]]; then

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -199,6 +199,7 @@ deflate_level=1
   rrtmgp_nBandsSW    = 14
   doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT]
   doGP_lwscat        = @[DOGP_LWSCAT]
+  progsigma    = @[PROGSIGMA]
 /
 
 &gfdl_cloud_microphysics_nml

diff --git a/tests/parm/field_table/field_table_gfsv16_progsigma b/tests/parm/field_table/field_table_gfsv16_progsigma
@@ -0,0 +1,47 @@
+# added by FRE: sphum must be present in atmos
+# specific humidity for moist runs
+ "TRACER", "atmos_mod", "sphum"
+           "longname",     "specific humidity"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic cloud water mixing ratio
+ "TRACER", "atmos_mod", "liq_wat"
+           "longname",     "cloud water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+ "TRACER", "atmos_mod", "rainwat"
+           "longname",     "rain mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+ "TRACER", "atmos_mod", "ice_wat"
+           "longname",     "cloud ice mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+ "TRACER", "atmos_mod", "snowwat"
+           "longname",     "snow mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+ "TRACER", "atmos_mod", "graupel"
+           "longname",     "graupel mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic ozone mixing ratio tracer
+ "TRACER", "atmos_mod", "o3mr"
+           "longname",     "ozone mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic subgrid scale turbulent kinetic energy
+ "TRACER", "atmos_mod", "sgs_tke"
+           "longname",     "subgrid scale turbulent kinetic energy"
+           "units",        "m2/s2"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognotsitc sigmab tracer
+ "TRACER", "atmos_mod", "sigmab"
+           "longname",     "sigma fraction"
+           "units",        "fraction"
+       "profile_type", "fixed", "surface_value=0.0" /
+# non-prognostic cloud amount
+ "TRACER", "atmos_mod", "cld_amt"
+           "longname",     "cloud amount"
+           "units",        "1"
+       "profile_type", "fixed", "surface_value=0.0" /
+7 −2		ccpp/data/CCPP_typedefs.F90
+29 −3		ccpp/data/GFS_typedefs.F90
+45 −2		ccpp/data/GFS_typedefs.meta
+20 −0		ccpp/driver/GFS_restart.F90
+0 −5		stochastic_physics/stochastic_physics_wrapper.F90