From 75152dcd1eea786f1b01ed2c82faf2c6fb9cdc9e Mon Sep 17 00:00:00 2001
From: Ratko Vasic <ratko.vasic@noaa.gov>
Date: Thu, 7 Sep 2023 13:58:45 +0000
Subject: [PATCH 01/26] Make srw_common common for hpc-stack and spack-stack

---
 modulefiles/build_gaea_intel.lua      | 29 ++++++++++++--------------
 modulefiles/build_hera_gnu.lua        | 25 ++++++++--------------
 modulefiles/build_hera_intel.lua      | 23 ++++++++++----------
 modulefiles/build_jet_intel.lua       | 23 ++++++++++----------
 modulefiles/build_noaacloud_intel.lua |  2 +-
 modulefiles/build_orion_intel.lua     | 21 ++++++++-----------
 modulefiles/srw_common_spack.lua      | 30 ---------------------------
 7 files changed, 55 insertions(+), 98 deletions(-)
 delete mode 100644 modulefiles/srw_common_spack.lua

diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua
index bb156952e3..bb05aff524 100644
--- a/modulefiles/build_gaea_intel.lua
+++ b/modulefiles/build_gaea_intel.lua
@@ -1,27 +1,25 @@
 help([[
 This module loads libraries for building the UFS SRW App on
-the NOAA RDHPC machine Gaea using Intel-2022.0.2
+the NOAA RDHPC machine Gaea using Intel-2021.3.0.
 ]])
 
 whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===])
 
-load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"))
+unload("intel")
+unload("cray-mpich")
+unload("cray-python")
+unload("darshan")
 
-prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-classic-2022.0.2/modulefiles/stack")
-load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
-load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2022.0.2"))
-load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "7.7.20"))
+prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/spack-stack-1.4.1-c4/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/lustre/f2/pdata/esrl/gsd/spack-stack/modulefiles")
 
-load("srw_common")
--- Need at runtime
-load("alps")
-
-local MKLROOT="/opt/intel/oneapi/mkl/2022.0.2/"
-prepend_path("LD_LIBRARY_PATH",pathJoin(MKLROOT,"lib/intel64"))
-pushenv("MKLROOT", MKLROOT)
+load("stack-intel/2022.0.2")
+load("stack-cray-mpich/7.7.20")
+load("stack-python/3.9.12")
+load("cmake/3.23.1")
 
-pushenv("GSI_BINARY_SOURCE_DIR", "/lustre/f2/dev/role.epic/contrib/GSI_data/fix/20230601")
-pushenv("CRAYPE_LINK_TYPE","dynamic")
+load("srw_common")
+load("ufs-pyenv")
 
 setenv("CC","cc")
 setenv("FC","ftn")
@@ -30,4 +28,3 @@ setenv("CMAKE_C_COMPILER","cc")
 setenv("CMAKE_CXX_COMPILER","CC")
 setenv("CMAKE_Fortran_COMPILER","ftn")
 setenv("CMAKE_Platform","gaea.intel")
-
diff --git a/modulefiles/build_hera_gnu.lua b/modulefiles/build_hera_gnu.lua
index 888a358549..0241d5ac46 100644
--- a/modulefiles/build_hera_gnu.lua
+++ b/modulefiles/build_hera_gnu.lua
@@ -5,27 +5,20 @@ the NOAA RDHPC machine Hera using GNU 9.2.0
 
 whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===])
 
-prepend_path("MODULEPATH","/contrib/sutils/modulefiles")
-load("sutils")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
-load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"))
-
-gnu_ver=os.getenv("gnu_ver") or "9.2.0"
-load(pathJoin("gnu", gnu_ver))
-
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/gnu-9.2/modulefiles/stack")
-
-load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
-load(pathJoin("hpc-gnu", os.getenv("hpc-gnu_ver") or "9.2"))
-load(pathJoin("hpc-mpich", os.getenv("hpc-mpich_ver") or "3.3.2"))
+load("stack-gcc/9.2.0")
+load("stack-openmpi/4.1.5")
+load("stack-python/3.9.12")
+load("cmake/3.23.1")
 
 load("srw_common")
 
-load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.8.9"))
-load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3"))
-load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.23"))
+load("nccmp/1.9.0.1")
+load("nco/5.0.6")
+load("ufs-pyenv")
 
-unsetenv("MKLROOT")
 setenv("CMAKE_C_COMPILER","mpicc")
 setenv("CMAKE_CXX_COMPILER","mpicxx")
 setenv("CMAKE_Fortran_COMPILER","mpif90")
diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua
index 02af59a626..f04f4d4df1 100644
--- a/modulefiles/build_hera_intel.lua
+++ b/modulefiles/build_hera_intel.lua
@@ -8,27 +8,28 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Hera ]===])
 prepend_path("MODULEPATH","/contrib/sutils/modulefiles")
 load("sutils")
 
-load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"))
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
-intel_ver=os.getenv("intel_ver") or "2022.1.2"
-load(pathJoin("intel", intel_ver))
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+load(pathJoin("stack-intel", stack_intel_ver))
 
-impi_ver=os.getenv("impi_ver") or "2022.1.2"
-load(pathJoin("impi", impi_ver))
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
+stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
+load(pathJoin("stack-python", stack_python_ver))
 
