ufs-community · climbfuji · Feb 10, 2021 · Feb 5, 2021 · Feb 5, 2021 · Feb 9, 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/UnitTests_hera.intel.log b/tests/UnitTests_hera.intel.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -6,13 +6,15 @@ COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2,FV3_RRFS_v1alpha
 
 # Regional tests
 RUN     | fv3_ccpp_regional_control                                              | standard    |                | fv3         |
-# The following test does NOT reproduce the control baseline
-#RUN     | fv3_ccpp_regional_decomp                                               | standard    |                |             |
+RUN     | fv3_ccpp_regional_decomp                                               | standard    |                |             |
 RUN     | fv3_ccpp_regional_2threads                                             | standard    |                |             |
 RUN     | fv3_ccpp_regional_coldstart                                            | standard    |                |             |
 # The following test does NOT reproduce the control baseline
 #RUN     | fv3_ccpp_regional_warmstart                                            | standard    |                |             | fv3_ccpp_regional_coldstart
 RUN     | fv3_ccpp_regional_v15p2                                                | standard    |                | fv3         |
+RUN     | fv3_ccpp_regional_v15p2_2threads                                       | standard    |                |             |
+# This test only reproduces in REPRO mode (because of GFDL-MP fast physics in 32-bit)
+#RUN     | fv3_ccpp_regional_v15p2_decomp                                         | standard    |                |             |
 
 # Global tests
 RUN     | fv3_ccpp_rrfs_v1alpha                                                  | standard    |                | fv3         |
@@ -23,6 +25,15 @@ RUN     | fv3_ccpp_rrfs_v1alpha_coldstart
 #RUN     | fv3_ccpp_rrfs_v1alpha_warmstart                                        | standard    |                |             | fv3_ccpp_rrfs_v1alpha_coldstart
 RUN     | fv3_ccpp_gfs_v15p2                                                     | standard    |                | fv3         |
 
+###############################################################################################################################
+# CCPP REPRO TESTS                                                                                                            #
+###############################################################################################################################
+
+COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2,FV3_RRFS_v1alpha REPRO=Y                   | standard    |                | fv3         |
+# Regional tests
+RUN     | fv3_ccpp_regional_v15p2                                                | standard    |                | fv3         |
+RUN     | fv3_ccpp_regional_v15p2_decomp                                         | standard    |                |             |
+
 ###############################################################################################################################
 # CCPP DEBUG TESTS                                                                                                            #
 ###############################################################################################################################

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -249,7 +249,7 @@ elif [[ $MACHINE_ID = orion.* ]]; then
 #  ACCNR= # detected in detect_machine.sh
   PARTITION=orion
   dprefix=/work/noaa/stmp/${USER}
-  DISKNM=/work/noaa/fv3-cam/djovic/RT
+  DISKNM=/work/noaa/nems/emc.nemspara/RT
   STMP=$dprefix/stmp
   PTMP=$dprefix/stmp
 
@@ -356,11 +356,6 @@ SINGLE_NAME=''
 
 TESTS_FILE='rt.conf'
 
-if [[ $MACHINE_ID = orion.* ]]; then
-  TESTS_FILE='rt_orion.conf'
-fi
-
-
 SET_ID='standard'
 while getopts ":cfsl:mn:kreh" opt; do
   case $opt in
