ufs-community · jkbk2004 · Jun 3, 2022 · Apr 13, 2022 · Apr 18, 2022 · Apr 19, 2022
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -420,6 +420,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.3","so2:0.0","msa:0.0","dms:0.0","nh3:0.4","nh4:0.6","bc1:0.6","bc2:0.6","dust1:0.6","dust2:0.6","dust3:0.6","dust4:0.6","dust5:0.6","seas1:0.5","seas2:0.5","seas3:0.5","seas4:0.5","seas5:0.5"'

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" /
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -37,6 +37,7 @@ RUN     | control_c48
 RUN     | control_c192                                                                                                            |                                         | fv3 |
 RUN     | control_c384                                                                                                            | - wcoss_cray                            | fv3 |
 RUN     | control_c384gdas                                                                                                        | - wcoss_cray                            | fv3 |
+RUN     | control_c384_progsigma                                                                                                  | - wcoss_cray                            | fv3 |
 RUN     | control_stochy                                                                                                          |                                         | fv3 |
 RUN     | control_stochy_restart                                                                                                  |                                         |     | control_stochy
 RUN     | control_lndp                                                                                                            |                                         | fv3 |

diff --git a/tests/tests/control_c384_progsigma b/tests/tests/control_c384_progsigma
@@ -0,0 +1,57 @@
+###############################################################################
+#
+#  global control test: GFSv16 atmosphere only at C96L127
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control C384L127 results with previous trunk version"
+
+export CNTL_DIR=control_c384_progsigma
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf012.nc \
+                   atmf000.nc \
+                   atmf012.nc \
+                   GFSFLX.GrbF00 \
+                   GFSFLX.GrbF12 \
+                   GFSPRS.GrbF00 \
+                   GFSPRS.GrbF12"
+
+export_fv3
+export TASKS=${TASKS_c384}
+export THRD=${THRD_c384}
+export INPES=${INPES_c384}
+export JNPES=${JNPES_c384}
+export WRITE_GROUP=1
+export WRTTASK_PER_GROUP=48
+export FHMAX=12
+export NPZ=127
+export NPZP=128
+export NPX=385
+export NPY=385
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export DT_ATMOS=225
+export RESTART_INTERVAL=0
+export CDMBWD=${CDMBWD_c384}
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.true.
+export IAER=5111
+export IOVR=3
+export IMO=1536
+export JMO=768
+export OUTPUT_FH="6 -1"
+export PROGSIGMA=.true.
+
+export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
+export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
+export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
+export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16
+export INPUT_NML=control.nml.IN
+export FIELD_TABLE=field_table_gfsv16_progsigma