From 2a1603ba15801f953b6db652f346c9f30340c04e Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <Russ.Treadon@noaa.gov>
Date: Tue, 19 Sep 2023 18:10:10 +0000
Subject: [PATCH 1/8] add scripting to load gsi_enkf modules in anal.sh,
 eobs.sh, and eupd.sh (#1863)

---
 jobs/rocoto/anal.sh | 23 ++++++++++++++++++++---
 jobs/rocoto/eobs.sh | 23 ++++++++++++++++++++---
 jobs/rocoto/eupd.sh | 23 ++++++++++++++++++++---
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/jobs/rocoto/anal.sh b/jobs/rocoto/anal.sh
index d99152ef19..90a57136fb 100755
--- a/jobs/rocoto/anal.sh
+++ b/jobs/rocoto/anal.sh
@@ -4,9 +4,26 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
-. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
-status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
+#status=$?
+#[[ ${status} -ne 0 ]] && exit ${status}
+
+# TODO: clean this up
+source "${HOMEgfs}/ush/detect_machine.sh"
+
+# Append compiler (only on machines that have multiple compilers)
+COMPILER=${COMPILER:-"intel"}
+if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
+    MACHINE_ID=${MACHINE_ID}.${COMPILER}
+fi
+
+set +x
+source "${HOMEgfs}/ush/module-setup.sh"
+module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
+module load gsi_"${MACHINE_ID}"
+module list
+unset MACHINE_ID
+set_trace
 
 export job="anal"
 export jobid="${job}.$$"
diff --git a/jobs/rocoto/eobs.sh b/jobs/rocoto/eobs.sh
index 95fa42cb08..dd2cd727a5 100755
--- a/jobs/rocoto/eobs.sh
+++ b/jobs/rocoto/eobs.sh
@@ -4,9 +4,26 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
-. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
-status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
+#status=$?
+#[[ ${status} -ne 0 ]] && exit ${status}
+
+# TODO: clean this up
+source "${HOMEgfs}/ush/detect_machine.sh"
+
+# Append compiler (only on machines that have multiple compilers)
+COMPILER=${COMPILER:-"intel"}
+if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
+    MACHINE_ID=${MACHINE_ID}.${COMPILER}
+fi
+
+set +x
+source "${HOMEgfs}/ush/module-setup.sh"
+module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
+module load gsi_"${MACHINE_ID}"
+module list
+unset MACHINE_ID
+set_trace
 
 export job="eobs"
 export jobid="${job}.$$"
diff --git a/jobs/rocoto/eupd.sh b/jobs/rocoto/eupd.sh
index 3ed028f87a..df86da5519 100755
--- a/jobs/rocoto/eupd.sh
+++ b/jobs/rocoto/eupd.sh
@@ -4,9 +4,26 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
-. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
-status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
+#status=$?
+#[[ ${status} -ne 0 ]] && exit ${status}
+
+# TODO: clean this up
+source "${HOMEgfs}/ush/detect_machine.sh"
+
+# Append compiler (only on machines that have multiple compilers)
+COMPILER=${COMPILER:-"intel"}
+if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
+    MACHINE_ID=${MACHINE_ID}.${COMPILER}
+fi
+
+set +x
+source "${HOMEgfs}/ush/module-setup.sh"
+module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
+module load gsi_"${MACHINE_ID}"
+module list
+unset MACHINE_ID
+set_trace
 
 export job="eupd"
 export jobid="${job}.$$"

From 4f25f861c32961ca9092ae3e0f9fbdfab3db6d9a Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <Russ.Treadon@noaa.gov>
Date: Wed, 20 Sep 2023 17:22:49 +0000
Subject: [PATCH 2/8] refactor module loads in anal.sh, eobs.sh, and eupd.sh to
 account for wcoss2 (#1863)

---
 jobs/rocoto/anal.sh | 36 +++++++++++++++++++++++-------------
 jobs/rocoto/eobs.sh | 36 +++++++++++++++++++++++-------------
 jobs/rocoto/eupd.sh | 36 +++++++++++++++++++++++-------------
 3 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/jobs/rocoto/anal.sh b/jobs/rocoto/anal.sh
index 90a57136fb..40ecad943b 100755
--- a/jobs/rocoto/anal.sh
+++ b/jobs/rocoto/anal.sh
@@ -9,22 +9,32 @@ source "${HOMEgfs}/ush/preamble.sh"
 #[[ ${status} -ne 0 ]] && exit ${status}
 
 # TODO: clean this up
-source "${HOMEgfs}/ush/detect_machine.sh"
+#Source appropriate modulefiles based on machine
 
-# Append compiler (only on machines that have multiple compilers)
-COMPILER=${COMPILER:-"intel"}
-if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
-    MACHINE_ID=${MACHINE_ID}.${COMPILER}
+source "${HOMEgfs}/ush/detect_machine.sh"
+if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    # Source FV3GFS workflow modules
+    . "${HOMEgfs}"/ush/load_fv3gfs_modules.sh
+    status=$?
+    [[ ${status} -ne 0 ]] && exit "${status}"
+else
+    # Append compiler (only on machines that have multiple compilers)
+    COMPILER=${COMPILER:-"intel"}
+    if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
+	MACHINE_ID=${MACHINE_ID}.${COMPILER}
+    fi
+
+    # Source machine specific GSI-EnKF modules
+    set +x
+    source "${HOMEgfs}/ush/module-setup.sh"
+    module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
+    module load gsi_"${MACHINE_ID}"
+
+    module list
+    unset MACHINE_ID
+    set_trace
 fi
 
-set +x
-source "${HOMEgfs}/ush/module-setup.sh"
-module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
-module load gsi_"${MACHINE_ID}"
-module list
-unset MACHINE_ID
-set_trace
-
 export job="anal"
 export jobid="${job}.$$"
 
diff --git a/jobs/rocoto/eobs.sh b/jobs/rocoto/eobs.sh
index dd2cd727a5..c89acbadb6 100755
--- a/jobs/rocoto/eobs.sh
+++ b/jobs/rocoto/eobs.sh
@@ -9,22 +9,32 @@ source "${HOMEgfs}/ush/preamble.sh"
 #[[ ${status} -ne 0 ]] && exit ${status}
 
 # TODO: clean this up
-source "${HOMEgfs}/ush/detect_machine.sh"
+#Source appropriate modulefiles based on machine
 
-# Append compiler (only on machines that have multiple compilers)
-COMPILER=${COMPILER:-"intel"}
-if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
-    MACHINE_ID=${MACHINE_ID}.${COMPILER}
+source "${HOMEgfs}/ush/detect_machine.sh"
+if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    # Source FV3GFS workflow modules
+    . "${HOMEgfs}"/ush/load_fv3gfs_modules.sh
+    status=$?
+    [[ ${status} -ne 0 ]] && exit "${status}"
+else
+    # Append compiler (only on machines that have multiple compilers)
+    COMPILER=${COMPILER:-"intel"}
+    if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
+	MACHINE_ID=${MACHINE_ID}.${COMPILER}
+    fi
+
+    # Source machine specific GSI-EnKF modules
+    set +x
+    source "${HOMEgfs}/ush/module-setup.sh"
+    module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
+    module load gsi_"${MACHINE_ID}"
+
+    module list
+    unset MACHINE_ID
+    set_trace
 fi
 
-set +x
-source "${HOMEgfs}/ush/module-setup.sh"
-module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
-module load gsi_"${MACHINE_ID}"
-module list
-unset MACHINE_ID
-set_trace
-
 export job="eobs"
 export jobid="${job}.$$"
 
diff --git a/jobs/rocoto/eupd.sh b/jobs/rocoto/eupd.sh
index df86da5519..313bdef288 100755
--- a/jobs/rocoto/eupd.sh
+++ b/jobs/rocoto/eupd.sh
@@ -9,22 +9,32 @@ source "${HOMEgfs}/ush/preamble.sh"
 #[[ ${status} -ne 0 ]] && exit ${status}
 
 # TODO: clean this up
-source "${HOMEgfs}/ush/detect_machine.sh"
+#Source appropriate modulefiles based on machine
 
-# Append compiler (only on machines that have multiple compilers)
-COMPILER=${COMPILER:-"intel"}
-if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
-    MACHINE_ID=${MACHINE_ID}.${COMPILER}
+source "${HOMEgfs}/ush/detect_machine.sh"
+if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+    # Source FV3GFS workflow modules
+    . "${HOMEgfs}"/ush/load_fv3gfs_modules.sh
+    status=$?
+    [[ ${status} -ne 0 ]] && exit "${status}"
+else
+    # Append compiler (only on machines that have multiple compilers)
+    COMPILER=${COMPILER:-"intel"}
+    if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
+	MACHINE_ID=${MACHINE_ID}.${COMPILER}
+    fi
+
+    # Source machine specific GSI-EnKF modules
+    set +x
+    source "${HOMEgfs}/ush/module-setup.sh"
+    module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
+    module load gsi_"${MACHINE_ID}"
+
+    module list
+    unset MACHINE_ID
+    set_trace
 fi
 
-set +x
-source "${HOMEgfs}/ush/module-setup.sh"
-module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
-module load gsi_"${MACHINE_ID}"
-module list
-unset MACHINE_ID
-set_trace
-
 export job="eupd"
 export jobid="${job}.$$"
 

From 2d4d020f55823eb1b06bbdbe466d45b6269899f0 Mon Sep 17 00:00:00 2001
From: Russ-Treadon-NOAA <Russ.Treadon@noaa.gov>
Date: Mon, 25 Sep 2023 19:04:49 +0000
Subject: [PATCH 3/8] fix indentation innrocoto jobs (#1863)

---
 jobs/rocoto/anal.sh | 2 +-
 jobs/rocoto/eobs.sh | 2 +-
 jobs/rocoto/eupd.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jobs/rocoto/anal.sh b/jobs/rocoto/anal.sh
index 40ecad943b..4c3407eb8a 100755
--- a/jobs/rocoto/anal.sh
+++ b/jobs/rocoto/anal.sh
@@ -21,7 +21,7 @@ else
     # Append compiler (only on machines that have multiple compilers)
     COMPILER=${COMPILER:-"intel"}
     if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
-	MACHINE_ID=${MACHINE_ID}.${COMPILER}
+        MACHINE_ID=${MACHINE_ID}.${COMPILER}
     fi
 
     # Source machine specific GSI-EnKF modules
diff --git a/jobs/rocoto/eobs.sh b/jobs/rocoto/eobs.sh
index c89acbadb6..634771d01b 100755
--- a/jobs/rocoto/eobs.sh
+++ b/jobs/rocoto/eobs.sh
@@ -21,7 +21,7 @@ else
     # Append compiler (only on machines that have multiple compilers)
     COMPILER=${COMPILER:-"intel"}
     if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
-	MACHINE_ID=${MACHINE_ID}.${COMPILER}
+        MACHINE_ID=${MACHINE_ID}.${COMPILER}
     fi
 
     # Source machine specific GSI-EnKF modules
diff --git a/jobs/rocoto/eupd.sh b/jobs/rocoto/eupd.sh
index 313bdef288..02f55c8c86 100755
--- a/jobs/rocoto/eupd.sh
+++ b/jobs/rocoto/eupd.sh
@@ -21,7 +21,7 @@ else
     # Append compiler (only on machines that have multiple compilers)
     COMPILER=${COMPILER:-"intel"}
     if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
-	MACHINE_ID=${MACHINE_ID}.${COMPILER}
+        MACHINE_ID=${MACHINE_ID}.${COMPILER}
     fi
 
     # Source machine specific GSI-EnKF modules

From a86b95ac6d9fa1c98dceb0838c718ed64fc1bfec Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <Russ.Treadon@noaa.gov>
Date: Tue, 26 Sep 2023 00:16:23 +0000
Subject: [PATCH 4/8] update GSI hash to bring in intel/2022 bug fixes and
 safeguards (#1863)

---
 Externals.cfg    | 2 +-
 sorc/checkout.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 325be174d2..eaf397edb9 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -36,7 +36,7 @@ protocol = git
 required = True
 
 [GSI-EnKF]
-hash = accb07e
+hash = ca19008
 local_path = sorc/gsi_enkf.fd
 repo_url = https://github.com/NOAA-EMC/GSI.git
 protocol = git
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
index c62d5b026d..9c9addad1d 100755
--- a/sorc/checkout.sh
+++ b/sorc/checkout.sh
@@ -156,7 +156,7 @@ checkout "ufs_model.fd"    "https://github.com/ufs-community/ufs-weather-model"
 checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git"   "c267780"                    ; errs=$((errs + $?))
 
 if [[ ${checkout_gsi} == "YES" ]]; then
-  checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "accb07e" "NO"; errs=$((errs + $?))
+  checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "ca19008" "NO"; errs=$((errs + $?))
 fi
 
 if [[ ${checkout_gdas} == "YES" ]]; then

From 84f3825fc01d5a022481a6b6a4d661c15591b791 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Tue, 26 Sep 2023 19:07:05 +0000
Subject: [PATCH 5/8] add workflow to PYTHONPATH on Orion (#1863)

---
 jobs/rocoto/anal.sh | 6 ++++++
 jobs/rocoto/eobs.sh | 8 ++++++++
 jobs/rocoto/eupd.sh | 6 ++++++
 3 files changed, 20 insertions(+)

diff --git a/jobs/rocoto/anal.sh b/jobs/rocoto/anal.sh
index 4c3407eb8a..3ddd0b84b7 100755
--- a/jobs/rocoto/anal.sh
+++ b/jobs/rocoto/anal.sh
@@ -30,6 +30,12 @@ else
     module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
     module load gsi_"${MACHINE_ID}"
 
+    if [[ "${MACHINE_ID}" = "orion" ]]; then
+        wxflowPATH="${HOMEgfs}/ush:${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
+        PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}"
+        export PYTHONPATH
+    fi
+
     module list
     unset MACHINE_ID
     set_trace
diff --git a/jobs/rocoto/eobs.sh b/jobs/rocoto/eobs.sh
index 634771d01b..15798c6623 100755
--- a/jobs/rocoto/eobs.sh
+++ b/jobs/rocoto/eobs.sh
@@ -30,6 +30,14 @@ else
     module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
     module load gsi_"${MACHINE_ID}"
 
+    set -x
+    if [[ "${MACHINE_ID}" = "orion" ]]; then
+	wxflowPATH="${HOMEgfs}/ush:${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
+	PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}"
+	export PYTHONPATH
+    fi
+    set +x
+
     module list
     unset MACHINE_ID
     set_trace
diff --git a/jobs/rocoto/eupd.sh b/jobs/rocoto/eupd.sh
index 02f55c8c86..be29f82b4b 100755
--- a/jobs/rocoto/eupd.sh
+++ b/jobs/rocoto/eupd.sh
@@ -30,6 +30,12 @@ else
     module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
     module load gsi_"${MACHINE_ID}"
 
+    if [[ "${MACHINE_ID}" = "orion" ]]; then
+        wxflowPATH="${HOMEgfs}/ush:${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
+        PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}"
+        export PYTHONPATH
+    fi
+
     module list
     unset MACHINE_ID
     set_trace

From d37d3d27cebd3ee3f5b1e1733ab57b3c48f953b9 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Tue, 26 Sep 2023 20:50:41 +0000
Subject: [PATCH 6/8] replace PYTHONPATH for Orion with regional_workflow
 (#1863)

---
 jobs/rocoto/anal.sh | 4 +---
 jobs/rocoto/eobs.sh | 4 +---
 jobs/rocoto/eupd.sh | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/jobs/rocoto/anal.sh b/jobs/rocoto/anal.sh
index 3ddd0b84b7..00fdb74911 100755
--- a/jobs/rocoto/anal.sh
+++ b/jobs/rocoto/anal.sh
@@ -31,9 +31,7 @@ else
     module load gsi_"${MACHINE_ID}"
 
     if [[ "${MACHINE_ID}" = "orion" ]]; then
-        wxflowPATH="${HOMEgfs}/ush:${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
-        PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}"
-        export PYTHONPATH
+       conda activate regional_workflow
     fi
 
     module list
diff --git a/jobs/rocoto/eobs.sh b/jobs/rocoto/eobs.sh
index 15798c6623..9ebdf1845b 100755
--- a/jobs/rocoto/eobs.sh
+++ b/jobs/rocoto/eobs.sh
@@ -32,9 +32,7 @@ else
 
     set -x
     if [[ "${MACHINE_ID}" = "orion" ]]; then
-	wxflowPATH="${HOMEgfs}/ush:${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
-	PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}"
-	export PYTHONPATH
+       conda activate regional_workflow
     fi
     set +x
 
diff --git a/jobs/rocoto/eupd.sh b/jobs/rocoto/eupd.sh
index be29f82b4b..40cb38151a 100755
--- a/jobs/rocoto/eupd.sh
+++ b/jobs/rocoto/eupd.sh
@@ -31,9 +31,7 @@ else
     module load gsi_"${MACHINE_ID}"
 
     if [[ "${MACHINE_ID}" = "orion" ]]; then
-        wxflowPATH="${HOMEgfs}/ush:${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src"
-        PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}"
-        export PYTHONPATH
+       conda activate regional_workflow
     fi
 
     module list

