Test Dom's oneapi-2025.0.0 spack-stack environment

CMakeLists.txt

@@ -173,7 +173,7 @@ if(CMEPS)
 endif()
 
 find_package(bacio 2.4.0 REQUIRED)
-find_package(sp 2.3.3 REQUIRED)
+find_package(ip 5.0.0 REQUIRED)
 find_package(w3emc 2.9.2 REQUIRED)
 
 # Configure Python

modulefiles/ufs_common.lua

@@ -4,23 +4,23 @@ help([[Load UFS Model common libraries]])
 
 local ufs_modules = {
   {["jasper"]          = "2.0.32"},
-  {["zlib"]            = "1.2.13"},
+  {["zlib-ng"]         = "2.2.1"},
   {["libpng"]          = "1.6.37"},
-  {["hdf5"]            = "1.14.0"},
+  {["hdf5"]            = "1.14.3"},
   {["netcdf-c"]        = "4.9.2"},
   {["netcdf-fortran"]  = "4.6.1"},
-  {["parallelio"]      = "2.5.10"},
-  {["esmf"]            = "8.6.0"},
-  {["fms"]             = "2024.01"},
+  {["parallelio"]      = "2.6.2"},
+  {["esmf"]            = "8.6.1"},
+  {["fms"]             = "2024.02"},
   {["bacio"]           = "2.4.1"},
-  {["crtm"]            = "2.4.0"},
+  {["crtm"]            = "2.4.0.1"},
   {["g2"]              = "3.5.1"},
   {["g2tmpl"]          = "1.13.0"},
-  {["ip"]              = "4.3.0"},
-  {["sp"]              = "2.5.0"},
+  {["ip"]              = "5.0.0"},
+  -- {["sp"]              = "2.5.0"},
   {["w3emc"]           = "2.10.0"},
-  {["gftl-shared"]     = "1.6.1"},
-  {["mapl"]            = "2.40.3-esmf-8.6.0"},
+  {["gftl-shared"]     = "1.9.0"},
+  {["mapl"]            = "2.46.3-esmf-8.6.1"},
   {["scotch"]          = "7.0.4"},
 }
 

modulefiles/ufs_hercules.intel.lua

@@ -2,25 +2,30 @@ help([[
 loads UFS Model prerequisites for Hercules/Intel
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work2/noaa/jcsda/dheinzel/oneapi-2025.0.0-testing/oneapi-2025.0.0/modulefiles")
+prepend_path("MODULEPATH", "/work2/noaa/jcsda/dheinzel/oneapi-2025.0.0-testing/spack-stack-dev-20241202/envs/wm-oneapi-2025.0.0/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-load(pathJoin("stack-intel", stack_intel_ver))
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2025.0.0"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.14"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 load("ufs_common")
 
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
-setenv("CC", "mpiicc")
-setenv("CXX", "mpiicpc")
-setenv("FC", "mpiifort")
+setenv("I_MPI_CC", "icx")
+setenv("I_MPI_CXX", "icpx")
+setenv("I_MPI_F90", "ifx")
+
+setenv("CC", "mpiicx")
+setenv("CXX", "mpiicpx")
+setenv("FC", "mpiifx")
 setenv("CMAKE_Platform", "hercules.intel")
 
 whatis("Description: UFS build environment")

modulefiles/ufs_hercules.intelllvm.lua

@@ -2,15 +2,16 @@ help([[
 loads UFS Model prerequisites for Hercules/IntelLLVM
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work2/noaa/jcsda/dheinzel/oneapi-2025.0.0-testing/oneapi-2025.0.0/modulefiles")
+prepend_path("MODULEPATH", "/work2/noaa/jcsda/dheinzel/oneapi-2025.0.0-testing/spack-stack-dev-20241202/envs/wm-oneapi-2025.0.0/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
-load(pathJoin("stack-intel", stack_intel_ver))
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2025.0.0"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.14"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 load("ufs_common")
@@ -22,9 +23,9 @@ setenv("I_MPI_CC", "icx")
 setenv("I_MPI_CXX", "icpx")
 setenv("I_MPI_F90", "ifx")
 
-setenv("CC", "mpiicc")
-setenv("CXX", "mpiicpc")
-setenv("FC", "mpiifort")
+setenv("CC", "mpiicx")
+setenv("CXX", "mpiicpx")
+setenv("FC", "mpiifx")
 setenv("CMAKE_Platform", "hercules.intel")
 
 whatis("Description: UFS build environment")