@@ -418,9 +413,9 @@ if [[ $SINGLE_NAME != '' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/ufs-public-release-v2-20210126/${COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/ufs-public-release-v2-20210208/${COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/ufs-public-release-v2-20210126}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/ufs-public-release-v2-20210208}
 fi
 
 shift $((OPTIND-1))

diff --git a/tests/tests/fv3_ccpp_regional_decomp b/tests/tests/fv3_ccpp_regional_decomp
@@ -10,12 +10,13 @@ export CNTL_DIR=fv3_regional_control
 
 export LIST_FILES="atmos_4xdaily.nc \
                    phyf000.nc \
+                   phyf006.nc \
                    phyf012.nc \
                    dynf000.nc \
+                   dynf006.nc \
                    dynf012.nc \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
                    RESTART/fv_srf_wnd.res.tile1.nc \
                    RESTART/fv_tracer.res.tile1.nc \
                    RESTART/sfc_data.nc \
@@ -68,3 +69,7 @@ RUN_SCRIPT=rt_fv3.sh
 
 # Regional option
 export WRITE_RESTART_WITH_BCS=.true.
+
+if [[ $MACHINE_ID = *.gnu ]]; then
+  export WLCLK=60
+fi
diff --git a/tests/tests/fv3_ccpp_regional_v15p2_2threads b/tests/tests/fv3_ccpp_regional_v15p2_2threads
@@ -0,0 +1,61 @@
+###############################################################################
+#
+#  FV3 CCPP regional control test using GFS v15p2 suite with 32-bit dynamics
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 CCPP regional GFS v15p2 results with previous trunk version"
+
+export CNTL_DIR=fv3_regional_v15p2
+
+export LIST_FILES="atmos_4xdaily.nc \
+                   phyf000.nc \
+                   phyf012.nc \
+                   dynf000.nc \
+                   dynf012.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/sfc_data.nc \
+                   RESTART/phy_data.nc"
+
+export_fv3
+export THRD=2
+export TASKS=80
+export TPN=$(expr $TPN / 2)
+export NODES=$(expr $TASKS / $TPN + 1)
+
+export INPES=20
+export JNPES=2
+
+export FHMAX=12
+export FDIAG=3
+
+DT_ATMOS="300"
+
+export FV3_RUN=ccpp_regional_run.IN
+export CCPP_SUITE=FV3_GFS_v15p2
+export CCPP_LIB_DIR=ccpp/lib
+export INPUT_NML=ccpp_regional.nml.IN
+export MODEL_CONFIGURE=ccpp_regional-model_configure.IN
+
+# Ozone / stratospheric H2O
+export OZ_PHYS_OLD=.F.
+export OZ_PHYS_NEW=.T.
+export H2O_PHYS=.T.
+
+# GFDL microphysics
+export IMP_PHYSICS=11
+
+# Other namelist switches
+export HYBEDMF=.T.
+export FHCYC=0
+
+RUN_SCRIPT=rt_fv3.sh
+
+# Regional option
+export WRITE_RESTART_WITH_BCS=.true.
+
+export WLCLK=60
diff --git a/tests/tests/fv3_ccpp_regional_v15p2_decomp b/tests/tests/fv3_ccpp_regional_v15p2_decomp
@@ -0,0 +1,60 @@
+###############################################################################
+#
+#  FV3 CCPP regional control test using GFS v15p2 suite with 32-bit dynamics
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 CCPP regional GFS v15p2 results with previous trunk version"
+
+export CNTL_DIR=fv3_regional_v15p2
+
+export LIST_FILES="atmos_4xdaily.nc \
+                   phyf000.nc \
+                   phyf012.nc \
+                   dynf000.nc \
+                   dynf012.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/sfc_data.nc \
+                   RESTART/phy_data.nc"
+
+export_fv3
+export TASKS=80
+export NODES=$(expr $TASKS / $TPN + 1)
+
+export INPES=10
+export JNPES=4
+
+export FHMAX=12
+export FDIAG=3
+
+DT_ATMOS="300"
+
+export FV3_RUN=ccpp_regional_run.IN
+export CCPP_SUITE=FV3_GFS_v15p2
+export CCPP_LIB_DIR=ccpp/lib
+export INPUT_NML=ccpp_regional.nml.IN
+export MODEL_CONFIGURE=ccpp_regional-model_configure.IN
+
+# Ozone / stratospheric H2O
+export OZ_PHYS_OLD=.F.
+export OZ_PHYS_NEW=.T.
+export H2O_PHYS=.T.
+
+# GFDL microphysics
+export IMP_PHYSICS=11
+
+# Other namelist switches
+export HYBEDMF=.T.
+export FHCYC=0
+
+RUN_SCRIPT=rt_fv3.sh
+
+# Regional option
+export WRITE_RESTART_WITH_BCS=.true.
+
+if [[ $MACHINE_ID = *.gnu ]]; then
+  export WLCLK=60
+fi