Upgrade to spack-stack 1.9.2

CMakeLists.txt

@@ -17,11 +17,11 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$")
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
-if(NOT CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel|Clang|AppleClang)$")
+if(NOT CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel|IntelLLVM|Clang|AppleClang)$")
   message(WARNING "${CMAKE_C_COMPILER_ID} is not supported.")
 endif()
 
-if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Intel)$")
+if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Intel|IntelLLVM)$")
   message(WARNING "${CMAKE_Fortran_COMPILER_ID} is not supported.")
 endif()
 
@@ -95,7 +95,6 @@ find_package(sigio REQUIRED)
 find_package(sfcio REQUIRED)
 find_package(nemsio REQUIRED)
 find_package(ncio REQUIRED)
-find_package(sp REQUIRED)
 find_package(ip REQUIRED)
 find_package(w3emc REQUIRED)
 find_package(bufr REQUIRED)

ci/spack_gcc.yaml

@@ -11,13 +11,12 @@ spack:
   specs:
   - netcdf-c@4.9.2
   - netcdf-fortran@4.6.1
-  - bufr@11.7.0
+  - bufr@12.1.0
   - bacio@2.4.1
   - w3emc@2.10.0
-  - sp@2.5.0
-  - ip@4.3.0
-  - sigio@2.3.2
-  - sfcio@1.4.1
+  - ip@5.1.0 precision=4,d,8
+  - sigio@2.3.3
+  - sfcio@1.4.2
   - nemsio@2.5.4
   - wrf-io@1.2.0
   - ncio@1.1.2

ci/spack_intel.yaml

@@ -12,13 +12,12 @@ spack:
   specs:
   - netcdf-c@4.9.2 ~blosc build_system=cmake
   - netcdf-fortran@4.6.1
-  - bufr@11.7.0
+  - bufr@12.1.0
   - bacio@2.4.1
   - w3emc@2.10.0
-  - sp@2.5.0
-  - ip@4.3.0
-  - sigio@2.3.2
-  - sfcio@1.4.1
+  - ip@5.1.0 precision=4,d
+  - sigio@2.3.3
+  - sfcio@1.4.2
   - nemsio@2.5.4
   - wrf-io@1.2.0
   - crtm@2.4.0.1

modulefiles/gsiutils_common.lua

@@ -5,13 +5,13 @@ Load common modules to build GSI utilities on all machines
 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.1"
 
-local bufr_ver=os.getenv("bufr_ver") or "11.7.0"
+local cmake_ver=os.getenv("cmake_ver") or "3.27.9"
+local bufr_ver=os.getenv("bufr_ver") or "12.1.0"
 local bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 local w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
-local sp_ver=os.getenv("sp_ver") or "2.5.0"
-local ip_ver=os.getenv("ip_ver") or "4.3.0"
-local sigio_ver=os.getenv("sigio_ver") or "2.3.2"
-local sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+local ip_ver=os.getenv("ip_ver") or "5.1.0"
+local sigio_ver=os.getenv("sigio_ver") or "2.3.3"
+local sfcio_ver=os.getenv("sfcio_ver") or "1.4.2"
 local nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
 local wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
 local ncio_ver=os.getenv("ncio_ver") or "1.1.2"
@@ -21,10 +21,10 @@ local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2"
 load(pathJoin("netcdf-c", netcdf_c_ver))
 load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 
+load(pathJoin("cmake", cmake_ver))
 load(pathJoin("bufr", bufr_ver))
 load(pathJoin("bacio", bacio_ver))
 load(pathJoin("w3emc", w3emc_ver))
-load(pathJoin("sp", sp_ver))
 load(pathJoin("ip", ip_ver))
 load(pathJoin("sigio", sigio_ver))
 load(pathJoin("sfcio", sfcio_ver))

modulefiles/gsiutils_gaeac6.intel.lua

@@ -1,18 +1,16 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/gsi-addon/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-intel-2023.2.0/install/modulefiles/Core")
 
-local python_ver=os.getenv("python_ver") or "3.11.6"
+local python_ver=os.getenv("python_ver") or "3.11.7"
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
-local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
-local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.30"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 load(pathJoin("python", python_ver))
-load(pathJoin("cmake", cmake_ver))
 
 load("gsiutils_common")
 

modulefiles/gsiutils_hera.intel.lua

@@ -1,16 +1,16 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
 
-local python_ver=os.getenv("python_ver") or "3.11.6"
-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 python_ver=os.getenv("python_ver") or "3.11.7"
+local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"
+local cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
-load(pathJoin("stack-intel", stack_intel_ver))
-load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
 load(pathJoin("python", python_ver))
 load(pathJoin("cmake", cmake_ver))
 
@@ -21,4 +21,8 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
+setenv("CC","mpiicc")
+setenv("CXX","mpiicpc")
+setenv("FC","mpiifort")
+
 whatis("Description: GSI utilities environment on Hera with Intel Compilers")

modulefiles/gsiutils_hercules.intel.lua

