From e3873e4eadf348bc82bebe548cb70ae8c15acb20 Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Mon, 7 Nov 2022 15:00:42 +0000
Subject: [PATCH 1/2] Update regression test data directory path in all wcoss2
 regression scripts.

Fixes #710
---
 reg_tests/chgres_cube/driver.wcoss2.sh  | 2 +-
 reg_tests/cpld_gridgen/rt.sh            | 4 ++--
 reg_tests/global_cycle/driver.wcoss2.sh | 2 +-
 reg_tests/grid_gen/driver.wcoss2.sh     | 2 +-
 reg_tests/ice_blend/driver.wcoss2.sh    | 6 ++++--
 reg_tests/snow2mdl/driver.wcoss2.sh     | 2 +-
 reg_tests/weight_gen/driver.wcoss2.sh   | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/reg_tests/chgres_cube/driver.wcoss2.sh b/reg_tests/chgres_cube/driver.wcoss2.sh
index 8c733853d..6ae0efb48 100755
--- a/reg_tests/chgres_cube/driver.wcoss2.sh
+++ b/reg_tests/chgres_cube/driver.wcoss2.sh
@@ -52,7 +52,7 @@ fi
 
 export HOMEufs=$PWD/../..
 
-export HOMEreg=/lfs/h2/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube
+export HOMEreg=/lfs/h2/emc/nems/noscrub/emc.nems/UFS_UTILS/reg_tests/chgres_cube
 
 LOG_FILE=consistency.log
 SUM_FILE=summary.log
diff --git a/reg_tests/cpld_gridgen/rt.sh b/reg_tests/cpld_gridgen/rt.sh
index 9c1d23366..9a947391a 100755
--- a/reg_tests/cpld_gridgen/rt.sh
+++ b/reg_tests/cpld_gridgen/rt.sh
@@ -117,8 +117,8 @@ rm -f fail_test* $COMPILE_LOG run_*.log nccmp_*.log summary.log
 
 if [[ $target = wcoss2 ]]; then
   STMP=${STMP:-/lfs/h2/emc/stmp/$USER}
-  export MOM6_FIXDIR=/lfs/h2/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/cpld_gridgen/fix_mom6
-  BASELINE_ROOT=/lfs/h2/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/cpld_gridgen/baseline_data
+  export MOM6_FIXDIR=/lfs/h2/emc/nems/noscrub/emc.nems/UFS_UTILS/reg_tests/cpld_gridgen/fix_mom6
+  BASELINE_ROOT=/lfs/h2/emc/nems/noscrub/emc.nems/UFS_UTILS/reg_tests/cpld_gridgen/baseline_data
   ACCOUNT=${ACCOUNT:-GFS-DEV}
   export APRUN="mpiexec -n 1 -ppn 1 --cpu-bind core"
   QUEUE=${QUEUE:-dev}
diff --git a/reg_tests/global_cycle/driver.wcoss2.sh b/reg_tests/global_cycle/driver.wcoss2.sh
index 970a3cab5..7889e7a1e 100755
--- a/reg_tests/global_cycle/driver.wcoss2.sh
+++ b/reg_tests/global_cycle/driver.wcoss2.sh
@@ -45,7 +45,7 @@ fi
 
 DATA_DIR="${WORK_DIR}/reg-tests/global-cycle"
 
-export HOMEreg=/lfs/h2/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/global_cycle
+export HOMEreg=/lfs/h2/emc/nems/noscrub/emc.nems/UFS_UTILS/reg_tests/global_cycle
 
 export OMP_NUM_THREADS_CY=2
 export OMP_PLACES=cores
diff --git a/reg_tests/grid_gen/driver.wcoss2.sh b/reg_tests/grid_gen/driver.wcoss2.sh
index d4847bbf4..efa7a8f44 100755
--- a/reg_tests/grid_gen/driver.wcoss2.sh
+++ b/reg_tests/grid_gen/driver.wcoss2.sh
@@ -55,7 +55,7 @@ export APRUN_SFC="mpiexec -n 30 -ppn 30 -cpu-bind core"
 export OMP_STACKSIZE=2048m
 export OMP_NUM_THREADS=30 # orog code uses threads
 export OMP_PLACES=cores
