Update coupled tests to use P7 configuration, add standalone P7 test …

…suite (#765) * updates coupled regression tests to use P7 configuration using 2021-03-22-06 ICs. * retains a single benchmark configuration test cpld_bmark_p7 for C384mx025 + waves using benchmark ICs (2013-04-01). * implements a single compile (app=S2SW) for all coupled tests (except debug) and controls non-wave tests using namelist variables * adds a suite of P7 tests for the standalone app=ATM. * removes NEMSDatm tests * removes standalone feature tests for features which have been incorporated into the P7 configuration * fixes the ATM output file name for non-integer output time and the diag_time for random output time Co-authored-by: Jun Wang <[email protected]>
ufs-community · Oct 1, 2021 · 4e7a72e · 4e7a72e
1 parent 39dd5ba
commit 4e7a72e
Show file tree

Hide file tree

Showing 115 changed files with 6,287 additions and 10,698 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
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
diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -27,7 +27,7 @@ else
   if [ $MODEL_INITIALIZATION = false ]; then
     #read_inc and iau tests restart from fh=24
     CURRDIR=`pwd`
-    FILEDIR=${CURRDIR}/../${DEP_RUN}${SUFFIX}/RESTART/
+    FILEDIR=${CURRDIR}/../${DEP_RUN}${SUFFIX}/RESTART
   else
     #for warm start from initialiation time
     FILEDIR=@[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_GDAS
@@ -62,7 +62,7 @@ else
     rm -f INPUT/sfc_data.*
     cp ${FILEDIR}/../INPUT/grid_spec.nc INPUT/.
     cp ${FILEDIR}/../INPUT/*_grid.tile*.nc INPUT/.
-    cp ${FILEDIR}/../INPUT/oro_data.tile*.nc INPUT/.
+    cp ${FILEDIR}/../INPUT/oro_data*.nc INPUT/.
     for RFILE in ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
       [ -e $RFILE ] || exit 1
       RFILE_OLD=$(basename $RFILE)
@@ -86,7 +86,18 @@ else
 fi
 cp    @[INPUTDATA_ROOT]/${inputdir}/global_o3prdlos.f77 .
 cp    @[INPUTDATA_ROOT]/${inputdir}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .
+if [ $TILEDFIX = .true. ]; then
+    cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/@[ATMRES]*.nc .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/global_glacier.2x2.grb .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/global_maxice.2x2.grb .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/RTGSST.1982.2012.monthly.clim.grb .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/global_snoclim.1.875.grb .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/CFSR.SEAICE.1982.2012.monthly.clim.grb .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/@[FNSMCC] .
+    cp    @[INPUTDATA_ROOT]/${inputdir}/@[FNMSKH_control] .
+else
+    cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .
+fi
 cp    @[INPUTDATA_ROOT]/${inputdir}/diag_table_gfsv16 ./diag_table
 cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_gfsv16 ./field_table
 

diff --git a/tests/fv3_conf/cpld_bmark_run.IN b/tests/fv3_conf/cpld_bmark_run.IN
diff --git a/tests/fv3_conf/cpld_bmark_tiled_run.IN b/tests/fv3_conf/cpld_bmark_tiled_run.IN