-load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
-load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2022.1.2"))
-load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver") or "2022.1.2"))
+cmake_ver=os.getenv("cmake_ver") or "3.20.1"
+load(pathJoin("cmake", cmake_ver))
 
 load("srw_common")
 
-load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.8.9.0"))
+load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1"))
 load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3"))
+load("ufs-pyenv")
 
 setenv("CMAKE_C_COMPILER","mpiicc")
 setenv("CMAKE_CXX_COMPILER","mpiicpc")
 setenv("CMAKE_Fortran_COMPILER","mpiifort")
 setenv("CMAKE_Platform","hera.intel")
-
diff --git a/modulefiles/build_jet_intel.lua b/modulefiles/build_jet_intel.lua
index 01c120daa3..fd19234474 100644
--- a/modulefiles/build_jet_intel.lua
+++ b/modulefiles/build_jet_intel.lua
@@ -1,25 +1,24 @@
 help([[
 This module loads libraries for building the UFS SRW App on
-the NOAA RDHPC machine Jet using Intel-2022.1.2
+the NOAA RDHPC machine Jet using Intel-2021.5.0
 ]])
 
 whatis([===[Loads libraries needed for building the UFS SRW App on Jet ]===])
 
-prepend_path("MODULEPATH","/contrib/sutils/modulefiles")
-load("sutils")
+prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/spack-stack/modulefiles")
 
-load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"))
-
-prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
-load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
-load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2022.1.2"))
-load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver") or "2022.1.2"))
+load("stack-intel/2021.5.0")
+load("stack-intel-oneapi-mpi/2021.5.1")
+load("stack-python/3.9.12")
+load("cmake/3.23.1")
 
 load("srw_common")
 
-load(pathJoin("prod_util", os.getenv("prod_util_ver") or "1.2.2"))
-load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.8.9.0"))
-load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3"))
+load("prod-util/1.2.2")
+load("nccmp/1.9.0.1")
+load("nco/5.0.6")
+load("ufs-pyenv")
 
 setenv("CMAKE_C_COMPILER","mpiicc")
 setenv("CMAKE_CXX_COMPILER","mpiicpc")
diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua
index 7cff9b6cb5..18cfd4491b 100644
--- a/modulefiles/build_noaacloud_intel.lua
+++ b/modulefiles/build_noaacloud_intel.lua
@@ -14,4 +14,4 @@ load("stack-intel")
 load("stack-intel-oneapi-mpi")
 load("cmake/3.22.1") 
 
-load("srw_common_spack")
+load("srw_common")
diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua
index 79eb5c6487..0b07e8493e 100644
--- a/modulefiles/build_orion_intel.lua
+++ b/modulefiles/build_orion_intel.lua
@@ -5,24 +5,21 @@ the MSU machine Orion using Intel-2022.1.2
 
 whatis([===[Loads libraries needed for building the UFS SRW App on Orion ]===])
 
-load("contrib")
-load("noaatools")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles")
 
-load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.1"))
-load(pathJoin("python", os.getenv("python_ver") or "3.9.2"))
-
-prepend_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/orion/hpc-stack/intel-2022.1.2/modulefiles/stack")
-load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
-load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2022.1.2"))
-load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver") or "2022.1.2"))
+load("stack-intel/2022.0.2")
+load("stack-intel-oneapi-mpi/2021.5.1")
+load("stack-python/3.9.7")
+load("cmake/3.22.1")
 
 load("srw_common")
 
-load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.8.9.0"))
-load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3"))
+load("nccmp/1.9.0.1")
+load("nco/5.0.6")
+load("ufs-pyenv")
 
 setenv("CMAKE_C_COMPILER","mpiicc")
 setenv("CMAKE_CXX_COMPILER","mpiicpc")
 setenv("CMAKE_Fortran_COMPILER","mpiifort")
 setenv("CMAKE_Platform","orion.intel")
-
diff --git a/modulefiles/srw_common_spack.lua b/modulefiles/srw_common_spack.lua
deleted file mode 100644
index 8e0a607a9d..0000000000
--- a/modulefiles/srw_common_spack.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-load("jasper/2.0.25")
-load("zlib/1.2.11")
-load("libpng/1.6.37")
-load("netcdf-c/4.7.4")
-load("netcdf-fortran/4.5.4")
-load("pio/2.5.3")
-load("esmf/8.3.0b09")
-load("fms/2022.01")
-
-load("bufr/11.7.0")
-load("bacio/2.4.1")
-load("crtm/2.3.0")
-load("g2/3.4.5")
-load("g2tmpl/1.10.0")
-load("ip/3.3.3")
-load("sp/2.3.3")
-load("w3emc/2.9.2")
-
-load("gftl-shared/1.5.0")
-load("yafyaml/0.5.1")
-load("mapl/2.22.0-esmf-8.3.0b09-esmf-8.3.0")
-
-load("nemsio/2.5.4")
-load("sfcio/1.4.1")
-load("sigio/2.3.2")
-load("w3nco/2.4.1")
-load("wrf_io/1.2.0")
-
-load("ncio/1.1.2")
-load("wgrib2/2.0.8")

