Merge branch 'spack-stack' of github.com:DavidHuber-NOAA/GSI into spa…

…ck-stack
DavidHuber-NOAA · Nov 9, 2023 · 6c6267d · 6c6267d
2 parents 68e699b + 46c7beb
commit 6c6267d
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/modulefiles/gsi_s4.lua b/modulefiles/gsi_s4.lua
@@ -1,22 +1,21 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/modulefiles")
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
 
-local stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
+local python_ver=os.getenv("python_ver") or "3.10.8"
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.0"
 local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
-load(pathJoin("stack-python", stack_python_ver))
+load(pathJoin("python", python_ver))
 load(pathJoin("cmake", cmake_ver))
 
 load("gsi_common")
-load(pathJoin("prod-util", prod_util_ver))
+load(pathJoin("prod_util", prod_util_ver))
 
 pushenv("CFLAGS", "-march=ivybridge")
 pushenv("FFLAGS", "-march=ivybridge")