Merge branch 'develop' into feature/search_doc

Fixes ufs-community#278
GeorgeGayno-NOAA · Apr 20, 2021 · ddca6cf · ddca6cf
2 parents ef05f86 + 8655909
commit ddca6cf
Show file tree

Hide file tree

Showing 30 changed files with 100 additions and 97 deletions.
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ directory):
 - sfc_climo_gen
 - vcoord_gen
 
-The reg_tests directory contains the regression test code.
+The reg_tests directory contains the consistency test code.
 
 The fix directory is where we set links to directories containing
 large, static data files used by UFS_UTILS programs.
@@ -96,7 +96,7 @@ create a model grid on officially supported HPC platforms.
 
 The modulefiles directory contains modules loaded when building
 UFS_UTILS on supported HPC platforms.  They are also loaded at runtime
-by utility and regression test scripts.
+by utility and consistency test scripts.
 
 The docs directory contains the control file for the doxygen
 documentation build, as well as some markdown files which are part of

diff --git a/reg_tests/chgres_cube/README b/reg_tests/chgres_cube/README
@@ -1,9 +1,9 @@
-This series of regression tests must be run before any
+This series of consistency tests must be run before any
 changes to the chgres_cube program are merged to the
 main line of development.  Any test failures must
 be resolved or explained before merging.
 
-To run the regression tests:
+To run the consistency tests:
 
 1) Build chgres_cube program.  Go to ./sorc and
    invoke 'build_all.sh' with no arguments.

diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh
@@ -2,14 +2,14 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run the chgres_cube regression tests on Hera.
+# Run the chgres_cube consistency tests on Hera.
 #
 # Set OUTDIR to your working directory.  Set the PROJECT_CODE and QUEUE
 # as appropriate.  To see which projects you are authorized to use,
 # type "account_params".
 #
 # Invoke the script with no arguments.  A series of daily-chained
-# regression tests will be submitted.  To check the queue, type:
+# consistency tests will be submitted.  To check the queue, type:
 # "squeue -u USERNAME".
 #
 # The run output will be stored in OUTDIR.  Log output from the suite
@@ -47,7 +47,7 @@ export HOMEufs=$PWD/../..
 
 export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/chgres_cube
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 SUM_FILE=summary.log
 rm -f $LOG_FILE $SUM_FILE
 

diff --git a/reg_tests/chgres_cube/driver.jet.sh b/reg_tests/chgres_cube/driver.jet.sh
@@ -2,7 +2,7 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run the chgres_cube regression tests on JET.
+# Run the chgres_cube consistency tests on JET.
 #
 # Set OUTDIR to your working directory.  Set the PROJECT_CODE and QUEUE
 # as appropriate.  To see which projects you are authorized to use,
@@ -45,7 +45,7 @@ export HOMEufs=$PWD/../..
 
 export HOMEreg=/lfs4/HFIP/emcda/George.Gayno/reg_tests/chgres_cube
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 SUM_FILE=summary.log
 rm -f $LOG_FILE $SUM_FILE
 

diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh
@@ -2,14 +2,14 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run the chgres_cube regression tests on Orion.
+# Run the chgres_cube consistency tests on Orion.
 #
 # Set OUTDIR to your working directory.  Set the PROJECT_CODE and QUEUE
 # as appropriate.  To see which projects you are authorized to use,
 # type "saccount_params".
 #
 # Invoke the script with no arguments.  A series of daily-chained
-# regression tests will be submitted.  To check the queue, type:
+# consistency tests will be submitted.  To check the queue, type:
 # "squeue -u $LOGNAME".
 #
 # The run output will be stored in OUTDIR.  Log output from the suite
@@ -47,7 +47,7 @@ export HOMEufs=$PWD/../..
 
 export HOMEreg=/work/noaa/da/ggayno/save/ufs_utils.git/reg_tests/chgres_cube
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 SUM_FILE=summary.log
 rm -f $LOG_FILE $SUM_FILE
 

diff --git a/reg_tests/chgres_cube/driver.wcoss_cray.sh b/reg_tests/chgres_cube/driver.wcoss_cray.sh
@@ -2,7 +2,7 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run the chgres_cube regression tests on WCOSS-Cray.
+# Run the chgres_cube consistency tests on WCOSS-Cray.
 #
 # Set OUTDIR to your working directory.  Set the PROJECT_CODE and QUEUE as
 # appropriate. 
@@ -43,7 +43,7 @@ export HOMEufs=$PWD/../..
 
 export HOMEreg=/gpfs/hps3/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 
 SUM_FILE=summary.log
 

diff --git a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh
@@ -2,7 +2,7 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run the chgres_cube regression tests on WCOSS-Dell.
+# Run the chgres_cube consistency tests on WCOSS-Dell.
 #
 # Set OUTDIR to your working directory.  Set the PROJECT_CODE and QUEUE
 # as appropriate.