@@ -1,17 +1,17 @@
 help([[
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")
 
-local stack_python_ver=os.getenv("python_ver") or "3.11.6"
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
-local mkl_ver=os.getenv("mkl_ver") or "2022.2.1"
-local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local stack_python_ver=os.getenv("python_ver") or "3.11.7"
+local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"
+local mkl_ver=os.getenv("mkl_ver") or "2024.2.1"
+local cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
-load(pathJoin("stack-intel", stack_intel_ver))
-load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
 load(pathJoin("intel-oneapi-mkl", mkl_ver))
 load(pathJoin("python", stack_python_ver))
 load(pathJoin("cmake", cmake_ver))
@@ -23,4 +23,8 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
+setenv("CC","mpiicc")
+setenv("CXX","mpiicpc")
+setenv("FC","mpiifort")
+
 whatis("Description: GSI utilities environment on Orion with Intel Compilers")

modulefiles/gsiutils_orion.intel.lua

@@ -1,21 +1,18 @@
 help([[
 ]])
 
--- Spack Stack installation specs
-local ss_dir="/work/noaa/epic/role-epic/spack-stack/orion"
-local ss_ver=os.getenv("stack_ver") or "1.6.0"
-local ss_env=os.getenv("stack_env") or "gsi-addon-env-rocky9"
+prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core")
 
-prepend_path("MODULEPATH", pathJoin(ss_dir, "spack-stack-" .. ss_ver, "envs", ss_env, "install/modulefiles/Core"))
-
-local stack_python_ver=os.getenv("python_ver") or "3.11.6"
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
-local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+local stack_python_ver=os.getenv("python_ver") or "3.11.7"
+local stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+local stack_intel_oneapi_mpi_ver=os.getenv("stack_intel_oneapi_mpi_ver") or "2021.13"
+local mkl_ver=os.getenv("mkl_ver") or "2024.2.1"
+local cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.1.1"
 
-load(pathJoin("stack-intel", stack_intel_ver))
-load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
+load(pathJoin("intel-oneapi-mkl", mkl_ver))
 load(pathJoin("python", stack_python_ver))
 load(pathJoin("cmake", cmake_ver))
 
@@ -26,4 +23,8 @@ load(pathJoin("prod_util", prod_util_ver))
 pushenv("CFLAGS", "-xHOST")
 pushenv("FFLAGS", "-xHOST")
 
+setenv("CC","mpiicc")
+setenv("CXX","mpiicpc")
+setenv("FC","mpiifort")
+
 whatis("Description: GSI utilities environment on Orion with Intel Compilers")

modulefiles/gsiutils_wcoss2.intel.lua

@@ -9,19 +9,20 @@ local cmake_ver= os.getenv("cmake_ver") or "3.20.2"
 local python_ver=os.getenv("python_ver") or "3.8.6"
 local prod_util_ver=os.getenv("prod_util_ver") or "2.0.10"
 
-local netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
-local bufr_ver=os.getenv("bufr_ver") or "11.7.0"
+local hdf5_ver=os.getenv("hdf5_ver") or "1.14.0"
+local pnetcdf_ver=os.getenv("pnetcdf_ver") or "1.12.2"
+local netcdf_ver=os.getenv("netcdf_ver") or "4.9.2"
+local bufr_ver=os.getenv("bufr_ver") or "12.1.0"
 local bacio_ver=os.getenv("bacio_ver") or "2.4.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 w3emc_ver=os.getenv("w3emc_ver") or "2.12.0"
+local ip_ver=os.getenv("ip_ver") or "5.2.0"
 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.4"
 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.4.0.1"
-local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.1"
+local ncdiag_ver=os.getenv("ncdiag_ver") or "1.1.2"
 
 load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
 load(pathJoin("intel", intel_ver))
@@ -32,18 +33,19 @@ load(pathJoin("python", python_ver))
 
 load(pathJoin("prod_util", prod_util_ver))
 
-load(pathJoin("netcdf", netcdf_ver))
+load(pathJoin("hdf5-D", hdf5_ver))
+load(pathJoin("pnetcdf-D", pnetcdf_ver))
+load(pathJoin("netcdf-D", netcdf_ver))
 load(pathJoin("bufr", bufr_ver))
 load(pathJoin("bacio", bacio_ver))
 load(pathJoin("w3emc", w3emc_ver))
-load(pathJoin("sp", sp_ver))
 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("ncio", ncio_ver))
+load(pathJoin("ncio-A", ncio_ver))
 load(pathJoin("crtm", crtm_ver))
-load(pathJoin("ncdiag",ncdiag_ver))
+load(pathJoin("ncdiag-A",ncdiag_ver))
 
 whatis("Description: GSI utilities environment on WCOSS2")

src/EFSOI_Utilities/src/CMakeLists.txt

@@ -25,7 +25,7 @@ target_link_libraries(efsoi.x PRIVATE sfcio::sfcio)
 target_link_libraries(efsoi.x PRIVATE nemsio::nemsio)
 target_link_libraries(efsoi.x PRIVATE ncio::ncio)
 target_link_libraries(efsoi.x PRIVATE w3emc::w3emc_d)
-target_link_libraries(efsoi.x PRIVATE sp::sp_d)
+target_link_libraries(efsoi.x PRIVATE ip::ip_d)
 if(OpenMP_Fortran_FOUND)
   target_link_libraries(efsoi.x PRIVATE OpenMP::OpenMP_Fortran)
 endif()

src/EnKF/gfs/src/adderrspec.fd/CMakeLists.txt

@@ -11,7 +11,7 @@ target_link_libraries(adderrspec.x PRIVATE bacio::bacio_4)
 target_link_libraries(adderrspec.x PRIVATE sigio::sigio)
 target_link_libraries(adderrspec.x PRIVATE nemsio::nemsio)
 target_link_libraries(adderrspec.x PRIVATE w3emc::w3emc_d)
-target_link_libraries(adderrspec.x PRIVATE sp::sp_d)
+target_link_libraries(adderrspec.x PRIVATE ip::ip_4)
 if(OpenMP_Fortran_FOUND)
   target_link_libraries(adderrspec.x PRIVATE OpenMP::OpenMP_Fortran)
 endif()