Move SS module path to version files.

kayeekayee · Feb 20, 2024 · fdc638c · fdc638c
1 parent d7d28a6
commit fdc638c
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 23 deletions.
diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua
@@ -2,9 +2,8 @@ help([[
 Load environment to run GFS on Hera
 ]])
 
-spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
-spack_env=(os.getenv("spack_env") or "None")
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))

diff --git a/modulefiles/module_base.hercules.lua b/modulefiles/module_base.hercules.lua
@@ -2,20 +2,15 @@ help([[
 Load environment to run GFS on Hercules
 ]])
 
-spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
-spack_env=(os.getenv("spack_env") or "None")
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
 load(pathJoin("intel-oneapi-mkl", (os.getenv("intel_mkl_ver") or "None")))
 load(pathJoin("python", (os.getenv("python_ver") or "None")))
 load(pathJoin("perl", (os.getenv("perl_ver") or "None")))
 
--- TODO load NCL once the SAs remove the 'depends_on' statements within it
---      NCL is a static installation and does not depend on any libraries
---      but as is will load, among others, the system netcdf-c/4.9.0 module
---load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
 load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
 load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
 load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))

diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
@@ -2,9 +2,8 @@ help([[
 Load environment to run GFS on Jet
 ]])
 
-spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
-spack_env=(os.getenv("spack_env") or "None")
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))

diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
@@ -2,9 +2,8 @@ help([[
 Load environment to run GFS on Orion
 ]])
 
-spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
-spack_env=(os.getenv("spack_env") or "None")
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))

diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua
@@ -2,9 +2,8 @@ help([[
 Load environment to run GFS on S4
 ]])
 
-spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
-spack_env=(os.getenv("spack_env") or "None")
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
+local spack_mod_path=(os.getenv("spack_mod_path") or "None")
+prepend_path("MODULEPATH", spack_mod_path)
 
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))

diff --git a/versions/build.hera.ver b/versions/build.hera.ver
@@ -1,3 +1,4 @@
+export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core"
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-dev

diff --git a/versions/build.hercules.ver b/versions/build.hercules.ver
@@ -1,3 +1,4 @@
+export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core"
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export spack_env=gsi-addon

diff --git a/versions/build.jet.ver b/versions/build.jet.ver
@@ -1,3 +1,4 @@
+export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core"
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-dev

diff --git a/versions/build.orion.ver b/versions/build.orion.ver
@@ -1,4 +1,5 @@
-export stack_intel_ver=2021.5.0
+export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core"
+export stack_intel_ver=2022.0.2
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-env
 source "${HOMEgfs:-}/versions/build.spack.ver"
diff --git a/versions/build.s4.ver b/versions/build.s4.ver
@@ -1,4 +1,4 @@
+export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core"
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.0
-export spack_env=gsi-addon-env
 source "${HOMEgfs:-}/versions/build.spack.ver"
diff --git a/versions/run.hera.ver b/versions/run.hera.ver
@@ -1,3 +1,4 @@
+export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core"
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-dev

diff --git a/versions/run.hercules.ver b/versions/run.hercules.ver
@@ -1,9 +1,9 @@
+export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core"
 export stack_intel_ver=2021.9.0
 export stack_impi_ver=2021.9.0
 export intel_mkl_ver=2023.1.0
 export spack_env=gsi-addon-env
 
-export ncl_ver=6.6.2
 export perl_ver=5.36.0
 
 source "${HOMEgfs:-}/versions/run.spack.ver"
diff --git a/versions/run.jet.ver b/versions/run.jet.ver
@@ -1,3 +1,4 @@
+export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core"
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-dev

diff --git a/versions/run.orion.ver b/versions/run.orion.ver
@@ -1,3 +1,4 @@
+export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core"
 export stack_intel_ver=2022.0.2
 export stack_impi_ver=2021.5.1
 export spack_env=gsi-addon-env

diff --git a/versions/run.s4.ver b/versions/run.s4.ver
@@ -1,6 +1,6 @@
+export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core"
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.0
-export spack_env=gsi-addon-env
 
 export ncl_ver=6.4.0-precompiled