ufs-community · junwang-noaa · Dec 1, 2021 · Feb 17, 2021 · Oct 26, 2021 · Oct 26, 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/parm/regional.nml.IN b/tests/parm/regional.nml.IN
@@ -183,7 +183,7 @@
        oz_phys        = @[OZ_PHYS_OLD]
        oz_phys_2015   = @[OZ_PHYS_NEW]
        h2o_phys       = @[H2O_PHYS]
-       nstf_name      = 1,1,1,0,5
+       nstf_name      = 2,0,0,0,0
        cplflx         = .false.
        iau_delthrs    = 6
        iaufhrs        = 30

diff --git a/tests/parm/regional_c768.nml.IN b/tests/parm/regional_c768.nml.IN
@@ -166,7 +166,7 @@
        oz_phys        = @[OZ_PHYS_OLD]
        oz_phys_2015   = @[OZ_PHYS_NEW]
        h2o_phys       = @[H2O_PHYS]
-       nstf_name      = 1,1,1,0,5
+       nstf_name      = 2,0,0,0,0
        cplflx         = .false.
        iau_delthrs    = 6
        iaufhrs        = 30

diff --git a/tests/parm/regional_rrtmgp.nml.IN b/tests/parm/regional_rrtmgp.nml.IN
@@ -183,7 +183,7 @@
        oz_phys        = @[OZ_PHYS_OLD]
        oz_phys_2015   = @[OZ_PHYS_NEW]
        h2o_phys       = @[H2O_PHYS]
-       nstf_name      = 1,1,1,0,5
+       nstf_name      = 2,0,0,0,0
        cplflx         = .false.
        iau_delthrs    = 6
        iaufhrs        = 30

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -53,11 +53,11 @@ RUN     | control_2threads_p7
 
 RUN     | regional_control                                                                                                        |                                         | fv3 |
 RUN     | regional_restart                                                                                                        |                                         | fv3 | regional_control
-RUN     | regional_quilt                                                                                                          |                                         | fv3 |
-RUN     | regional_quilt_2threads                                                                                                 | - wcoss_cray jet.intel                  |     |
-RUN     | regional_quilt_hafs                                                                                                     |                                         | fv3 |
-RUN     | regional_quilt_netcdf_parallel                                                                                          | - wcoss2                                | fv3 |
-RUN     | regional_quilt_RRTMGP                                                                                                   |                                         | fv3 |
+RUN     | regional_noquilt                                                                                                        |                                         | fv3 |
+RUN     | regional_2threads                                                                                                       | - wcoss_cray jet.intel                  |     |
+RUN     | regional_hafs                                                                                                           |                                         | fv3 |
+RUN     | regional_netcdf_parallel                                                                                                | - wcoss2                                | fv3 |
+RUN     | regional_RRTMGP                                                                                                         |                                         | fv3 |
 
 RUN     | fv3_gsd                                                                                                                 |                                         | fv3 |
 RUN     | fv3_rrfs_v1alpha                                                                                                        |                                         | fv3 |
@@ -114,8 +114,7 @@ RUN     | control_thompson_debug
 RUN     | control_thompson_no_aero_debug                                                                                          |                                         | fv3 |
 RUN     | control_thompson_extdiag_debug                                                                                          |                                         | fv3 |
 
-RUN     | regional_control_debug                                                                                                  |                                         | fv3 |
-RUN     | regional_quilt_debug                                                                                                    |                                         | fv3 |
+RUN     | regional_debug                                                                                                          |                                         | fv3 |
 RUN     | fv3_gsd_debug                                                                                                           |                                         | fv3 |
 RUN     | fv3_gsd_diag_debug                                                                                                      |                                         | fv3 |
 RUN     | fv3_rrfs_v1beta_debug                                                                                                   |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -460,7 +460,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20211119
+BL_DATE=20211130
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -35,7 +35,7 @@ RUN     | fv3_rrfs_v1beta
 COMPILE | -DAPP=ATM -D32BIT=ON -DDEBUG=ON                                                                                         |                | fv3         |
 RUN     | control_debug                                                                                                           |                | fv3         |
 RUN     | control_diag_debug                                                                                                      |                | fv3         |
-RUN     | regional_control_debug                                                                                                  |                | fv3         |
+RUN     | regional_debug                                                                                                          |                | fv3         |
 RUN     | fv3_rrfs_v1alpha_debug                                                                                                  |                | fv3         |
 RUN     | fv3_rrfs_v1beta_debug                                                                                                   |                | fv3         |
 RUN     | fv3_gsd_debug                                                                                                           |                | fv3         |

diff --git a/tests/tests/regional_quilt_2threads → tests/tests/regional_2threads b/tests/tests/regional_quilt_2threads → tests/tests/regional_2threads
@@ -4,9 +4,9 @@
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP regional quilt results with previous trunk version"
+export TEST_DESCR="Compare FV3 regional results with previous trunk version"
 
