ufs-community · kgerheiser · Apr 13, 2021 · Mar 5, 2021 · Mar 11, 2021 · Mar 11, 2021
diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml
@@ -36,6 +36,7 @@ jobs:
 
     - name: install-dependencies
       run: |
+        echo "/home/runner/mpich/bin" >> $GITHUB_PATH
         if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then
           sudo apt-get update
           sudo apt-get install libmpich-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,7 +46,7 @@ endif()
 
 # Find packages.
 find_package(NetCDF REQUIRED C Fortran)
-find_package(MPI REQUIRED)
+find_package(MPI REQUIRED C Fortran)
 find_package(ESMF MODULE REQUIRED)
 
 if(OPENMP)

diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh
@@ -31,9 +31,11 @@ module use ../../modulefiles
 module load build.$target.$compiler
 module list
 
-export OUTDIR=/scratch2/NCEPDEV/stmp1/$LOGNAME/chgres_reg_tests
-PROJECT_CODE="fv3-cpu"
-QUEUE="batch"
+export OUTDIR="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}"
+export OUTDIR="${OUTDIR}/reg-tests/chgres-cube"
+
+PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}"
+QUEUE="${QUEUE:-batch}"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.  HOMEufs is the root

diff --git a/reg_tests/chgres_cube/driver.jet.sh b/reg_tests/chgres_cube/driver.jet.sh
@@ -29,9 +29,11 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export OUTDIR=/lfs4/HFIP/emcda/$LOGNAME/stmp/chgres_reg_tests
-PROJECT_CODE="hfv3gfs"
-QUEUE="debug"
+export OUTDIR="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
+export OUTDIR="${OUTDIR}/reg-tests/chgres-cube"
+
+PROJECT_CODE="${PROJECT_CODE:-hfv3gfs}"
+QUEUE="${QUEUE:-debug}"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.  HOMEufs is the root

diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh
@@ -29,9 +29,13 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export OUTDIR=/work/noaa/stmp/$LOGNAME/chgres_reg_tests
-PROJECT_CODE="fv3-cpu"
-QUEUE="debug"
+ulimit -s unlimited
+
+export OUTDIR="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}"
+export OUTDIR="${OUTDIR}/reg-tests/chgres-cube"
+
+PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}"
+QUEUE="${QUEUE:-debug}"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.  HOMEufs is the root

diff --git a/reg_tests/chgres_cube/driver.cray.sh → reg_tests/chgres_cube/driver.wcoss_cray.sh b/reg_tests/chgres_cube/driver.cray.sh → reg_tests/chgres_cube/driver.wcoss_cray.sh
@@ -27,9 +27,11 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export OUTDIR=/gpfs/hps3/stmp/$LOGNAME/chgres_reg_tests
-QUEUE="debug"
-PROJECT_CODE="GFS-DEV"
+export OUTDIR="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}"
+export OUTDIR="${OUTDIR}/reg-tests/chgres-cube"
+
+QUEUE="${QUEUE:-debug}"
+PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.  HOMEufs is the root

diff --git a/reg_tests/chgres_cube/driver.dell.sh → ...tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.dell.sh → ...tests/chgres_cube/driver.wcoss_dell_p3.sh
@@ -27,9 +27,11 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export OUTDIR=/gpfs/dell1/stmp/$LOGNAME/chgres_reg_tests
-QUEUE="debug"
-PROJECT_CODE="GFS-DEV"
+export OUTDIR="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}"
+export OUTDIR="${OUTDIR}/reg-tests/chgres-cube"
+
+QUEUE="${QUEUE:-debug}"
+PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.  HOMEufs is the root

diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh
@@ -36,7 +36,8 @@ module use ../../modulefiles
 module load build.$target.$compiler
 module list
 
-export DATA=/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_tests.cycle
+export DATA="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}"
+export DATA="${DATA}/reg-tests/global-cycle"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/global_cycle/driver.jet.sh b/reg_tests/global_cycle/driver.jet.sh
@@ -35,7 +35,8 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export DATA=/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_tests.cycle
+export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
+export DATA="${DATA}/reg-tests/global-cycle"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh
@@ -34,7 +34,10 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export DATA=/work/noaa/stmp/$LOGNAME/reg_tests.cycle
+ulimit -s unlimited
+
+export DATA="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}"
+export DATA="${DATA}/reg-tests/global-cycle"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/global_cycle/driver.cray.sh → reg_tests/global_cycle/driver.wcoss_cray.sh b/reg_tests/global_cycle/driver.cray.sh → reg_tests/global_cycle/driver.wcoss_cray.sh
@@ -32,7 +32,8 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export DATA=/gpfs/hps3/stmp/$LOGNAME/reg_tests.cycle
+export DATA="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}"
+export DATA="${DATA}/reg-tests/global-cycle"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/global_cycle/driver.dell.sh → ...ests/global_cycle/driver.wcoss_dell_p3.sh b/reg_tests/global_cycle/driver.dell.sh → ...ests/global_cycle/driver.wcoss_dell_p3.sh
@@ -37,7 +37,8 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export DATA=/gpfs/dell1/stmp/$LOGNAME/reg_tests.cycle
+export DATA="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}"
+export DATA="${DATA}/reg-tests/global-cycle"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/grid_gen/driver.hera.sh b/reg_tests/grid_gen/driver.hera.sh
@@ -30,9 +30,10 @@ module list
 
 set -x
 
