From 78c44b56550b791035f69a41a1e0b78275ca256d Mon Sep 17 00:00:00 2001
From: ulmononian <cameron.book@noaa.gov>
Date: Thu, 16 Jan 2025 20:28:00 +0000
Subject: [PATCH] Update DISKNM; add preliminary ursa modulefile.

---
 modulefiles/ufs_common.lua     | 18 +++++++++---------
 modulefiles/ufs_ursa.intel.lua | 31 +++++++++++++++++++++++++++++++
 tests/rt.sh                    |  2 +-
 3 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 modulefiles/ufs_ursa.intel.lua

diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
index 062fa38449..38eea18a93 100644
--- a/modulefiles/ufs_common.lua
+++ b/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.1.6"},
   {["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"},
+  {["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"},
 }
 
diff --git a/modulefiles/ufs_ursa.intel.lua b/modulefiles/ufs_ursa.intel.lua
new file mode 100644
index 0000000000..5d8cd7a076
--- /dev/null
+++ b/modulefiles/ufs_ursa.intel.lua
@@ -0,0 +1,31 @@
+help([[
+loads UFS Model prerequisites for Ursa/Intel
+]])
+
+prepend_path("MODULEPATH", "/contrib/spack-stack/envs/1.8.0/ue-oneapi-ifort-2024.2.1/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/envs/1.8.0/ue-oneapi-ifort-2024.2.1/install/modulefiles/intel-oneapi-mpi/2021.13-eaajhcw/oneapi/2024.2.1")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2024.2.1"
+load(pathJoin("stack-oneapi", stack_intel_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+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.1.0"
+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", "ifort")
+
+setenv("CMAKE_Platform", "ursa.intel")
+
+whatis("Description: UFS build environment")
diff --git a/tests/rt.sh b/tests/rt.sh
index b0dda9ad2a..d5b9880eac 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -810,7 +810,7 @@ case ${MACHINE_ID} in
 
     PARTITION=
     dprefix="/collab1/data/${USER}"
-    DISKNM="/collab1/data/Cameron.Book/UFS-WM_RT"
+    DISKNM="/collab1/data/Ratko.Vasic/UFS-WM_RT"
     STMP="${STMP:-${dprefix}/RT_BASELINE}"
     PTMP="${PTMP:-${dprefix}/RT_RUNDIRS}"