-export CNTL_DIR=fv3_regional_quilt
+export CNTL_DIR=fv3_regional_control
 
 export LIST_FILES="dynf000.nc \
                    dynf024.nc \
@@ -39,4 +39,3 @@ export JNPES=6
 export THRD=2
 export TPN=$TPN_thrd
 export OUTPUT_FH="12 -1"
-
diff --git a/tests/tests/regional_quilt_RRTMGP → tests/tests/regional_RRTMGP b/tests/tests/regional_quilt_RRTMGP → tests/tests/regional_RRTMGP
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-#  FV3 CCPP regional control test using RRTMGP radiaiton
+#  FV3 regional control test using RRTMGP radiaiton
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP w/ RRTMGP regional quilt results with previous trunk version"
+export TEST_DESCR="Compare FV3 w/ RRTMGP regional results with previous trunk version"
 
-export CNTL_DIR=fv3_regional_quilt_RRTMGP
+export CNTL_DIR=fv3_regional_RRTMGP
 
 export LIST_FILES="dynf000.nc \
                    dynf024.nc \
@@ -38,4 +38,3 @@ export FIELD_TABLE=field_table_regional
 export INPES=10
 export JNPES=6
 export OUTPUT_FH="12 -1"
-
diff --git a/tests/tests/regional_control b/tests/tests/regional_control
@@ -1,38 +1,40 @@
 ###############################################################################
 #
-#  FV3 CCPP regional control test
+#  FV3 regional control test
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP regional control results with previous trunk version"
+export TEST_DESCR="Compare FV3 regional results with previous trunk version"
 
 export CNTL_DIR=fv3_regional_control
 
-export LIST_FILES="  atmos_4xdaily.nc \
-                     fv3_history2d.nc \
-                       fv3_history.nc \
-     RESTART/fv_core.res.tile1_new.nc \
-   RESTART/fv_tracer.res.tile1_new.nc"
+export LIST_FILES="dynf000.nc \
+                   dynf024.nc \
+                   phyf000.nc \
+                   phyf024.nc \
+                   PRSLEV.GrbF00 \
+                   PRSLEV.GrbF24 \
+                   NATLEV.GrbF00 \
+                   NATLEV.GrbF24"
 
 export_fv3
 
-export TASKS=60
-
 export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.false.
 export OZ_PHYS_NEW=.true.
 export H2O_PHYS=.true.
 export HYBEDMF=.false.
 export RESTART_INTERVAL="12 -1"
-export QUILTING=.false.
-export MODEL_CONFIGURE=model_configure_regional.IN
+export WRITE_DOPOST=.true.
+export POSTAPP='lam'
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
 export INPUT_NML=regional.nml.IN
+export MODEL_CONFIGURE=model_configure_regional.IN
 export FIELD_TABLE=field_table_regional
 
+export TASKS=68
 export INPES=10
 export JNPES=6
-export WRITE_RESTART_WITH_BCS=.true.
-export OUTPUT_FH="3 6 9 12 15 18 21 24"
+export OUTPUT_FH="12 -1"
diff --git a/tests/tests/regional_quilt_debug → tests/tests/regional_debug b/tests/tests/regional_quilt_debug → tests/tests/regional_debug
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-#  FV3 CCPP regional control test
+#  FV3 regional debug control test
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP regional quilt results with previous trunk version"
+export TEST_DESCR="Compare FV3 regional debug results with previous trunk version"
 
-export CNTL_DIR=fv3_regional_quilt_debug
+export CNTL_DIR=fv3_regional_debug
 
 export LIST_FILES="dynf000.nc \
                    dynf001.nc \
@@ -21,7 +21,6 @@ export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
 export H2O_PHYS=.T.
 export HYBEDMF=.F.
-#export WRITE_DOPOST=.true.
 export POSTAPP='lam'
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn

diff --git a/tests/tests/regional_quilt_decomp → tests/tests/regional_decomp b/tests/tests/regional_quilt_decomp → tests/tests/regional_decomp
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-#  FV3 CCPP regional control quilt decomposition test
+#  FV3 regional control decomposition test
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP regional quilt decomposition results with previous trunk version"
+export TEST_DESCR="Compare FV3 CCPP regional decomposition results with previous trunk version"
 
-export CNTL_DIR=fv3_regional_quilt
+export CNTL_DIR=fv3_regional_control
 
 export LIST_FILES="dynf000.nc \
                    dynf024.nc \
@@ -37,4 +37,3 @@ export TASKS=68
 export INPES=5
 export JNPES=12
 export OUTPUT_FH="12 -1"
-
diff --git a/tests/tests/regional_quilt_hafs → tests/tests/regional_hafs b/tests/tests/regional_quilt_hafs → tests/tests/regional_hafs
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-#  FV3 CCPP regional control test
+#  FV3 regional hafs test
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP regional quilt results with previous trunk version"
+export TEST_DESCR="Compare FV3 regional hafs results with previous trunk version"
 