-export WORK_DIR=/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_tests.grid
-QUEUE="batch"
-PROJECT_CODE="fv3-cpu"
+export WORK_DIR="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}"
+export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
+QUEUE="${QUEUE:-batch}"
+PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.

diff --git a/reg_tests/grid_gen/driver.jet.sh b/reg_tests/grid_gen/driver.jet.sh
@@ -28,9 +28,10 @@ module list
 
 set -x
 
-QUEUE="windfall"
-PROJECT_CODE="emcda"
-export WORK_DIR=/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_tests.grid
+QUEUE="${QUEUE:-windfall}"
+PROJECT_CODE="${PROJECT_CODE:-emcda}"
+export WORK_DIR="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
+export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.

diff --git a/reg_tests/grid_gen/driver.orion.sh b/reg_tests/grid_gen/driver.orion.sh
@@ -27,10 +27,12 @@ module load build.$target.intel
 module list
 
 set -x
+ulimit -s unlimited
 
-export WORK_DIR=/work/noaa/stmp/$LOGNAME/reg_tests.grid
-QUEUE="batch"
-PROJECT_CODE="fv3-cpu"
+export WORK_DIR="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}"
+export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
+QUEUE="${QUEUE:-batch}"
+PROJECT_CODE=${PROJECT_CODE:-fv3-cpu}
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.

diff --git a/reg_tests/grid_gen/driver.cray.sh → reg_tests/grid_gen/driver.wcoss_cray.sh b/reg_tests/grid_gen/driver.cray.sh → reg_tests/grid_gen/driver.wcoss_cray.sh
@@ -26,9 +26,10 @@ module list
 
 set -x
 
-QUEUE="debug"
-PROJECT_CODE="GFS-DEV"
-export WORK_DIR=/gpfs/hps3/stmp/$LOGNAME/reg_tests.grid
+QUEUE="${QUEUE:-debug}"
+PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}"
+export WORK_DIR="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}"
+export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.

diff --git a/reg_tests/grid_gen/driver.dell.sh → reg_tests/grid_gen/driver.wcoss_dell_p3.sh b/reg_tests/grid_gen/driver.dell.sh → reg_tests/grid_gen/driver.wcoss_dell_p3.sh
@@ -26,9 +26,10 @@ module list
 
 set -x
 
-QUEUE="debug"
-PROJECT_CODE="GFS-DEV"
-export WORK_DIR=/gpfs/dell1/stmp/$LOGNAME/reg_tests.grid
+QUEUE="${QUEUE:-debug}"
+PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}"
+export WORK_DIR="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}"
+export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below here.

diff --git a/reg_tests/ice_blend/driver.hera.sh b/reg_tests/ice_blend/driver.hera.sh
@@ -36,7 +36,8 @@ module use ../../modulefiles
 module load build.$target.$compiler
 module list
 
-export DATA="/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_test.ice_blend"
+export DATA="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}"
+export DATA="${DATA}/reg-tests/ice-blend"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/ice_blend/driver.jet.sh b/reg_tests/ice_blend/driver.jet.sh
@@ -33,7 +33,8 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export DATA="/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_test.ice_blend"
+export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
+export DATA="${DATA}/reg-tests/ice-blend"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/ice_blend/driver.orion.sh b/reg_tests/ice_blend/driver.orion.sh
@@ -34,7 +34,10 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export DATA="/work/noaa/stmp/$LOGNAME/reg_test.ice_blend"
+ulimit -s unlimited
+
+export DATA="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}"
+export DATA="${DATA}/reg-tests/ice-blend"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/ice_blend/driver.cray.sh → reg_tests/ice_blend/driver.wcoss_cray.sh b/reg_tests/ice_blend/driver.cray.sh → reg_tests/ice_blend/driver.wcoss_cray.sh
@@ -33,7 +33,8 @@ module use ../../modulefiles
 module load build.$target.intel
 module list
 
-export DATA=/gpfs/hps3/stmp/$LOGNAME/reg_tests.ice_blend
+export DATA="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}"
+export DATA="${DATA}/reg-tests/ice-blend"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.

diff --git a/reg_tests/ice_blend/driver.dell.sh → reg_tests/ice_blend/driver.wcoss_dell_p3.sh b/reg_tests/ice_blend/driver.dell.sh → reg_tests/ice_blend/driver.wcoss_dell_p3.sh
@@ -33,7 +33,8 @@ module list
 
 set -x
 
-export DATA=/gpfs/dell1/stmp/$LOGNAME/reg_tests.ice_blend
+export DATA="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}"
+export DATA="${DATA}/reg-tests/ice-blend"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.