From 5a870df8f9db05174b44818733ead64806fc3354 Mon Sep 17 00:00:00 2001
From: George Gayno <George.Gayno@noaa.gov>
Date: Wed, 3 Jan 2024 21:18:55 +0000
Subject: [PATCH] Minor script fixes for the first cycle regression test
 required after the recent merge.

Fixes #549.
---
 reg_tests/global_cycle/C768.fv3gfs.sh |  6 ++----
 reg_tests/global_cycle/driver.hera.sh |  4 +++-
 ush/global_cycle_driver.sh            | 11 +++++------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh
index 0096bc2c6..8dd6d303c 100755
--- a/reg_tests/global_cycle/C768.fv3gfs.sh
+++ b/reg_tests/global_cycle/C768.fv3gfs.sh
@@ -21,6 +21,7 @@ export FHOUR=00
 export DELTSFC=6
 
 export CASE=C768
+export OCNRES=99999
 
 export COMIN=$HOMEreg/input_data
 export FNTSFA=$COMIN/gdas.t00z.rtgssthr.grb
@@ -32,8 +33,7 @@ export JCAP=1534
 export LONB=3072
 export LATB=1536
 
-export OROFIX=$BASE_GSM/fix/orog/$CASE
-export OROFILE=${CASE}_oro_data
+export OROFIX=$HOMEreg/fix/$CASE
 
 export FIXgsm=$BASE_GSM/fix/am
 
@@ -50,8 +50,6 @@ export FNSLPC=$FIXgsm/global_slope.1x1.grb
 export FNABSC=$FIXgsm/global_mxsnoalb.uariz.t1534.3072.1536.rg.grb
 export FNAISC=$FIXgsm/CFSR.SEAICE.1982.2012.monthly.clim.grb
 
-export FIXfv3=$HOMEreg/fix
-
 export DONST="YES"
 export use_ufo=.true.
 
diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh
index 9ea901726..bbfb8f211 100755
--- a/reg_tests/global_cycle/driver.hera.sh
+++ b/reg_tests/global_cycle/driver.hera.sh
@@ -30,7 +30,7 @@ module list
 WORK_DIR="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}"
 
 PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}"
-QUEUE="${QUEUE:-batch}"
+QUEUE="${QUEUE:-debug}"
 
 #-----------------------------------------------------------------------------
 # Should not have to change anything below.
@@ -61,6 +61,8 @@ export COMOUT=$DATA
 TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c768.fv3gfs \
       -o $LOG_FILE -e $LOG_FILE ./C768.fv3gfs.sh)
 
+exit
+
 LOG_FILE=consistency.log02
 export DATA="${DATA_DIR}/test2"
 export COMOUT=$DATA
diff --git a/ush/global_cycle_driver.sh b/ush/global_cycle_driver.sh
index 100db8bac..ce4d1756a 100755
--- a/ush/global_cycle_driver.sh
+++ b/ush/global_cycle_driver.sh
@@ -23,8 +23,6 @@ export FIXam=${FIXam:-$FIX_DIR/am}
 export OROFIX=${OROFIX:-$FIX_DIR/orog/${CASE}.mx${OCNRES}_frac}
 export FIX_SFC=${FIX_SFC:-$OROFIX/sfc}
 
-OROFILE=${OROFILE:-oro_${CASE}.mx${OCNRES}}
-
 ntiles=${ntiles:-6}
 DONST=${DONST:-"NO"}
 COMIN=${COMIN:-$pwd}
@@ -90,11 +88,11 @@ for n in $(seq 1 $ntiles); do
   chmod 644  $COMOUT/$PDY.${cyc}0000.sfcanl_data.tile${n}.nc
   ln -fs $COMOUT/$PDY.${cyc}0000.sfcanl_data.tile${n}.nc  $DATA/fnbgso.00$n
 
-  ln -fs $FIXfv3/C${CRES}/C${CRES}_grid.tile${n}.nc       $DATA/fngrid.00$n
-  if [ -z "${ocn}" ];then
-    ln -fs $FIXfv3/C${CRES}/C${CRES}_oro_data.tile${n}.nc   $DATA/fnorog.00$n
+  ln -fs $OROFIX/C${CRES}_grid.tile${n}.nc       $DATA/fngrid.00$n
+  if (( OCNRES > 9999 ));then
+    ln -fs $OROFIX/C${CRES}_oro_data.tile${n}.nc   $DATA/fnorog.00$n
   else
-    ln -fs $FIXfv3/C${CRES}/C${CRES}.mx${ocn}_oro_data.tile${n}.nc   $DATA/fnorog.00$n
+    ln -fs $OROFIX/C${CRES}.mx${OCNRES}_oro_data.tile${n}.nc   $DATA/fnorog.00$n
   fi
 
   if [[ "$DO_SNO_INC" == ".true." ]] ; then  
@@ -103,6 +101,7 @@ for n in $(seq 1 $ntiles); do
 done
 
 $CYCLESH
+
 rc=$?
 if [[ $rc -ne 0 ]] ; then
     echo "***ERROR*** rc= $rc"