From 72694779d8e4daedb8820ea4dc0820ac2bcea31e Mon Sep 17 00:00:00 2001
From: Ratko Vasic <ratko.vasic@noaa.gov>
Date: Thu, 7 Sep 2023 17:43:53 +0000
Subject: [PATCH 02/26] Update srw_common.lua

---
 modulefiles/srw_common.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua
index 12b5122c18..db7522e1dc 100644
--- a/modulefiles/srw_common.lua
+++ b/modulefiles/srw_common.lua
@@ -1,12 +1,12 @@
-load("jasper/2.0.25")
-load("zlib/1.2.11")
-load_any("png/1.6.35", "libpng/1.6.37")
+load_any("jasper/2.0.25","jasper/2.0.32")
+load_any("zlib/1.2.11","zlib/1.2.13")
+load_any("png/1.6.37","libpng/1.6.37")
 
-load_any("netcdf/4.7.4", "netcdf-c/4.7.4")
-load_any("netcdf/4.7.4", "netcdf-fortran/4.5.4")
-load_any("pio/2.5.7", "parallelio/2.5.2")
-load_any("esmf/8.3.0b09", "esmf/8.2.0")
-load("fms/2022.04")
+load_any("netcdf/4.7.4","netcdf-c/4.9.2")
+load_any("netcdf/4.7.4","netcdf-fortran/4.6.0")
+load_any("pio/2.5.7","parallelio/2.5.9")
+load_any("esmf/8.3.0b09","esmf/8.4.2")
+load("fms/2023.01")
 
 load("bufr/11.7.0")
 load("bacio/2.4.1")
@@ -17,16 +17,16 @@ load("ip/3.3.3")
 load("sp/2.3.3")
 load("w3emc/2.9.2")
 
-load_any("gftl-shared/v1.5.0", "gftl-shared/1.5.0")
-load_any("yafyaml/v0.5.1", "yafyaml/0.5.1")
-load_any("mapl/2.22.0-esmf-8.3.0b09", "mapl/2.11.0-esmf-8.2.0")
+load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0")
+load_any("yafyaml/v0.5.1","yafyaml/0.5.1")
+load_any("mapl/2.22.0-esmf-8.3.0b09","mapl/2.35.2-esmf-8.4.2")
 
-load("nemsio/2.5.4")
+load_any("nemsio/2.5.2","nemsio/2.5.4")
 load("sfcio/1.4.1")
 load("sigio/2.3.2")
 load("w3nco/2.4.1")
-load("wrf_io/1.2.0")
+load_any("wrf_io/1.2.0","wrf-io/1.2.0")
 
-load("ncdiag/1.1.1")
+--load("ncdiag/1.1.1")
 load("ncio/1.1.2")
 load("wgrib2/2.0.8")

From e8564d1086148c634c7fc2326d5017ac32a1d20f Mon Sep 17 00:00:00 2001
From: Ratko Vasic <ratko.vasic@noaa.gov>
Date: Thu, 14 Sep 2023 19:55:30 +0000
Subject: [PATCH 03/26] Update metplus modulefile

---
 modulefiles/tasks/hera/run_vx.local.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua
index 5979a8db96..f85600eddc 100644
--- a/modulefiles/tasks/hera/run_vx.local.lua
+++ b/modulefiles/tasks/hera/run_vx.local.lua
@@ -1,6 +1,6 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+load(pathJoin("met", os.getenv("met_ver") or "10.1.1"))
+load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.1"))
 load("python_srw")

From 38d040234de7cc89d9a6b5add6d00c49597fc4ba Mon Sep 17 00:00:00 2001
From: Ratko Vasic <ratko.vasic@noaa.gov>
Date: Tue, 19 Sep 2023 14:28:48 +0000
Subject: [PATCH 04/26] Fix after merge with develop

---
 modulefiles/srw_common.lua       |  2 +-
 modulefiles/srw_common_spack.lua | 28 ----------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 modulefiles/srw_common_spack.lua

diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua
index cf5a2e9216..0a6444e44c 100644
--- a/modulefiles/srw_common.lua
+++ b/modulefiles/srw_common.lua
@@ -4,7 +4,7 @@ load_any("png/1.6.37","libpng/1.6.37")
 
 load_any("netcdf/4.9.2","netcdf-c/4.9.2")
 load_any("netcdf/4.9.2","netcdf-fortran/4.6.0")
-load_any("pio/2.5.10","parallelio/2.5.10")
+load_any("pio/2.5.10","parallelio/2.5.9")
 load("esmf/8.4.2")
 load("fms/2023.01")
 
diff --git a/modulefiles/srw_common_spack.lua b/modulefiles/srw_common_spack.lua
deleted file mode 100644
index 5258e91cfe..0000000000
--- a/modulefiles/srw_common_spack.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-load("jasper/2.0.32")
-load("zlib/1.2.13")
-load("libpng/1.6.37")
-load("netcdf-c/4.9.2")
-load("netcdf-fortran/4.6.0")
-load("parallelio/2.5.9")
-load("esmf/8.4.2")
-load("fms/2023.01")
-
-load("bacio/2.4.1")
-load("crtm/2.4.0")
-load("g2/3.4.5")
-load("g2tmpl/1.10.2")
-load("ip/3.3.3")
-load("sp/2.3.3")
-load("w3emc/2.9.2")
-
-load("gftl-shared/1.5.0")
-load("yafyaml/0.5.1")
-load("mapl/2.35.2-esmf-8.4.2")
-
-load("nemsio/2.5.2")
-load("sfcio/1.4.1")
-load("sigio/2.3.2")
-load("w3nco/2.4.1")
-load("wrf-io/1.2.0")
-
-load("wgrib2/2.0.8")

