Upgrade compiler/libraries to Intel 2022/spack-stack NOAA-EMC#18

modulefiles/gsiutils_common.lua

@@ -2,22 +2,24 @@ help([[
 Load common modules to build GSI utilities on all machines
 ]])
 
-local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
+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 bufr_ver=os.getenv("bufr_ver") or "11.7.0"
 local bacio_ver=os.getenv("bacio_ver") or "2.4.1"
-local w3emc_ver=os.getenv("w3emc_ver") or "2.9.1"
+local w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 local sp_ver=os.getenv("sp_ver") or "2.3.3"
 local ip_ver=os.getenv("ip_ver") or "3.3.3"
 local sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
 local nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
 local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
 local ncio_ver=os.getenv("ncio_ver") or "1.1.2"
-local crtm_ver=os.getenv("crtm_ver") or "2.3.0"
-local ncdiag_ver=os.getenv("ncdiag_ver") or "1.0.0"
+local crtm_ver=os.getenv("crtm_ver") or "2.4.0"
+local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.1"
 
-load(pathJoin("netcdf", netcdf_ver))
+load(pathJoin("netcdf-c", netcdf_c_ver))
+load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 
 load(pathJoin("bufr", bufr_ver))
 load(pathJoin("bacio", bacio_ver))
@@ -27,8 +29,7 @@ load(pathJoin("ip", ip_ver))
 load(pathJoin("sigio", sigio_ver))
 load(pathJoin("sfcio", sfcio_ver))
 load(pathJoin("nemsio", nemsio_ver))
-load(pathJoin("wrf_io", wrf_io_ver))
+load(pathJoin("wrf-io", wrf_io_ver))
 load(pathJoin("ncio", ncio_ver))
 load(pathJoin("crtm", crtm_ver))
-load(pathJoin("ncdiag", ncdiag_ver))
-
+load(pathJoin("gsi-ncdiag", ncdiag_ver))

modulefiles/gsiutils_hera.gnu.lua

@@ -1,23 +1,23 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
-local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-local hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "9.2.0"
-local hpc_mpich_ver=os.getenv("hpc_mpich_ver") or "3.3.2"
-local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
-local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+local stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
+local stack_intel_ver=os.getenv("stack_gcc_ver") or "9.2.0"
+local stack_impi_ver=os.getenv("stack_openmpi_ver") or "4.1.5"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local openblas_ver=os.getenv("cmake_ver") or "0.3.19"
 
-load(pathJoin("hpc", hpc_ver))
-load(pathJoin("hpc-gnu", hpc_gnu_ver))
-load(pathJoin("hpc-mpich", hpc_mpich_ver))
+load(pathJoin("stack-gcc", stack_gcc_ver))
+load(pathJoin("stack-openmpi", stack_openmpi_ver))
+load(pathJoin("stack-python", stack_python_ver))
 load(pathJoin("cmake", cmake_ver))
 
 load("gsiutils_common")
 
-load(pathJoin("prod_util", prod_util_ver))
-
-pushenv("MKLROOT", "/apps/oneapi/mkl/2022.0.2")
+load(pathJoin("prod-util", prod_util_ver))
+load(pathJoin("openblas", openblas_ver))
 
 whatis("Description: GSI utilities environment on Hera with GNU Compilers")

modulefiles/gsiutils_hera.intel.lua

@@ -1,27 +1,23 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
-local hpc_ver=os.getenv("hpc_ver") or "1.1.0"
-local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
-local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.0.4"
-local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
-local anaconda_ver=os.getenv("anaconda_ver") or "2.3.0"
+local stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
+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 cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
 
-load(pathJoin("hpc", hpc_ver))
-load(pathJoin("hpc-intel", hpc_intel_ver))
-load(pathJoin("hpc-impi", hpc_impi_ver))
+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("cmake", cmake_ver))
 
-prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
-
-load(pathJoin("anaconda", anaconda_ver))
-
 load("gsiutils_common")
 
-load(pathJoin("prod_util", prod_util_ver))
+load(pathJoin("prod-util", prod_util_ver))
 
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")