Skip to content

Commit

Permalink
Correct Hercules modules. NOAA-EMC#1588
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidHuber-NOAA committed Dec 6, 2023
1 parent e181fc3 commit 6b1c0af
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 4 additions & 6 deletions modulefiles/module_base.hercules.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ load(pathJoin("stack-intel", os.getenv("stack_intel_ver")))
load(pathJoin("stack-intel-oneapi-mpi", os.getenv("stack_impi_ver")))
load(pathJoin("python", os.getenv("python_ver")))

load(pathJoin("gempak", os.getenv("gempak_ver")))
load(pathJoin("ncl", os.getenv("ncl_ver")))
-- 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")))
load(pathJoin("jasper", os.getenv("jasper_ver")))
load(pathJoin("libpng", os.getenv("libpng_ver")))
load(pathJoin("cdo", os.getenv("cdo_ver")))
Expand All @@ -32,13 +34,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"))

--prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
load(pathJoin("prepobs", os.getenv("prepobs_run_ver")))

Expand Down
3 changes: 2 additions & 1 deletion versions/run.hercules.ver
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ export ncl_ver=6.6.2

source "${HOMEgfs:-}/versions/run.spack.ver"

# wgrib2 is different on Hercules from all the other systems
# wgrib2 and cdo are different on Hercules from all the other systems
export wgrib2_ver=3.1.1
export cdo_ver=2.2.0

0 comments on commit 6b1c0af

Please sign in to comment.