From 9029966d41c4d226a182792dc4686a67e70c2556 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Sat, 4 Feb 2023 19:18:46 +0000
Subject: [PATCH] fix orion jobcard and path problems (#223)

---
 test/atm/global-workflow/run_jedi_exe_3dhofx.sh | 13 +++++++++++--
 test/atm/global-workflow/run_jedi_exe_3dvar.sh  | 12 ++++++++++--
 test/atm/global-workflow/run_jedi_exe_letkf.sh  |  9 +++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/test/atm/global-workflow/run_jedi_exe_3dhofx.sh b/test/atm/global-workflow/run_jedi_exe_3dhofx.sh
index 7ce5530a9..387381f42 100755
--- a/test/atm/global-workflow/run_jedi_exe_3dhofx.sh
+++ b/test/atm/global-workflow/run_jedi_exe_3dhofx.sh
@@ -19,6 +19,14 @@ module load GDAS/${machine}
 set -x
 module list
 
+if [ "$machine" = "hera" ] ; then
+    partition="hera"
+    gdasfix="/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix"
+elif [ "$machine" = "orion" ]; then
+    partition="debug"
+    gdasfix="/work2/noaa/da/cmartin/GDASApp/fix"
+fi
+
 mkdir -p ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_hofx3d
 cd ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_hofx3d
 
@@ -31,7 +39,7 @@ config:
   obs_yaml_dir: ${srcdir}/parm/atm/obs/config
   executable: ${bindir}/bin/fv3jedi_hofx_nomodel.x
   obs_list: ${srcdir}/parm/atm/obs/lists/gdas_prototype_3d.yaml
-  gdas_fix_root: /scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix
+  gdas_fix_root: ${gdasfix}
   atm: true
   layout_x: 3
   layout_y: 2
@@ -45,7 +53,7 @@ job options:
   machine: ${machine}
   account: da-cpu
   queue: debug
-  partition: hera
+  partition: ${partition}
   walltime: '30:00'
   ntasks: 36
   ntasks-per-node: 9
@@ -59,6 +67,7 @@ if [ $rc -ne 0 ]; then
     exit $rc
 fi
 
+sleep 10
 jobid=$(grep "Submitted" stdout.txt | awk -F' ' '{print $4}')
 echo "jobid is $jobid"
 
diff --git a/test/atm/global-workflow/run_jedi_exe_3dvar.sh b/test/atm/global-workflow/run_jedi_exe_3dvar.sh
index b14471332..28adf2c5e 100755
--- a/test/atm/global-workflow/run_jedi_exe_3dvar.sh
+++ b/test/atm/global-workflow/run_jedi_exe_3dvar.sh
@@ -19,6 +19,13 @@ module load GDAS/${machine}
 set -x
 module list
 
+if [ "$machine" = "hera" ] ; then
+    partition="hera"
+    gdasfix="/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix"
+elif [ "$machine" = "orion" ]; then
+    partition="debug"
+    gdasfix="/work2/noaa/da/cmartin/GDASApp/fix"
+fi
 
 mkdir -p ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_3dvar
 cd ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_3dvar
@@ -38,7 +45,7 @@ config:
   obs_yaml_dir: ${srcdir}/parm/atm/obs/config
   executable: ${bindir}/bin/fv3jedi_var.x
   obs_list: ${srcdir}/parm/atm/obs/lists/gdas_prototype_3d.yaml
-  gdas_fix_root: /scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix
+  gdas_fix_root: ${gdasfix}
   atm: true
   layout_x: 1
   layout_y: 1
@@ -56,7 +63,7 @@ job options:
   machine: ${machine}
   account: da-cpu
   queue: debug
-  partition: hera
+  partition: ${partition}
   walltime: '30:00'
   ntasks: 6
   modulepath: ${srcdir}/modulefiles
@@ -72,6 +79,7 @@ if [ $rc -ne 0 ]; then
     exit $rc
 fi
 
+sleep 10
 jobid=$(grep "Submitted" stdout.txt | awk -F' ' '{print $4}')
 echo "jobid is $jobid"
 
diff --git a/test/atm/global-workflow/run_jedi_exe_letkf.sh b/test/atm/global-workflow/run_jedi_exe_letkf.sh
index 38e524b16..6dd01ae77 100755
--- a/test/atm/global-workflow/run_jedi_exe_letkf.sh
+++ b/test/atm/global-workflow/run_jedi_exe_letkf.sh
@@ -21,8 +21,12 @@ module list
 
 if [ "$machine" = "hera" ] ; then
     cominges="/scratch1/NCEPDEV/da/Russ.Treadon/GDASApp/cases"
+    partition="hera"
+    gdasfix="/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix"
 elif [ "$machine" = "orion" ]; then
     cominges="/work2/noaa/da/rtreadon/GDASApp/cases"
+    partition="debug"
+    gdasfix="/work2/noaa/da/cmartin/GDASApp/fix"
 fi
 
 mkdir -p ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_letkf
@@ -42,7 +46,7 @@ config:
   obs_yaml_dir: ${srcdir}/parm/atm/obs/config
   executable: ${bindir}/bin/fv3jedi_letkf.x
   obs_list: ${srcdir}/parm/atm/obs/lists/lgetkf_prototype.yaml
-  gdas_fix_root: /scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix
+  gdas_fix_root: ${gdasfix}
   atm: true
   layout_x: 3
   layout_y: 2
@@ -61,7 +65,7 @@ job options:
   machine: ${machine}
   account: da-cpu
   queue: debug
-  partition: hera
+  partition: ${partition}
   walltime: '30:00'
   ntasks: 36
   modulepath: ${srcdir}/modulefiles
@@ -74,6 +78,7 @@ if [ $rc -ne 0 ]; then
     exit $rc
 fi
 
+sleep 10
 jobid=$(grep "Submitted" stdout.txt | awk -F' ' '{print $4}')
 echo "jobid is $jobid"