-export CNTL_DIR=fv3_regional_quilt_hafs
+export CNTL_DIR=fv3_regional_hafs
 
 export LIST_FILES="dynf000.nc \
                    dynf024.nc \
@@ -35,4 +35,3 @@ export FIELD_TABLE=field_table_regional
 
 export INPES=10
 export JNPES=6
-
diff --git a/tests/tests/regional_quilt_netcdf_parallel → tests/tests/regional_netcdf_parallel b/tests/tests/regional_quilt_netcdf_parallel → tests/tests/regional_netcdf_parallel
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-#  FV3 CCPP regional quilt test with parallel netcdf
+#  FV3 regional parallel netcdf test
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP regional quilt results with parallel netcdf with previous trunk version"
+export TEST_DESCR="Compare FV3 regional with parallel netcdf results with previous trunk version"
 
-export CNTL_DIR=fv3_regional_quilt_netcdf_parallel
+export CNTL_DIR=fv3_regional_netcdf_parallel
 
 export LIST_FILES="  atmos_4xdaily.nc \
                            dynf000.nc \
@@ -35,4 +35,3 @@ export FIELD_TABLE=field_table_regional
 export INPES=10
 export JNPES=6
 export OUTPUT_FH="12 -1"
-
diff --git a/tests/tests/regional_control_debug → tests/tests/regional_noquilt b/tests/tests/regional_control_debug → tests/tests/regional_noquilt
@@ -1,12 +1,12 @@
 ###############################################################################
 #
-#  FV3 CCPP regional control test
+#  FV3 regional noquilt test
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP regional control results with previous trunk version"
+export TEST_DESCR="Compare FV3 regional noquilt test results with previous trunk version"
 
-export CNTL_DIR=fv3_regional_control_debug
+export CNTL_DIR=fv3_regional_noquilt
 
 export LIST_FILES="  atmos_4xdaily.nc \
                      fv3_history2d.nc \
@@ -17,14 +17,14 @@ export LIST_FILES="  atmos_4xdaily.nc \
 export_fv3
 
 export TASKS=60
-export FHMAX="01"
 
 export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.false.
 export OZ_PHYS_NEW=.true.
 export H2O_PHYS=.true.
 export HYBEDMF=.false.
+export RESTART_INTERVAL="12 -1"
 export QUILTING=.false.
 export MODEL_CONFIGURE=model_configure_regional.IN
 
@@ -35,4 +35,4 @@ export FIELD_TABLE=field_table_regional
 export INPES=10
 export JNPES=6
 export WRITE_RESTART_WITH_BCS=.true.
-export OUTPUT_FH="0 1"
+export OUTPUT_FH="3 6 9 12 15 18 21 24"
diff --git a/tests/tests/regional_quilt b/tests/tests/regional_quilt
diff --git a/tests/tests/regional_restart b/tests/tests/regional_restart
@@ -1,46 +1,42 @@
 ###############################################################################
 #
-#  FV3 CCPP regional restart test
+#  FV3 regional restart test
 #
 ###############################################################################
 
-export TEST_DESCR="Compare FV3 CCPP regional restart results with previous trunk version"
+export TEST_DESCR="Compare FV3 regional restart results with previous trunk version"
 
-export CNTL_DIR=fv3_regional_restart
+export CNTL_DIR=fv3_regional_control
 
-export LIST_FILES="  atmos_4xdaily.nc \
-                     fv3_history2d.nc \
-                       fv3_history.nc "
+export LIST_FILES="dynf024.nc \
+                   phyf024.nc \
+                   PRSLEV.GrbF24 \
+                   NATLEV.GrbF24"
 
 export_fv3
 
-export TASKS=60
-export WARM_START=.true.
-
 export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.false.
 export OZ_PHYS_NEW=.true.
 export H2O_PHYS=.true.
 export HYBEDMF=.false.
-export QUILTING=.false.
-export MODEL_CONFIGURE=model_configure_regional.IN
+export WRITE_DOPOST=.true.
+export POSTAPP='lam'
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
 export INPUT_NML=regional.nml.IN
+export MODEL_CONFIGURE=model_configure_regional.IN
 export FIELD_TABLE=field_table_regional
 
-export INPES=10
-export JNPES=6
-
 export WARM_START=.true.
 export NGGPS_IC=.false.
 export EXTERNAL_IC=.false.
-# DH* The correct setting would be .false.? However the official
-#     regression test baseline uses MAKE_NH=.true.
-#export MAKE_NH=.false.
-export MAKE_NH=.true.
-# *DH
+export MAKE_NH=.false.
 export MOUNTAIN=.true.
 export NA_INIT=0
+
+export TASKS=68
+export INPES=10
+export JNPES=6
 export OUTPUT_FH="15 18 21 24"