From 0983f34bb4ee527315f9a5ce90d9298cd7a8e494 Mon Sep 17 00:00:00 2001
From: GeorgeGayno-NOAA <52789452+GeorgeGayno-NOAA@users.noreply.github.com>
Date: Tue, 25 Jun 2024 15:34:12 -0400
Subject: [PATCH 1/2] Update the gdas_init utility for the new COM model
 directory (#968)

The 'model_data' directory has been changed to 'model' per NCO
request.

Fixes #967.
---
 util/gdas_init/copy_coldstart_files.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/gdas_init/copy_coldstart_files.sh b/util/gdas_init/copy_coldstart_files.sh
index d8c80fac3..e0c3ee1ae 100755
--- a/util/gdas_init/copy_coldstart_files.sh
+++ b/util/gdas_init/copy_coldstart_files.sh
@@ -10,7 +10,7 @@ copy_data()
 
   MEM=$1
 
-  SAVEDIR_MODEL_DATA=$SUBDIR/model_data/atmos/input
+  SAVEDIR_MODEL_DATA=$SUBDIR/model/atmos/input
   mkdir -p $SAVEDIR_MODEL_DATA
   cp gfs_ctrl.nc $SAVEDIR_MODEL_DATA
 

From 3ef2e6bd725d2662fd6ee95897cb7bac222e5144 Mon Sep 17 00:00:00 2001
From: GeorgeGayno-NOAA <52789452+GeorgeGayno-NOAA@users.noreply.github.com>
Date: Wed, 26 Jun 2024 10:32:13 -0400
Subject: [PATCH 2/2] Port to Orion Rocky 9 (#966)

Point to the Rocky 9 spack-stack.

Fixes #963.
Related to https://github.com/NOAA-EMC/global-workflow/issues/2694
---
 modulefiles/build.orion.intel.lua   | 6 +++---
 reg_tests/ice_blend/driver.orion.sh | 8 ++------
 reg_tests/snow2mdl/driver.orion.sh  | 4 ++--
 sorc/machine-setup.sh               | 2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modulefiles/build.orion.intel.lua b/modulefiles/build.orion.intel.lua
index a59456328..d0f93d9a4 100644
--- a/modulefiles/build.orion.intel.lua
+++ b/modulefiles/build.orion.intel.lua
@@ -2,12 +2,12 @@ help([[
 Load environment to compile UFS_UTILS on Orion using Intel
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"
diff --git a/reg_tests/ice_blend/driver.orion.sh b/reg_tests/ice_blend/driver.orion.sh
index cf8d559b7..d5704b5ab 100755
--- a/reg_tests/ice_blend/driver.orion.sh
+++ b/reg_tests/ice_blend/driver.orion.sh
@@ -32,6 +32,8 @@ set -x
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.intel
+module load grib-util/1.3.0
+module load wgrib2/2.0.8
 module list
 
 ulimit -s unlimited
@@ -50,12 +52,6 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
   source ../get_hash.sh
 fi
 
-export WGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib
-export WGRIB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib2
-export COPYGB=/apps/contrib/NCEPLIBS/lib/NCEPLIBS-grib_util/v1.1.1/exec/copygb
-export COPYGB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/copygb2
-export CNVGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/cnvgrib
-
 export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/ice_blend
 export HOMEgfs=$PWD/../..
 
diff --git a/reg_tests/snow2mdl/driver.orion.sh b/reg_tests/snow2mdl/driver.orion.sh
index 4715557cb..8d4b40f7a 100755
--- a/reg_tests/snow2mdl/driver.orion.sh
+++ b/reg_tests/snow2mdl/driver.orion.sh
@@ -23,6 +23,8 @@ set -x
 source ../../sorc/machine-setup.sh > /dev/null 2>&1
 module use ../../modulefiles
 module load build.$target.intel
+module load grib-util/1.3.0
+module load wgrib2/2.0.8
 module list
 
 ulimit -s unlimited
@@ -48,8 +50,6 @@ rm -fr $DATA_ROOT
 
 export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/snow2mdl
 export HOMEgfs=$PWD/../..
-export WGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib
-export WGRIB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib2
 
 # The first test mimics GFS OPS.
 
diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
index da10dabf5..943048111 100644
--- a/sorc/machine-setup.sh
+++ b/sorc/machine-setup.sh
@@ -50,7 +50,7 @@ elif [[ -d /gpfs && -d /ncrc ]] ; then
     fi
     module reset
     target=gaea
-elif [[ "$(hostname)" =~ "Orion" ]]; then
+elif [[ "$(hostname)" =~ "Orion" || "$(hostname)" =~ "orion" ]]; then
     target="orion"
     module purge
 elif [[ "$(hostname)" =~ "hercules" || "$(hostname)" =~ "Hercules" ]]; then