From 465d20ebe9272ec8b52d5879fa36dd985f34fe6f Mon Sep 17 00:00:00 2001
From: David Huber <david.huber@noaa.gov>
Date: Mon, 18 Dec 2023 10:25:45 -0600
Subject: [PATCH] Update Hercules baseline data, RT wallclock. #878

---
 driver_scripts/driver_grid.hercules.sh    | 1 +
 reg_tests/chgres_cube/driver.hercules.sh  | 6 ++----
 reg_tests/cpld_gridgen/rt.sh              | 4 +---
 reg_tests/global_cycle/driver.hercules.sh | 4 +---
 reg_tests/grid_gen/driver.hercules.sh     | 4 +---
 reg_tests/ice_blend/driver.hercules.sh    | 3 +--
 reg_tests/snow2mdl/driver.hercules.sh     | 3 +--
 reg_tests/weight_gen/driver.hercules.sh   | 3 +--
 8 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/driver_scripts/driver_grid.hercules.sh b/driver_scripts/driver_grid.hercules.sh
index 53f4e3f1a..cd4afee51 100644
--- a/driver_scripts/driver_grid.hercules.sh
+++ b/driver_scripts/driver_grid.hercules.sh
@@ -112,6 +112,7 @@ if [ $gtype = uniform ]; then
   export add_lake=true         # Add lake frac and depth to orography data.
   export lake_cutoff=0.50      # return 0 if lake_frac <  lake_cutoff & add_lake=T
   export binary_lake=1         # return 1 if lake_frac >= lake_cutoff & add_lake=T
+  export ocn=${ocn:-"025"}     # use one of  "025", "050", "100", "500". Cannot be empty
 elif [ $gtype = stretch ]; then
   export res=96
   export stretch_fac=1.5       # Stretching factor for the grid
diff --git a/reg_tests/chgres_cube/driver.hercules.sh b/reg_tests/chgres_cube/driver.hercules.sh
index 10698d6fa..80ff82a17 100755
--- a/reg_tests/chgres_cube/driver.hercules.sh
+++ b/reg_tests/chgres_cube/driver.hercules.sh
@@ -53,9 +53,7 @@ fi
 
 export HOMEufs=$PWD/../..
 
-# TODO change this to an official location when testing is complete.
-#export HOMEreg=/work/noaa/nems/role-nems/hercules/ufs_utils/reg_tests/chgres_cube
-export HOMEreg=/work/noaa/global/dhuber/noscrub/ufs_utils/reg_tests/chgres_cube
+export HOMEreg=/work/noaa/nems/role-nems/ufs_utils.hercules/reg_tests/chgres_cube
 
 LOG_FILE=consistency.log
 SUM_FILE=summary.log
@@ -104,7 +102,7 @@ TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 --mem=75G -t 0:15:00 -A
 
 LOG_FILE4=${LOG_FILE}04
 export OMP_NUM_THREADS=6  # needs to match cpus-per-task
