diff --git a/modulefiles/common-run.lua b/modulefiles/common-run.lua index 3055fda6..b4d0123f 100644 --- a/modulefiles/common-run.lua +++ b/modulefiles/common-run.lua @@ -2,9 +2,11 @@ help([[ Load common modules to run GSI Monitoring on all machines ]]) -local netcdf_ver=os.getenv("netcdf_ver") or "4.9.2" +local netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2" +local netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0" local wgrib2_ver=os.getenv("wgrib2_ver") or "2.0.8" -load(pathJoin("netcdf", netcdf_ver)) +load(pathJoin("netcdf-c", netcdf_c_ver)) +load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) load(pathJoin("wgrib2", wgrib2_ver)) diff --git a/modulefiles/hera.intel-run.lua b/modulefiles/hera.intel-run.lua index b4d94564..6826a143 100644 --- a/modulefiles/hera.intel-run.lua +++ b/modulefiles/hera.intel-run.lua @@ -11,7 +11,7 @@ local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2" load(pathJoin("stack-intel", stack_intel_ver)) load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) load(pathJoin("grads", grads_ver)) -load(pathJoin("prod-util", prod_util_ver)) +load(pathJoin("prod_util", prod_util_ver)) load("common-run") diff --git a/modulefiles/jet-run.lua b/modulefiles/jet-run.lua index f9a2d964..f57a11fa 100644 --- a/modulefiles/jet-run.lua +++ b/modulefiles/jet-run.lua @@ -3,7 +3,6 @@ help([[ prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") -local stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" local grads_ver=os.getenv("grads_ver") or "2.2.1" @@ -11,7 +10,6 @@ local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2" load(pathJoin("stack-intel", stack_intel_ver)) load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -load(pathJoin("stack-python", stack_python_ver)) load(pathJoin("grads", grads_ver)) load(pathJoin("prod_util", prod_util_ver)) diff --git a/modulefiles/s4-run.lua b/modulefiles/s4-run.lua index 0f88da20..6de23c56 100644 --- a/modulefiles/s4-run.lua +++ b/modulefiles/s4-run.lua @@ -3,8 +3,6 @@ help([[ prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") -load("license_intel/S4") - local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" local grads_ver=os.getenv("grads_ver") or "2.2.1" @@ -13,7 +11,7 @@ local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2" load(pathJoin("stack-intel", stack_intel_ver)) load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) load(pathJoin("grads", grads_ver)) -load(pathJoin("prod-util", prod_util_ver)) +load(pathJoin("prod_util", prod_util_ver)) load("common-run")