From 302bb26df121c4ffc438962b1e5fa15b922dcb5e Mon Sep 17 00:00:00 2001
From: Ratko Vasic <Ratko.Vasic@noaa.gov>
Date: Fri, 10 Nov 2023 06:37:36 +0000
Subject: [PATCH] Upgrade spack stack from 1.4.1 to 1.5.0 on Gaea C4.

---
 modulefiles/build_gaea_intel.lua              | 18 +++++++++++-------
 modulefiles/tasks/gaea/plot_allvars.local.lua |  1 +
 modulefiles/tasks/gaea/python_srw.lua         |  1 +
 modulefiles/tasks/gaea/run_vx.local.lua       |  6 +++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua
index df93eb2f17..f4f41b3416 100644
--- a/modulefiles/build_gaea_intel.lua
+++ b/modulefiles/build_gaea_intel.lua
@@ -8,18 +8,22 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===])
 unload("intel")
 unload("cray-mpich")
 unload("cray-python")
-unload("darshan")
 
-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/dev/wpo/role.epic/contrib/spack-stack/c4/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
 prepend_path("MODULEPATH", "/lustre/f2/pdata/esrl/gsd/spack-stack/modulefiles")
+stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
+load(pathJoin("stack-intel", stack_intel_ver))
 
-load("stack-intel/2022.0.2")
-load("stack-cray-mpich/7.7.20")
-load("stack-python/3.9.12")
-load("cmake/3.23.1")
+stack_mpich_ver=os.getenv("stack_mpich_ver") or "7.7.20"
+load(pathJoin("stack-cray-mpich", stack_mpich_ver))
+
+stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
+load(pathJoin("stack-python", stack_python_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
 
 load("srw_common")
-load("ufs-pyenv")
 -- Need at runtime
 load("alps")
 
diff --git a/modulefiles/tasks/gaea/plot_allvars.local.lua b/modulefiles/tasks/gaea/plot_allvars.local.lua
index 5cd4d13325..61f185f2b4 100644
--- a/modulefiles/tasks/gaea/plot_allvars.local.lua
+++ b/modulefiles/tasks/gaea/plot_allvars.local.lua
@@ -1,3 +1,4 @@
+unload("python")
 prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/miniconda3/modulefiles")
 load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
diff --git a/modulefiles/tasks/gaea/python_srw.lua b/modulefiles/tasks/gaea/python_srw.lua
index a18856b8d2..08b9ec6c1f 100644
--- a/modulefiles/tasks/gaea/python_srw.lua
+++ b/modulefiles/tasks/gaea/python_srw.lua
@@ -1,3 +1,4 @@
+unload("python")
 prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/miniconda3/modulefiles")
 load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua
index 8dccf5e63c..83949cff83 100644
--- a/modulefiles/tasks/gaea/run_vx.local.lua
+++ b/modulefiles/tasks/gaea/run_vx.local.lua
@@ -1,8 +1,8 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-local met_ver = (os.getenv("met_ver") or "10.1.1")
-local metplus_ver = (os.getenv("metplus_ver") or "4.1.1")
+local met_ver = (os.getenv("met_ver") or "11.1.0")
+local metplus_ver = (os.getenv("metplus_ver") or "5.1.0")
 if (mode() == "load") then
   load(pathJoin("met", met_ver))
   load(pathJoin("metplus",metplus_ver))
@@ -22,4 +22,4 @@ if (mode() == "unload") then
   unload(pathJoin("met", met_ver))
   unload(pathJoin("metplus",metplus_ver))
 end
-load("python_srw")
+load("ufs-pyenv")