@@ -43,7 +43,7 @@ export HOMEufs=$PWD/../..
 
 export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 
 SUM_FILE=summary.log
 

diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh
@@ -2,14 +2,14 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run global_cycle regression test on Hera.
+# Run global_cycle consistency test on Hera.
 #
 # Set $DATA to your working directory.  Set the project code (SBATCH -A)
 # and queue (SBATCH -q) as appropriate.
 #
 # Invoke the script as follows:  sbatch $script
 #
-# Log output is placed in regression.log.  A summary is
+# Log output is placed in consistency.log.  A summary is
 # placed in summary.log
 #
 # The test fails when its output does not match the baseline files
@@ -21,8 +21,8 @@
 #SBATCH -J cycle_reg_test
 #SBATCH -A fv3-cpu
 #SBATCH --open-mode=truncate
-#SBATCH -o regression.log
-#SBATCH -e regression.log
+#SBATCH -o consistency.log
+#SBATCH -e consistency.log
 #SBATCH --nodes=1 --ntasks-per-node=6
 #SBATCH -q debug
 #SBATCH -t 00:05:00

diff --git a/reg_tests/global_cycle/driver.jet.sh b/reg_tests/global_cycle/driver.jet.sh
@@ -2,14 +2,14 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run global_cycle regression test on Jet.
+# Run global_cycle consistency test on Jet.
 #
 # Set $DATA to your working directory.  Set the project code (SBATCH -A)
 # and queue (SBATCH -q) as appropriate.
 #
 # Invoke the script as follows:  sbatch $script
 #
-# Log output is placed in regression.log.  A summary is
+# Log output is placed in consistency.log.  A summary is
 # placed in summary.log
 #
 # The test fails when its output does not match the baseline files
@@ -21,8 +21,8 @@
 #SBATCH -J cycle_reg_test
 #SBATCH -A emcda
 #SBATCH --open-mode=truncate
-#SBATCH -o regression.log
-#SBATCH -e regression.log
+#SBATCH -o consistency.log
+#SBATCH -e consistency.log
 #SBATCH --nodes=1 --ntasks-per-node=6
 #SBATCH --partition=xjet
 #SBATCH -q windfall

diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh
@@ -2,14 +2,14 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run global_cycle regression test on Orion.
+# Run global_cycle consistency test on Orion.
 #
 # Set $DATA to your working directory.  Set the project code (SBATCH -A)
 # and queue (SBATCH -q) as appropriate.
 #
 # Invoke the script as follows:  sbatch $script
 #
-# Log output is placed in regression.log.  A summary is
+# Log output is placed in consistency.log.  A summary is
 # placed in summary.log
 #
 # The test fails when its output does not match the baseline files
@@ -21,8 +21,8 @@
 #SBATCH -J cycle_reg_test
 #SBATCH -A fv3-cpu
 #SBATCH --open-mode=truncate
-#SBATCH -o regression.log
-#SBATCH -e regression.log
+#SBATCH -o consistency.log
+#SBATCH -e consistency.log
 #SBATCH --nodes=1 --ntasks-per-node=6
 #SBATCH -q debug
 #SBATCH -t 00:05:00

diff --git a/reg_tests/grid_gen/driver.hera.sh b/reg_tests/grid_gen/driver.hera.sh
@@ -2,7 +2,7 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run grid generation regression tests on Hera.
+# Run grid generation consistency tests on Hera.
 #
 # Set WORK_DIR to your working directory. Set the PROJECT_CODE and QUEUE
 # as appropriate.  To see which projects you are authorized to use,
@@ -39,7 +39,7 @@ PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}"
 # Should not have to change anything below here.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 SUM_FILE=summary.log
 export home_dir=$PWD/../..
 export APRUN=time

diff --git a/reg_tests/grid_gen/driver.jet.sh b/reg_tests/grid_gen/driver.jet.sh
@@ -2,7 +2,7 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run grid generation regression tests on Jet.
+# Run grid generation consistency tests on Jet.
 #
 # Set WORK_DIR to your working directory. Set the PROJECT_CODE and QUEUE
 # as appropriate.  To see which projects you are authorized to use,
@@ -37,7 +37,7 @@ export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
 # Should not have to change anything below here.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 SUM_FILE=summary.log
 export home_dir=$PWD/../..
 export APRUN=time

diff --git a/reg_tests/grid_gen/driver.orion.sh b/reg_tests/grid_gen/driver.orion.sh
@@ -2,7 +2,7 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run grid generation regression tests on Orion.
+# Run grid generation consistency tests on Orion.
 #
 # Set WORK_DIR to your working directory. Set the PROJECT_CODE and QUEUE
 # as appropriate.  To see which projects you are authorized to use,