From 4aa298bfbb2985086b79524ce05907cd8da290d7 Mon Sep 17 00:00:00 2001
From: Natalie Perlin <natalie.perlin@noaa.gov>
Date: Sun, 24 Sep 2023 07:37:31 -0500
Subject: [PATCH 05/26] set met and metplus environmental variables in
 run_vx.local.lua modulefiles

---
 modulefiles/tasks/cheyenne/run_vx.local.lua  | 23 +++++++++++++++++--
 modulefiles/tasks/derecho/run_vx.local.lua   | 23 +++++++++++++++++--
 modulefiles/tasks/gaea/run_vx.local.lua      | 23 +++++++++++++++++--
 modulefiles/tasks/hera/run_vx.local.lua      | 23 +++++++++++++++++--
 modulefiles/tasks/jet/run_vx.local.lua       | 23 +++++++++++++++++--
 modulefiles/tasks/noaacloud/run_vx.local.lua | 23 +++++++++++++++++--
 modulefiles/tasks/orion/run_vx.local.lua     | 24 ++++++++++++++++++--
 ush/machine/orion.yaml                       | 10 ++++++++
 8 files changed, 158 insertions(+), 14 deletions(-)

diff --git a/modulefiles/tasks/cheyenne/run_vx.local.lua b/modulefiles/tasks/cheyenne/run_vx.local.lua
index 5979a8db96..1bbea3bb4f 100644
--- a/modulefiles/tasks/cheyenne/run_vx.local.lua
+++ b/modulefiles/tasks/cheyenne/run_vx.local.lua
@@ -1,6 +1,25 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+local met_ver = (os.getenv("met_ver") or "10.1.2")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.3")
+if (mode() == "load") then
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
 load("python_srw")
diff --git a/modulefiles/tasks/derecho/run_vx.local.lua b/modulefiles/tasks/derecho/run_vx.local.lua
index 5979a8db96..1bbea3bb4f 100644
--- a/modulefiles/tasks/derecho/run_vx.local.lua
+++ b/modulefiles/tasks/derecho/run_vx.local.lua
@@ -1,6 +1,25 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+local met_ver = (os.getenv("met_ver") or "10.1.2")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.3")
+if (mode() == "load") then
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
 load("python_srw")
diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua
index 5979a8db96..dc4d98d876 100644
--- a/modulefiles/tasks/gaea/run_vx.local.lua
+++ b/modulefiles/tasks/gaea/run_vx.local.lua
@@ -1,6 +1,25 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+local met_ver = (os.getenv("met_ver") or "10.1.1")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.1")
+if (mode() == "load") then
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
 load("python_srw")
diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua
index f85600eddc..dc4d98d876 100644
--- a/modulefiles/tasks/hera/run_vx.local.lua
+++ b/modulefiles/tasks/hera/run_vx.local.lua
@@ -1,6 +1,25 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.1"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.1"))
+local met_ver = (os.getenv("met_ver") or "10.1.1")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.1")
+if (mode() == "load") then
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
 load("python_srw")
diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua
index 5979a8db96..dc4d98d876 100644
--- a/modulefiles/tasks/jet/run_vx.local.lua
+++ b/modulefiles/tasks/jet/run_vx.local.lua
@@ -1,6 +1,25 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+local met_ver = (os.getenv("met_ver") or "10.1.1")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.1")
+if (mode() == "load") then
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
 load("python_srw")
diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua
index 5979a8db96..dc4d98d876 100644
--- a/modulefiles/tasks/noaacloud/run_vx.local.lua
+++ b/modulefiles/tasks/noaacloud/run_vx.local.lua
@@ -1,6 +1,25 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+local met_ver = (os.getenv("met_ver") or "10.1.1")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.1")
+if (mode() == "load") then
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
 load("python_srw")
diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua
index 5979a8db96..12a9a814ba 100644
--- a/modulefiles/tasks/orion/run_vx.local.lua
+++ b/modulefiles/tasks/orion/run_vx.local.lua
@@ -1,6 +1,26 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+local met_ver = (os.getenv("met_ver") or "10.1.1")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.1")
+if (mode() == "load") then 
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then 
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
 load("python_srw")
+
diff --git a/ush/machine/orion.yaml b/ush/machine/orion.yaml
index 9e2ca454ee..38ccd279f9 100644
--- a/ush/machine/orion.yaml
+++ b/ush/machine/orion.yaml
@@ -32,3 +32,13 @@ platform:
   FIXsfc: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/fix/fix_sfc_climo
   FIXshp: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/NaturalEarth
   EXTRN_MDL_DATA_STORES: aws nomads
