From 77a73b4d8373876b5a0e315bc0f22a62ecaa326f Mon Sep 17 00:00:00 2001
From: "denise.worthen" <Denise.Worthen@noaa.gov>
Date: Fri, 17 Jan 2025 13:57:29 +0000
Subject: [PATCH] update tests and scripts for fix file location

* baseline successfully created on hera for all ocn/atm combinations
---
 fix/link_fixdirs.sh            |  3 +--
 reg_tests/cpld_gridgen/rt.conf | 11 +++++------
 reg_tests/cpld_gridgen/rt.sh   |  7 ++++---
 ush/cpld_gridgen.sh            |  6 ++----
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/fix/link_fixdirs.sh b/fix/link_fixdirs.sh
index 9f27c6aa5..ca1f85765 100755
--- a/fix/link_fixdirs.sh
+++ b/fix/link_fixdirs.sh
@@ -49,8 +49,7 @@ if [ $machine = "hera" ]; then
 elif [ $machine = "jet" ]; then
     FIX_DIR="/lfs5/HFIP/hfv3gfs/glopara/FIX/fix"
 elif [ $machine = "orion" -o $machine = "hercules" ]; then
-    #    FIX_DIR="/work/noaa/global/glopara/fix"
-    FIX_DIR="/work2/noaa/stmp/dworthen/orog.lowres"
+    FIX_DIR="/work/noaa/global/glopara/fix"
 elif [ $machine = "wcoss2" ]; then
     FIX_DIR="/lfs/h2/emc/global/noscrub/emc.global/FIX/fix"
 elif [ $machine = "s4" ]; then
diff --git a/reg_tests/cpld_gridgen/rt.conf b/reg_tests/cpld_gridgen/rt.conf
index 9c1dddf30..abb4db65c 100644
--- a/reg_tests/cpld_gridgen/rt.conf
+++ b/reg_tests/cpld_gridgen/rt.conf
@@ -9,9 +9,8 @@
 
 # TEST_NAME | ATMRESLIST
 
-#  mx025 |
-#  mx050 |
-#  mx100 |
-   mx100 | 12,24,48
-   mx500 | 12,24,48
-   mx900 | 12,24,48
+  mx025 |
+  mx050 |
+  mx100 |
+  mx500 |
+  mx900 |
diff --git a/reg_tests/cpld_gridgen/rt.sh b/reg_tests/cpld_gridgen/rt.sh
index 0faad3042..38ea07248 100755
--- a/reg_tests/cpld_gridgen/rt.sh
+++ b/reg_tests/cpld_gridgen/rt.sh
@@ -109,10 +109,11 @@ export TEST_NAME=
 export ATMLIST=
 
 # for C3072 on hera, use WLCLK=60 and MEM="--exclusive"
-WLCLK_dflt=60
+WLCLK_dflt=90
 export WLCLK=$WLCLK_dflt
-MEM_dflt="--mem=16g"
-export MEM=$MEM_dflt
+#MEM_dflt="--mem=16g"
+#export MEM=$MEM_dflt
+export MEM="--exclusive"
 export MOM6_version=20240416
 
 cd $PATHRT
diff --git a/ush/cpld_gridgen.sh b/ush/cpld_gridgen.sh
index 22fb2b809..8c8f867e1 100755
--- a/ush/cpld_gridgen.sh
+++ b/ush/cpld_gridgen.sh
@@ -21,12 +21,10 @@ export ATMLIST=${ATMLIST:-$2}
 export DEBUG=.false.
 export MASKEDIT=.false.
 export DO_POSTWGTS=.true.
-export MOSAICDIR_PATH=/work2/noaa/stmp/dworthen/orog.lowres
-#export MOSAICDIR_PATH=${MOSAICDIR_PATH:-$PATHTR/fix/orog}
+export MOSAICDIR_PATH=${MOSAICDIR_PATH:-$PATHTR/fix/orog}
 export FIXDIR_PATH=${MOM6_FIXDIR}/${RESNAME}
 if [[ ${ATMLIST} -eq -1 ]]; then
-   #export ATMRESLIST=12,24,48,96,192,384,768,1152,3072
-   export ATMRESLIST=48,96,192,384,768,1152,3072
+   export ATMRESLIST=12,24,48,96,192,384,768,1152,3072
 else
    export ATMRESLIST=${ATMLIST}
 fi