Cleanup Orion module files. NOAA-EMC#1868

DavidHuber-NOAA · Nov 30, 2023 · e041132 · e041132
1 parent bb2fc24
commit e041132
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua
@@ -32,6 +32,9 @@ load(pathJoin("py-netcdf4", os.getenv("py_netcdf4_ver")))
 load(pathJoin("py-pyyaml", os.getenv("py_pyyaml_ver")))
 load(pathJoin("py-jinja2", os.getenv("py_jinja2_ver")))
 
+load(pathJoin("met", os.getenv("met_ver")))
+load(pathJoin("metplus", os.getenv("metplus_ver")))
+
 setenv("WGRIB2","wgrib2")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 

diff --git a/modulefiles/module_gwsetup.orion.lua b/modulefiles/module_gwsetup.orion.lua
@@ -7,10 +7,15 @@ load(pathJoin("contrib","0.1"))
 load(pathJoin("rocoto","1.3.3"))
 load(pathJoin("git","2.28.0"))
 
--- Temporary until official hpc-stack is updated
-prepend_path("MODULEPATH", "/work2/noaa/global/wkolczyn/save/hpc-stack/modulefiles/stack")
-load(pathJoin("hpc", "1.2.0"))
-load(pathJoin("hpc-miniconda3", "4.6.14"))
-load(pathJoin("gfs_workflow", "1.0.0"))
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
 
-whatis("Description: GFS run ci top-level sripts environment")
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
+local python_ver=os.getenv("python_ver") or "3.10.8"
+
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("python", python_ver))
+load("py-jinja2")
+load("py-pyyaml")
+load("py-numpy")
+
+whatis("Description: GFS run setup environment")