+data:
+  ics_lbcs:
+    FV3GFS:
+      nemsio: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/FV3GFS/nemsio/${yyyymmdd}${hh}
+      grib2: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/FV3GFS/grib2/${yyyymmdd}${hh}
+      netcdf: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/FV3GFS/netcdf/${yyyymmdd}${hh}
+    NAM: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/NAM/${yyyymmdd}${hh}
+    HRRR: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/HRRR/${yyyymmdd}${hh}
+    RAP: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmdd}${hh}
+    GSMGFS: /work/noaa/epic/role-epic/contrib/UFS_SRW_data/develop/input_model_data/GSMGFS/${yyyymmdd}${hh}

From 8b411f72e23c9361837a70df918c40f7a147629f Mon Sep 17 00:00:00 2001
From: EdwardSnyder-NOAA <edward.snyder@noaa.gov>
Date: Mon, 25 Sep 2023 13:22:30 +0000
Subject: [PATCH 06/26] Added met/metplus vars and updated met/metplus version

---
 modulefiles/tasks/gaea/run_vx.local.lua      | 8 ++++++--
 modulefiles/tasks/hera/run_vx.local.lua      | 5 +++++
 modulefiles/tasks/jet/run_vx.local.lua       | 9 +++++++--
 modulefiles/tasks/noaacloud/run_vx.local.lua | 9 +++++++--
 modulefiles/tasks/orion/run_vx.local.lua     | 8 ++++++--
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua
index 5979a8db96..9c38d04082 100644
--- a/modulefiles/tasks/gaea/run_vx.local.lua
+++ b/modulefiles/tasks/gaea/run_vx.local.lua
@@ -1,6 +1,10 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+load(pathJoin("met", os.getenv("met_ver") or "10.1.1"))
+load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.1"))
 load("python_srw")
+
+setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
+setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
+setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))
diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua
index f85600eddc..8876f07460 100644
--- a/modulefiles/tasks/hera/run_vx.local.lua
+++ b/modulefiles/tasks/hera/run_vx.local.lua
@@ -4,3 +4,8 @@ Compiler-specific modules are used for met and metplus libraries
 load(pathJoin("met", os.getenv("met_ver") or "10.1.1"))
 load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.1"))
 load("python_srw")
+
+setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
+setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
+setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))
+--
diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua
index 5979a8db96..9af56fa0d7 100644
--- a/modulefiles/tasks/jet/run_vx.local.lua
+++ b/modulefiles/tasks/jet/run_vx.local.lua
@@ -1,6 +1,11 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+load(pathJoin("met", os.getenv("met_ver") or "10.1.1"))
+load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.1"))
 load("python_srw")
+
+setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
+setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
+setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))
+
diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua
index 5979a8db96..9af56fa0d7 100644
--- a/modulefiles/tasks/noaacloud/run_vx.local.lua
+++ b/modulefiles/tasks/noaacloud/run_vx.local.lua
@@ -1,6 +1,11 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+load(pathJoin("met", os.getenv("met_ver") or "10.1.1"))
+load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.1"))
 load("python_srw")
+
+setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
+setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
+setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))
+
diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua
index 5979a8db96..9c38d04082 100644
--- a/modulefiles/tasks/orion/run_vx.local.lua
+++ b/modulefiles/tasks/orion/run_vx.local.lua
@@ -1,6 +1,10 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+load(pathJoin("met", os.getenv("met_ver") or "10.1.1"))
+load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.1"))
 load("python_srw")
+
+setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
+setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
+setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))

From 997271aeddcf7fb0deb0cdca797597193ad18a6c Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:23:48 -0400
Subject: [PATCH 07/26] Update srw_common.lua

---
 modulefiles/srw_common.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua
index 0a6444e44c..329589c50c 100644
--- a/modulefiles/srw_common.lua
+++ b/modulefiles/srw_common.lua
@@ -4,7 +4,7 @@ load_any("png/1.6.37","libpng/1.6.37")
 
 load_any("netcdf/4.9.2","netcdf-c/4.9.2")
 load_any("netcdf/4.9.2","netcdf-fortran/4.6.0")
-load_any("pio/2.5.10","parallelio/2.5.9")
+load_any("pio/2.5.10","parallelio/2.5.9","parallelio/2.5.10")
 load("esmf/8.4.2")
 load("fms/2023.01")
 

From 872aed345e73dd57b97a219c57815651d9e16386 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:25:36 -0400
Subject: [PATCH 08/26] Update run_vx.local.lua

---
 modulefiles/tasks/derecho/run_vx.local.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/tasks/derecho/run_vx.local.lua b/modulefiles/tasks/derecho/run_vx.local.lua
index 1bbea3bb4f..a75c46c448 100644
--- a/modulefiles/tasks/derecho/run_vx.local.lua
+++ b/modulefiles/tasks/derecho/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("MET_VERSION",     metplus_ver)
+setenv("METP:US_VERSION", metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 

From bf81a412672436dfb6aa8a3ea68d73b953ce9a61 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:26:51 -0400
Subject: [PATCH 09/26] Update run_vx.local.lua

---
 modulefiles/tasks/gaea/run_vx.local.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua
index b0fcc5385f..1d757be954 100644
--- a/modulefiles/tasks/gaea/run_vx.local.lua
+++ b/modulefiles/tasks/gaea/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_VERSION", metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 

From 5a8524b380492f5969b0324a4445263a732c344f Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:27:39 -0400
Subject: [PATCH 10/26] Update run_vx.local.lua

---
 modulefiles/tasks/gaea/run_vx.local.lua | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua
index 1d757be954..8dccf5e63c 100644
--- a/modulefiles/tasks/gaea/run_vx.local.lua
+++ b/modulefiles/tasks/gaea/run_vx.local.lua
@@ -23,7 +23,3 @@ if (mode() == "unload") then
   unload(pathJoin("metplus",metplus_ver))
 end
 load("python_srw")
-
-setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
-setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
-setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))