-TEST4=$(sbatch --parsable --ntasks-per-node=3 --cpus-per-task=6 --nodes=2 --mem=75G -t 0:20:00 -A $PROJECT_CODE -q $QUEUE -J c96.gfs.sigio \
+TEST4=$(sbatch --parsable --ntasks-per-node=3 --cpus-per-task=6 --nodes=2 --mem=75G -t 0:25:00 -A $PROJECT_CODE -q $QUEUE -J c96.gfs.sigio \
       --open-mode=append -o $LOG_FILE4 -e $LOG_FILE4 ./c96.gfs.sigio.sh)
 
 #-----------------------------------------------------------------------------
diff --git a/reg_tests/cpld_gridgen/rt.sh b/reg_tests/cpld_gridgen/rt.sh
index 6c8bf5a60..70d11c048 100755
--- a/reg_tests/cpld_gridgen/rt.sh
+++ b/reg_tests/cpld_gridgen/rt.sh
@@ -154,9 +154,7 @@ elif [[ $target = orion ]]; then
 elif [[ $target = hercules ]]; then
     STMP=${STMP:-/work/noaa/stmp/$USER}
     export MOM6_FIXDIR=/work/noaa/global/glopara/fix/mom6/20220805
-    #TODO Update to official location when testing is complete
-    #BASELINE_ROOT=/work/noaa/nems/role-nems/ufs_utils/hercules/reg_tests/cpld_gridgen/baseline_data
-    BASELINE_ROOT=/work/noaa/global/dhuber/noscrub/ufs_utils/reg_tests/cpld_gridgen/baseline_data
+    BASELINE_ROOT=/work/noaa/nems/role-nems/ufs_utils.hercules/reg_tests/cpld_gridgen/baseline_data
     ACCOUNT=${ACCOUNT:-nems}
     QUEUE=${QUEUE:-batch}
     NCCMP=nccmp
diff --git a/reg_tests/global_cycle/driver.hercules.sh b/reg_tests/global_cycle/driver.hercules.sh
index 434ed73fd..30a0e2acd 100755
--- a/reg_tests/global_cycle/driver.hercules.sh
+++ b/reg_tests/global_cycle/driver.hercules.sh
@@ -43,9 +43,7 @@ fi
 
 export DATA_DIR="${WORK_DIR}/reg-tests/global-cycle"
 
-#TODO Update to official location when testing is complete
-#export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/hercules/reg_tests/global_cycle
-export HOMEreg=/work/noaa/global/dhuber/noscrub/ufs_utils/reg_tests/global_cycle
+export HOMEreg=/work/noaa/nems/role-nems/ufs_utils.hercules/reg_tests/global_cycle
 
 export OMP_NUM_THREADS_CY=2
 
diff --git a/reg_tests/grid_gen/driver.hercules.sh b/reg_tests/grid_gen/driver.hercules.sh
index ae85cf45d..a97d8cc25 100755
--- a/reg_tests/grid_gen/driver.hercules.sh
+++ b/reg_tests/grid_gen/driver.hercules.sh
@@ -53,9 +53,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
   source ../get_hash.sh
 fi
 
-#TODO Update to official location when testing is complete
-#export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/hercules/reg_tests/grid_gen/baseline_data
-export HOMEreg=/work/noaa/global/dhuber/noscrub/ufs_utils/reg_tests/grid_gen/baseline_data
+export HOMEreg=/work/noaa/nems/role-nems/ufs_utils.hercules/reg_tests/grid_gen/baseline_data
 
 rm -fr $WORK_DIR
 
diff --git a/reg_tests/ice_blend/driver.hercules.sh b/reg_tests/ice_blend/driver.hercules.sh
index 1bdea3da3..f541ac367 100755
--- a/reg_tests/ice_blend/driver.hercules.sh
+++ b/reg_tests/ice_blend/driver.hercules.sh
@@ -56,8 +56,7 @@ export COPYGB=/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/e
 export COPYGB2=/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/intel/2021.9.0/grib-util-1.3.0-wenl3in/bin/copygb2
 export CNVGRIB=/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/intel/2021.9.0/grib-util-1.3.0-wenl3in/bin/cnvgrib
 
-#TODO Update to official location when testing is complete
-#export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/hercules/reg_tests/ice_blend
+export HOMEreg=/work/noaa/nems/role-nems/ufs_utils.hercules/reg_tests/ice_blend
 export HOMEreg=/work/noaa/global/dhuber/noscrub/ufs_utils/reg_tests/ice_blend
 export HOMEgfs=$PWD/../..
 
diff --git a/reg_tests/snow2mdl/driver.hercules.sh b/reg_tests/snow2mdl/driver.hercules.sh
index ebb480e0f..ea64eecbf 100755
--- a/reg_tests/snow2mdl/driver.hercules.sh
+++ b/reg_tests/snow2mdl/driver.hercules.sh
@@ -46,8 +46,7 @@ fi
 
 rm -fr $DATA_ROOT
 
-#TODO Update to official location when testing is complete
-#export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/hercules/reg_tests/snow2mdl
+export HOMEreg=/work/noaa/nems/role-nems/ufs_utils.hercules/reg_tests/snow2mdl
 export HOMEreg=/work/noaa/global/dhuber/noscrub/ufs_utils/reg_tests/snow2mdl
 export HOMEgfs=$PWD/../..
 export WGRIB=/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/intel/2021.9.0/grib-util-1.3.0-wenl3in/bin/wgrib
diff --git a/reg_tests/weight_gen/driver.hercules.sh b/reg_tests/weight_gen/driver.hercules.sh
index ece64ea0c..369796d61 100755
--- a/reg_tests/weight_gen/driver.hercules.sh
+++ b/reg_tests/weight_gen/driver.hercules.sh
@@ -50,8 +50,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
   source ../get_hash.sh
 fi
 
-#TODO Update to official location when testing is complete
-#export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/hercules/reg_tests/weight_gen
+export HOMEreg=/work/noaa/nems/role-nems/ufs_utils.hercules/reg_tests/weight_gen
 export HOMEreg=/work/noaa/global/dhuber/noscrub/ufs_utils/reg_tests/weight_gen
 export HOMEufs=$PWD/../..