-export HOMEreg=/lfs/h2/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/grid_gen/baseline_data
+export HOMEreg=/lfs/h2/emc/nems/noscrub/emc.nems/UFS_UTILS/reg_tests/grid_gen/baseline_data
 this_dir=$PWD
 
 ulimit -a
diff --git a/reg_tests/ice_blend/driver.wcoss2.sh b/reg_tests/ice_blend/driver.wcoss2.sh
index cf85af081..03127637e 100755
--- a/reg_tests/ice_blend/driver.wcoss2.sh
+++ b/reg_tests/ice_blend/driver.wcoss2.sh
@@ -22,7 +22,7 @@
 #PBS -o consistency.log
 #PBS -e consistency.log
 #PBS -N iceb_regt
-#PBS -q debug
+#PBS -q dev
 #PBS -A GFS-DEV
 #PBS -l select=1:ncpus=1:mem=2500MB
 
@@ -37,6 +37,8 @@ module list
 
 set -x
 
+exit
+
 export DATA="${WORK_DIR:-/lfs/h2/emc/stmp/$LOGNAME}"
 export DATA="${DATA}/reg-tests/ice-blend"
 
@@ -51,7 +53,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
   source ../get_hash.sh
 fi
 
-export HOMEreg=/lfs/h2/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/ice_blend
+export HOMEreg=/lfs/h2/emc/nems/noscrub/emc.nems/UFS_UTILS/reg_tests/ice_blend
 export HOMEgfs=$PBS_O_WORKDIR/../..
 
 rm -fr $DATA
diff --git a/reg_tests/snow2mdl/driver.wcoss2.sh b/reg_tests/snow2mdl/driver.wcoss2.sh
index 833ae5e3d..2a1cf4f3e 100755
--- a/reg_tests/snow2mdl/driver.wcoss2.sh
+++ b/reg_tests/snow2mdl/driver.wcoss2.sh
@@ -44,7 +44,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
   source ../get_hash.sh
 fi
 
-export HOMEreg=/lfs/h2/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/snow2mdl
+export HOMEreg=/lfs/h2/emc/nems/noscrub/emc.nems/UFS_UTILS/reg_tests/snow2mdl
 export HOMEgfs=$PWD/../..
 
 LOG_FILE=consistency.log
diff --git a/reg_tests/weight_gen/driver.wcoss2.sh b/reg_tests/weight_gen/driver.wcoss2.sh
index 19049f96c..584c0fea1 100755
--- a/reg_tests/weight_gen/driver.wcoss2.sh
+++ b/reg_tests/weight_gen/driver.wcoss2.sh
@@ -51,7 +51,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
   source ../get_hash.sh
 fi
 
-export HOMEreg=/lfs/h2/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/weight_gen
+export HOMEreg=/lfs/h2/emc/nems/noscrub/emc.nems/UFS_UTILS/reg_tests/weight_gen
 export HOMEufs=$PBS_O_WORKDIR/../..
 
 export NCCMP=/lfs/h2/emc/global/noscrub/George.Gayno/util/nccmp/nccmp-1.8.5.0/src/nccmp

From e8430edfd79a93fee464aea7052590b781f1888b Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Mon, 7 Nov 2022 15:56:40 +0000
Subject: [PATCH 2/2] Remove 'exit' from ice blend regression script.

Fixes #710.
---
 reg_tests/ice_blend/driver.wcoss2.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/reg_tests/ice_blend/driver.wcoss2.sh b/reg_tests/ice_blend/driver.wcoss2.sh
index 03127637e..3131dda72 100755
--- a/reg_tests/ice_blend/driver.wcoss2.sh
+++ b/reg_tests/ice_blend/driver.wcoss2.sh
@@ -37,8 +37,6 @@ module list
 
 set -x
 
-exit
-
 export DATA="${WORK_DIR:-/lfs/h2/emc/stmp/$LOGNAME}"
 export DATA="${DATA}/reg-tests/ice-blend"