From 9db7ede170845d678565feaaab1d1ae69a5dc48c Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:28:31 -0400
Subject: [PATCH 11/26] Update run_vx.local.lua

---
 modulefiles/tasks/hera/run_vx.local.lua | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua
index 35f81825b1..8dccf5e63c 100644
--- a/modulefiles/tasks/hera/run_vx.local.lua
+++ b/modulefiles/tasks/hera/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_VERSION", metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 
@@ -23,8 +23,3 @@ if (mode() == "unload") then
   unload(pathJoin("metplus",metplus_ver))
 end
 load("python_srw")
-
-setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
-setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
-setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))
---

From 881cbb23fbb8b4636ad7e5c3d9c4d205138f0a63 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:29:40 -0400
Subject: [PATCH 12/26] Update run_vx.local.lua

---
 modulefiles/tasks/jet/run_vx.local.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua
index bda05e0a27..14ba1c7bb9 100644
--- a/modulefiles/tasks/jet/run_vx.local.lua
+++ b/modulefiles/tasks/jet/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_VERSION", metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 

From 05b32923d6d071fb44e2cdd8c3c58f2398d28957 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:30:11 -0400
Subject: [PATCH 13/26] Update run_vx.local.lua

---
 modulefiles/tasks/jet/run_vx.local.lua | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua
index 14ba1c7bb9..8dccf5e63c 100644
--- a/modulefiles/tasks/jet/run_vx.local.lua
+++ b/modulefiles/tasks/jet/run_vx.local.lua
@@ -23,8 +23,3 @@ if (mode() == "unload") then
   unload(pathJoin("metplus",metplus_ver))
 end
 load("python_srw")
-
-setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
-setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
-setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))
-

From b8ce932d7fbf854b40ba019bc4c8ebbbad4fe229 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:31:08 -0400
Subject: [PATCH 14/26] Update run_vx.local.lua

---
 modulefiles/tasks/noaacloud/run_vx.local.lua | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua
index bda05e0a27..5f563d9fb6 100644
--- a/modulefiles/tasks/noaacloud/run_vx.local.lua
+++ b/modulefiles/tasks/noaacloud/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_VERSION",     metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 
@@ -23,8 +23,3 @@ if (mode() == "unload") then
   unload(pathJoin("metplus",metplus_ver))
 end
 load("python_srw")
-
-setenv("MET_INSTALL_DIR", os.getenv("met_ROOT"))
-setenv("MET_BASE", pathJoin(os.getenv("met_ROOT"), "share", "met"))
-setenv("METPLUS_PATH", os.getenv("metplus_ROOT"))
-

From 4d9df19ee6166a2387f7850aa066defcc2793ac0 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:32:35 -0400
Subject: [PATCH 15/26] Update run_vx.local.lua

---
 modulefiles/tasks/orion/run_vx.local.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua
index c3c524bffd..62646d0992 100644
--- a/modulefiles/tasks/orion/run_vx.local.lua
+++ b/modulefiles/tasks/orion/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_VERSION", metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 
@@ -22,4 +22,4 @@ if (mode() == "unload") then
   unload(pathJoin("met", met_ver))
   unload(pathJoin("metplus",metplus_ver))
 end
-load("python_srw")
\ No newline at end of file
+load("python_srw")

From baf25afb5be40db2d09dfeceaf7c54efb98fb0e4 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:34:21 -0400
Subject: [PATCH 16/26] Update run_vx.local.lua

---
 modulefiles/tasks/cheyenne/run_vx.local.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/tasks/cheyenne/run_vx.local.lua b/modulefiles/tasks/cheyenne/run_vx.local.lua
