Merge branch 'develop' into feature/cleanup-automate

NOAA-EMC · Oct 2, 2024 · 6edea97 · 6edea97
2 parents a0c0e38 + 66a422d
commit 6edea97
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/modulefiles/noaacloud.lua b/modulefiles/noaacloud.lua
@@ -2,15 +2,12 @@ help([[
 Load environment to build UPP on NOAA Cloud
 ]])
 
-
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
-
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
-load(pathJoin("stack-intel", stack_intel_ver))
-
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
-load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/modules/modulefiles")
+load("gnu")
+load("stack-intel")
+load("stack-intel-oneapi-mpi")
+unload("gnu")
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 load(pathJoin("cmake", cmake_ver))