From 95b705f5d04f23e87a5286f9e423ee7fb414fc48 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Thu, 28 Sep 2023 18:47:06 +0000
Subject: [PATCH 7/8] replace regional_workflow with regional_workflow_cmaq
 (#1863)

---
 jobs/rocoto/anal.sh | 5 ++++-
 jobs/rocoto/eobs.sh | 7 ++++---
 jobs/rocoto/eupd.sh | 5 ++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/jobs/rocoto/anal.sh b/jobs/rocoto/anal.sh
index 00fdb74911..ca1288de3f 100755
--- a/jobs/rocoto/anal.sh
+++ b/jobs/rocoto/anal.sh
@@ -31,7 +31,10 @@ else
     module load gsi_"${MACHINE_ID}"
 
     if [[ "${MACHINE_ID}" = "orion" ]]; then
-       conda activate regional_workflow
+       module load miniconda3/4.12.0
+       set +u
+       conda activate regional_workflow_cmaq
+       set -u
     fi
 
     module list
diff --git a/jobs/rocoto/eobs.sh b/jobs/rocoto/eobs.sh
index 9ebdf1845b..ef277aff35 100755
--- a/jobs/rocoto/eobs.sh
+++ b/jobs/rocoto/eobs.sh
@@ -30,11 +30,12 @@ else
     module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
     module load gsi_"${MACHINE_ID}"
 
-    set -x
     if [[ "${MACHINE_ID}" = "orion" ]]; then
-       conda activate regional_workflow
+       module load miniconda3/4.12.0
+       set +u
+       conda activate regional_workflow_cmaq
+       set -u
     fi
-    set +x
 
     module list
     unset MACHINE_ID
diff --git a/jobs/rocoto/eupd.sh b/jobs/rocoto/eupd.sh
index 40cb38151a..8725ac6350 100755
--- a/jobs/rocoto/eupd.sh
+++ b/jobs/rocoto/eupd.sh
@@ -31,7 +31,10 @@ else
     module load gsi_"${MACHINE_ID}"
 
     if [[ "${MACHINE_ID}" = "orion" ]]; then
-       conda activate regional_workflow
+       module load miniconda3/4.12.0
+       set +u
+       conda activate regional_workflow_cmaq
+       set -u
     fi
 
     module list

From 33846f51a890eeabb1637e233575e495f6b29dc7 Mon Sep 17 00:00:00 2001
From: RussTreadon-NOAA <russ.treadon@noaa.gov>
Date: Fri, 29 Sep 2023 09:40:10 +0000
Subject: [PATCH 8/8] replace set -u with set_strict (#1863)

---
 jobs/rocoto/anal.sh | 2 +-
 jobs/rocoto/eobs.sh | 2 +-
 jobs/rocoto/eupd.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jobs/rocoto/anal.sh b/jobs/rocoto/anal.sh
index ca1288de3f..cb07749b9e 100755
--- a/jobs/rocoto/anal.sh
+++ b/jobs/rocoto/anal.sh
@@ -34,7 +34,7 @@ else
        module load miniconda3/4.12.0
        set +u
        conda activate regional_workflow_cmaq
-       set -u
+       set_strict
     fi
 
     module list
diff --git a/jobs/rocoto/eobs.sh b/jobs/rocoto/eobs.sh
index ef277aff35..4f813a8d84 100755
--- a/jobs/rocoto/eobs.sh
+++ b/jobs/rocoto/eobs.sh
@@ -34,7 +34,7 @@ else
        module load miniconda3/4.12.0
        set +u
        conda activate regional_workflow_cmaq
-       set -u
+       set_strict
     fi
 
     module list
diff --git a/jobs/rocoto/eupd.sh b/jobs/rocoto/eupd.sh
index 8725ac6350..9ddde92d36 100755
--- a/jobs/rocoto/eupd.sh
+++ b/jobs/rocoto/eupd.sh
@@ -34,7 +34,7 @@ else
        module load miniconda3/4.12.0
        set +u
        conda activate regional_workflow_cmaq
-       set -u
+       set_strict
     fi
 
     module list