index 1bbea3bb4f..54cc632c21 100644
--- a/modulefiles/tasks/cheyenne/run_vx.local.lua
+++ b/modulefiles/tasks/cheyenne/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("MET_VERSION",     metplus_ver)
+setenv("METPLUS_VERSION", metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 

From eb4e8203f4d4d1ffaeec5255836299bae5b1a39b Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:34:51 -0400
Subject: [PATCH 17/26] Update run_vx.local.lua

---
 modulefiles/tasks/derecho/run_vx.local.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/tasks/derecho/run_vx.local.lua b/modulefiles/tasks/derecho/run_vx.local.lua
index a75c46c448..54cc632c21 100644
--- a/modulefiles/tasks/derecho/run_vx.local.lua
+++ b/modulefiles/tasks/derecho/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("METP:US_VERSION", metplus_ver)
+setenv("METPLUS_VERSION", metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 

From 8ce1e85bce937b04a7063620ead49a98ae536462 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:35:33 -0400
Subject: [PATCH 18/26] Update run_vx.local.lua

---
 modulefiles/tasks/noaacloud/run_vx.local.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua
index 5f563d9fb6..8dccf5e63c 100644
--- a/modulefiles/tasks/noaacloud/run_vx.local.lua
+++ b/modulefiles/tasks/noaacloud/run_vx.local.lua
@@ -14,7 +14,7 @@ setenv("MET_INSTALL_DIR", base_met)
 setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
 setenv("MET_BASE",        pathJoin(base_met,"share/met"))
 setenv("MET_VERSION",     met_ver)
-setenv("METPLUS_VERSION",     metplus_ver)
+setenv("METPLUS_VERSION", metplus_ver)
 setenv("METPLUS_ROOT",    base_metplus)
 setenv("METPLUS_PATH",    base_metplus)
 

From b3e919090f02bd3d33393695d2a3d1df053153c3 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:36:36 -0400
Subject: [PATCH 19/26] Update build_gaea_intel.lua

---
 modulefiles/build_gaea_intel.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua
index fed9c9636e..e78d96c9ea 100644
--- a/modulefiles/build_gaea_intel.lua
+++ b/modulefiles/build_gaea_intel.lua
@@ -1,6 +1,6 @@
 help([[
 This module loads libraries for building the UFS SRW App on
-the NOAA RDHPC machine Gaea using Intel-2021.3.0.
+the NOAA RDHPC machine Gaea using Intel-2022.0.2.
 ]])
 
 whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===])

From 322db3534a0f9c5a3a58f0796ce330290541586e Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:37:06 -0400
Subject: [PATCH 20/26] Update build_gaea_intel.lua

---
 modulefiles/build_gaea_intel.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua
index e78d96c9ea..df93eb2f17 100644
--- a/modulefiles/build_gaea_intel.lua
+++ b/modulefiles/build_gaea_intel.lua
@@ -1,6 +1,6 @@
 help([[
 This module loads libraries for building the UFS SRW App on
-the NOAA RDHPC machine Gaea using Intel-2022.0.2.
+the NOAA RDHPC machine Gaea using Intel-2022.0.2
 ]])
 
 whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===])

From 46053a66189e5c47fe0ef7ed085af6a48026afd3 Mon Sep 17 00:00:00 2001
From: Ratko Vasic <ratko.vasic@noaa.gov>
Date: Fri, 29 Sep 2023 14:42:58 -0500
Subject: [PATCH 21/26] Build SRW on Hercules using spack-stack.

---
 modulefiles/build_hercules_intel.lua        | 22 +++++++++-----------
 modulefiles/srw_common.lua                  |  2 +-
 modulefiles/tasks/hercules/run_vx.local.lua | 23 +++++++++++++++++++--
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/modulefiles/build_hercules_intel.lua b/modulefiles/build_hercules_intel.lua
index 1073952dc5..1772460542 100644
--- a/modulefiles/build_hercules_intel.lua
+++ b/modulefiles/build_hercules_intel.lua
@@ -3,22 +3,21 @@ This module loads libraries for building the UFS SRW App on
 the MSU machine Hercules using intel-oneapi-compilers/2022.2.1
 ]])
 
-whatis([===[Loads libraries needed for building the UFS SRW App on Orion ]===])
+whatis([===[Loads libraries needed for building the UFS SRW App on Hercules ]===])
 
-load("contrib")
-load("noaatools")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles")
 
-load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3"))
-
-prepend_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/hercules/hpc-stack/intel-2022.2.1/modulefiles/stack")
-load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
-load(pathJoin("hpc-intel-oneapi-compilers", os.getenv("hpc_intel_ver") or "2022.2.1"))
-load(pathJoin("hpc-intel-oneapi-mpi", os.getenv("hpc_mpi_ver") or "2021.7.1"))
+load("stack-intel/2021.7.1")
+load("stack-intel-oneapi-mpi/2021.7.1")
+load("stack-python/3.9.14")
+load("cmake/3.26.3")
 
 load("srw_common")
 
-load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.8.9.0"))
-load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
+load("nccmp/1.9.0.1")
+load("nco/5.0.6")
+load("ufs-pyenv")
 
 setenv("CFLAGS","-diag-disable=10441")
 setenv("FFLAGS","-diag-disable=10441")
@@ -27,4 +26,3 @@ setenv("CMAKE_C_COMPILER","mpiicc")
 setenv("CMAKE_CXX_COMPILER","mpiicpc")
 setenv("CMAKE_Fortran_COMPILER","mpiifort")
 setenv("CMAKE_Platform","hercules.intel")
-
diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua
index 329589c50c..6cd326a1f8 100644
--- a/modulefiles/srw_common.lua
+++ b/modulefiles/srw_common.lua
@@ -26,4 +26,4 @@ load("sigio/2.3.2")
 load("w3nco/2.4.1")
 load_any("wrf_io/1.2.0","wrf-io/1.2.0")
 