@@ -38,7 +38,7 @@ PROJECT_CODE=${PROJECT_CODE:-fv3-cpu}
 # Should not have to change anything below here.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 SUM_FILE=summary.log
 export home_dir=$PWD/../..
 export APRUN=time

diff --git a/reg_tests/grid_gen/driver.wcoss_cray.sh b/reg_tests/grid_gen/driver.wcoss_cray.sh
@@ -2,7 +2,7 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run grid generation regression tests on WCOSS-Cray.
+# Run grid generation consistency tests on WCOSS-Cray.
 #
 # Set WORK_DIR to your working directory. Set the PROJECT_CODE and QUEUE
 # as appropriate.
@@ -36,7 +36,7 @@ export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
 #-----------------------------------------------------------------------------
 
 export home_dir=$PWD/../..
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 SUM_FILE=summary.log
 export APRUN="aprun -n 1 -N 1 -j 1 -d 1 -cc depth"
 export APRUN_SFC="aprun -j 1 -n 24 -N 24"

diff --git a/reg_tests/grid_gen/driver.wcoss_dell_p3.sh b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh
@@ -2,7 +2,7 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run grid generation regression tests on WCOSS-Dell.
+# Run grid generation consistency tests on WCOSS-Dell.
 #
 # Set WORK_DIR to your working directory. Set the PROJECT_CODE and QUEUE
 # as appropriate. 
@@ -35,7 +35,7 @@ export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
 # Should not have to change anything below here.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=regression.log
+LOG_FILE=consistency.log
 SUM_FILE=summary.log
 export home_dir=$PWD/../..
 export APRUN=time

diff --git a/reg_tests/ice_blend/driver.hera.sh b/reg_tests/ice_blend/driver.hera.sh
@@ -2,14 +2,14 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run ice_blend regression test on Hera.
+# Run ice_blend consistency test on Hera.
 #
 # Set $DATA to your working directory.  Set the project code (SBATCH -A)
 # and queue (SBATCH -q) as appropriate.
 #
 # Invoke the script as follows:  sbatch $script
 #
-# Log output is placed in regression.log.  A summary is
+# Log output is placed in consistency.log.  A summary is
 # placed in summary.log
 #
 # The test fails when its output does not match the baseline file
@@ -21,8 +21,8 @@
 #SBATCH -J ice_blend
 #SBATCH -A fv3-cpu
 #SBATCH --open-mode=truncate
-#SBATCH -o regression.log
-#SBATCH -e regression.log
+#SBATCH -o consistency.log
+#SBATCH -e consistency.log
 #SBATCH --ntasks=1
 #SBATCH -q debug
 #SBATCH -t 00:03:00

diff --git a/reg_tests/ice_blend/driver.jet.sh b/reg_tests/ice_blend/driver.jet.sh
@@ -2,14 +2,14 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run ice_blend regression test on Jet.
+# Run ice_blend consistency test on Jet.
 #
 # Set $DATA to your working directory.  Set the project code (SBATCH -A)
 # and queue (SBATCH -q) as appropriate.
 #
 # Invoke the script as follows:  sbatch $script
 #
-# Log output is placed in regression.log.  A summary is
+# Log output is placed in consistency.log.  A summary is
 # placed in summary.log
 #
 # The test fails when its output does not match the baseline file
@@ -23,8 +23,8 @@
 #SBATCH --time 0:01
 #SBATCH --account=emcda
 #SBATCH --job-name=ice_blnd
-#SBATCH -o regression.log
-#SBATCH -e regression.log
+#SBATCH -o consistency.log
+#SBATCH -e consistency.log
 
 set -x
 

diff --git a/reg_tests/ice_blend/driver.orion.sh b/reg_tests/ice_blend/driver.orion.sh
@@ -2,14 +2,14 @@
 
 #-----------------------------------------------------------------------------
 #
-# Run ice_blend regression test on Orion.
+# Run ice_blend consistency test on Orion.
 #
 # Set $DATA to your working directory.  Set the project code (SBATCH -A)
 # and queue (SBATCH -q) as appropriate.
 #
 # Invoke the script as follows:  sbatch $script
 #
-# Log output is placed in regression.log.  A summary is
+# Log output is placed in consistency.log.  A summary is
 # placed in summary.log
 #
 # The test fails when its output does not match the baseline file
@@ -21,8 +21,8 @@
 #SBATCH -J ice_blend
 #SBATCH -A fv3-cpu
 #SBATCH --open-mode=truncate
-#SBATCH -o regression.log
-#SBATCH -e regression.log
+#SBATCH -o consistency.log
+#SBATCH -e consistency.log
 #SBATCH --ntasks=1
 #SBATCH -q debug
 #SBATCH -t 00:03:00