From e041132e6588170f5a8658fcc9f697cf2155b706 Mon Sep 17 00:00:00 2001 From: David Huber Date: Thu, 30 Nov 2023 12:02:49 -0600 Subject: [PATCH] Cleanup Orion module files. #1868 --- modulefiles/module_base.orion.lua | 3 +++ modulefiles/module_gwsetup.orion.lua | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua index 5ae43d5d34..3464accc89 100644 --- 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 index 477ceb6251..93a59c8e50 100644 --- 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")