-load("wgrib2/2.0.8")
+load_any("wgrib2/2.0.8","wgrib2/3.1.1")
diff --git a/modulefiles/tasks/hercules/run_vx.local.lua b/modulefiles/tasks/hercules/run_vx.local.lua
index 5979a8db96..8dccf5e63c 100644
--- a/modulefiles/tasks/hercules/run_vx.local.lua
+++ b/modulefiles/tasks/hercules/run_vx.local.lua
@@ -1,6 +1,25 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-load(pathJoin("met", os.getenv("met_ver") or "10.1.2"))
-load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3"))
+local met_ver = (os.getenv("met_ver") or "10.1.1")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.1")
+if (mode() == "load") then
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("METPLUS_VERSION", metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
 load("python_srw")

From 38cc869f166dc6ebc17928fb64cc33ee597cb256 Mon Sep 17 00:00:00 2001
From: EdwardSnyder-NOAA <edward.snyder@noaa.gov>
Date: Wed, 4 Oct 2023 14:49:27 +0000
Subject: [PATCH 22/26] updated python to workflow tools

---
 modulefiles/tasks/noaacloud/python_srw.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modulefiles/tasks/noaacloud/python_srw.lua b/modulefiles/tasks/noaacloud/python_srw.lua
index 602d60842f..ed1e785a4c 100644
--- a/modulefiles/tasks/noaacloud/python_srw.lua
+++ b/modulefiles/tasks/noaacloud/python_srw.lua
@@ -1 +1,4 @@
-prepend_path("PATH", "/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin")
+prepend_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
+
+setenv("SRW_ENV", "workflow_tools")

From 32961cc7ed6fd8658f2533993ac50a08e0960a3c Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Thu, 5 Oct 2023 10:33:08 -0400
Subject: [PATCH 23/26] Update wflow_gaea.lua

---
 modulefiles/wflow_gaea.lua | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modulefiles/wflow_gaea.lua b/modulefiles/wflow_gaea.lua
index 3e95511f80..e9e59a41ca 100644
--- a/modulefiles/wflow_gaea.lua
+++ b/modulefiles/wflow_gaea.lua
@@ -13,12 +13,6 @@ prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/rocoto/modulefiles")
 load("rocoto")
 load("alps")
 
-local MKLROOT="/opt/intel/oneapi/mkl/2023.1.0/"
-prepend_path("LD_LIBRARY_PATH",pathJoin(MKLROOT,"lib/intel64"))
-pushenv("MKLROOT", MKLROOT)
-pushenv("GSI_BINARY_SOURCE_DIR", "/lustre/f2/dev/role.epic/contrib/GSI_data/fix/20230601")
-setenv("PMI_NO_PREINITIALIZE","1")
-
 if mode() == "load" then
    LmodMsgRaw([===[Please do the following to activate conda:
        > conda activate workflow_tools

From 2d9f437ec7ec8fea2037d0fe707e4730a622e619 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Thu, 5 Oct 2023 10:34:44 -0400
Subject: [PATCH 24/26] Update gaea.yaml

---
 ush/machine/gaea.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml
index 8687fd9924..301fa5c5a1 100644
--- a/ush/machine/gaea.yaml
+++ b/ush/machine/gaea.yaml
@@ -15,7 +15,7 @@ platform:
   RUN_CMD_POST: srun --export=ALL  -n $nprocs
   RUN_CMD_PRDGEN: srun --export=ALL  -n $nprocs
   RUN_CMD_SERIAL: time
-  RUN_CMD_UTILS: srun --export=ALL --mpi=pmi2 -n $nprocs
+  RUN_CMD_UTILS: srun --export=ALL -n $nprocs
   SCHED_NATIVE_CMD: --clusters=c4 --export=NONE
   SCHED_NATIVE_CMD_HPSS: --clusters=es --export=NONE
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'

From 0f1979684979eaa404d99cdb0a8868c32107e1ca Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Thu, 5 Oct 2023 10:36:32 -0400
Subject: [PATCH 25/26] Update verify_pre.yaml

Increase walltime
---
 parm/wflow/verify_pre.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parm/wflow/verify_pre.yaml b/parm/wflow/verify_pre.yaml
index ccc8e0d11e..1ae6894d59 100644
--- a/parm/wflow/verify_pre.yaml
+++ b/parm/wflow/verify_pre.yaml
@@ -261,4 +261,4 @@ metatask_PcpCombine_fcst_ASNOW_all_accums_all_mems:
           attrs:
             age: 00:00:00:30
           text: !cycstr '{{ workflow.EXPTDIR }}/@Y@m@d@H/post_files_exist_mem#mem#.txt'
-      walltime: 00:05:00
+      walltime: 00:10:00

From daca370db11d7e2a211a515f3252d5559f181488 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Thu, 5 Oct 2023 14:43:12 -0400
Subject: [PATCH 26/26] Update build_hera_gnu.lua

---
 modulefiles/build_hera_gnu.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modulefiles/build_hera_gnu.lua b/modulefiles/build_hera_gnu.lua
index 46a0181a94..578ed64cbb 100644
--- a/modulefiles/build_hera_gnu.lua
+++ b/modulefiles/build_hera_gnu.lua
@@ -15,9 +15,9 @@ load("cmake/3.23.1")
 
 load("srw_common")
 
-load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.1.0"))
+load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1"))
 load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
-load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.23"))
+load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.19"))
 load("ufs-pyenv")
 
 setenv("CMAKE_C_COMPILER","mpicc")