ufs-community · junwang-noaa · Mar 3, 2021 · Feb 17, 2021 · Feb 17, 2021 · Feb 18, 2021
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_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
@@ -399,6 +399,8 @@ export LSM=1
 export LSOIL_LSM=4
 export LANDICE=.T.
 export KICE=2
+export IALB=1
+export IEMS=1
 
 # Ozone / stratospheric H2O
 export OZ_PHYS_OLD=.T.

diff --git a/tests/parm/ccpp_gfdlmp.nml.IN b/tests/parm/ccpp_gfdlmp.nml.IN
@@ -128,8 +128,8 @@
        pdfcld         = .false.
        fhswr          = 3600.
        fhlwr          = 3600.
-       ialb           = 1
-       iems           = 1
+       ialb           = @[IALB]
+       iems           = @[IEMS]
        IAER           = 111
        ico2           = 2
        isubc_sw       = 2

diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN
@@ -132,8 +132,8 @@
        pdfcld         = .false.
        fhswr          = 3600.
        fhlwr          = 3600.
-       ialb           = 1
-       iems           = 1
+       ialb           = @[IALB]
+       iems           = @[IEMS]
        iaer           = @[IAER]
        icliq_sw       = @[ICLIQ_SW]
        iovr           = @[IOVR]

diff --git a/tests/parm/ccpp_v16_c96_rrtmgp.nml.IN b/tests/parm/ccpp_v16_c96_rrtmgp.nml.IN
@@ -41,7 +41,7 @@ deflate_level=1
 /
 
 &fv_core_nml
-  layout = 3,8
+  layout = @[INPES],@[JNPES]
   io_layout = 1,1
   npx = 97
   npy = 97

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -81,7 +81,7 @@ RUN     | fv3_ccpp_gfs_v16_stochy
 RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                               |  - cheyenne.intel                       | fv3 |
 RUN     | fv3_ccpp_gfs_v16_RRTMGP                                                                                                 |                                         | fv3 |
 RUN     | fv3_ccpp_gfs_v16_RRTMGP_c192L127                                                                                        |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v16_RRTMGP_2thrd                                                                                           |  - wcoss_cray                           | fv3 |
+RUN     | fv3_ccpp_gfs_v16_RRTMGP_2thrd                                                                                           |                                         | fv3 |
 
 COMPILE | SUITES=FV3_GFS_v16_csawmg                                                                                               |                                         | fv3 |
 # fv3_ccpp_gfsv16_csawmg crashes with a "bus error" on cheyenne.intel, turn off both tests

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -415,9 +415,9 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210217/${RT_COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210301/${RT_COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210217}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210301}
 fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210212}

diff --git a/tests/tests/fv3_ccpp_gfdlmprad_noahmp b/tests/tests/fv3_ccpp_gfdlmprad_noahmp
@@ -59,6 +59,10 @@ export LGFDLMPRAD=.true.
 export EFFR_IN=.true.
 export LSM=2
 export LANDICE=.false.
+export LHEATSTRG=.false.
+export IALB=2
+export IEMS=2
+
 
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"

diff --git a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP_2thrd b/tests/tests/fv3_ccpp_gfs_v16_RRTMGP_2thrd
@@ -74,7 +74,12 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 export THRD=2
+export TASKS=$TASKS_thrd
 export TPN=$TPN_thrd
+export INPES=$INPES_thrd
+export JNPES=$JNPES_thrd
+export WRTTASK_PER_GROUP=12
+
 DT_ATMOS="1200"
 export DO_RRTMGP=.T.
 

diff --git a/tests/tests/fv3_ccpp_rrfs_v1beta b/tests/tests/fv3_ccpp_rrfs_v1beta
@@ -93,6 +93,8 @@ export IMFSHALCNV=-1
 export IMFDEEPCNV=-1
 export LSM=2
 export LSOIL_LSM=4
+export IALB=2
+export IEMS=2
 #export GWD_OPT=3
 #export DO_UGWP_V0=.F.
 #export DO_UGWP_V0_OROG_ONLY=.F.

diff --git a/tests/tests/fv3_ccpp_rrfs_v1beta_debug b/tests/tests/fv3_ccpp_rrfs_v1beta_debug
@@ -93,6 +93,9 @@ export IMFSHALCNV=-1
 export IMFDEEPCNV=-1
 export LSM=2
 export LSOIL_LSM=4
+export IALB=2
+export IEMS=2
+
 #export GWD_OPT=3
 #export DO_UGWP_V0=.F.
 #export DO_UGWP_V0_OROG_ONLY=.F.