diff --git a/modulefiles/wcoss2-run.lua b/modulefiles/wcoss2-run.lua index 510c9a8..e40a17f 100644 --- a/modulefiles/wcoss2-run.lua +++ b/modulefiles/wcoss2-run.lua @@ -5,15 +5,17 @@ local intel_ver=os.getenv("intel_ver") or "19.1.3.304" local prod_util_ver=os.getenv("prod_util_ver") or "2.0.13" local prod_envir_ver=os.getenv("prod_envir_ver") or "2.0.6" +local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4" +local wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8" + load(pathJoin("intel", intel_ver)) load(pathJoin("prod_util", prod_util_ver)) load(pathJoin("prod_envir", prod_envir_ver)) +load(pathJoin("netcdf", netcdf_ver)) +load(pathJoin("wgrib2", wgrib2_ver)) prepend_path("MODULEPATH", "/apps/test/lmodules/core/") load ("GrADS/2.2.2") -load("common-run") - - whatis("Description: GSI Monitoring run-time environment on wcoss2") diff --git a/modulefiles/wcoss2.lua b/modulefiles/wcoss2.lua index 243d09d..4df68a1 100644 --- a/modulefiles/wcoss2.lua +++ b/modulefiles/wcoss2.lua @@ -7,12 +7,20 @@ local craype_ver=os.getenv("craype_ver") or "2.7.8" local cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7" local cmake_ver= os.getenv("cmake_ver") or "3.20.2" +local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4" +local bacio_ver=os.getenv("bacio_ver") or "2.4.1" +local w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" +local ncdiag_ver=os.getenv("ncdiag_ver") or "1.0.0" + load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver)) load(pathJoin("intel", intel_ver)) load(pathJoin("craype", craype_ver)) load(pathJoin("cray-mpich", cray_mpich_ver)) load(pathJoin("cmake", cmake_ver)) -load("common") +load(pathJoin("netcdf", netcdf_ver)) +load(pathJoin("bacio", bacio_ver)) +load(pathJoin("w3emc", w3emc_ver)) +load(pathJoin("ncdiag", ncdiag_ver)) whatis("Description: GSI Monitoring environment on WCOSS2")