From 9a92e9258382c2ad40b0af4d708ffb4e54fbfdb1 Mon Sep 17 00:00:00 2001
From: DavidHuber <david.huber@noaa.gov>
Date: Mon, 9 Sep 2024 14:12:54 +0000
Subject: [PATCH] Upgrade to spack-stack 1.8.0

---
 CMakeLists.txt                   |  2 +-
 modulefiles/hera.lua             |  4 ++--
 modulefiles/upp_common.lua       | 13 ++++++-------
 sorc/ncep_post.fd/CMakeLists.txt |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 480dd40c9..c078bb327 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,7 @@ if(BUILD_POSTEXEC)
     find_package(nemsio REQUIRED)
     find_package(sigio REQUIRED)
   endif()
-  find_package(sp REQUIRED)
+  find_package(ip REQUIRED)
   find_package(w3emc REQUIRED)
   if(BUILD_WITH_WRFIO)
     find_package(wrf_io REQUIRED)
diff --git a/modulefiles/hera.lua b/modulefiles/hera.lua
index 2231ad1c1..f74c1441a 100644
--- a/modulefiles/hera.lua
+++ b/modulefiles/hera.lua
@@ -3,7 +3,7 @@ Load environment to build UPP on hera
 ]])
 
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/global/David.Huber/SPACK/ss_1.8.0/envs/gsi-addon/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))
@@ -11,7 +11,7 @@ load(pathJoin("stack-intel", stack_intel_ver))
 stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
 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("upp_common")
diff --git a/modulefiles/upp_common.lua b/modulefiles/upp_common.lua
index c8e529e2f..846b2d17a 100644
--- a/modulefiles/upp_common.lua
+++ b/modulefiles/upp_common.lua
@@ -4,18 +4,17 @@ 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"},
+  {["parallelio"]      = "2.6.2"},
   {["bacio"]           = "2.4.1"},
   {["crtm"]            = "2.4.0.1"},
-  {["g2"]              = "3.4.5"},
-  {["g2tmpl"]          = "1.10.2"},
-  {["ip"]              = "4.3.0"},
-  {["sp"]              = "2.5.0"},
+  {["g2"]              = "3.5.1"},
+  {["g2tmpl"]          = "1.13.0"},
+  {["ip"]              = "5.0.0"},
   {["w3emc"]           = "2.10.0"},
   {["nemsio"]          = "2.5.4"},
   {["sigio"]           = "2.3.2"},
diff --git a/sorc/ncep_post.fd/CMakeLists.txt b/sorc/ncep_post.fd/CMakeLists.txt
index a0ff8bad2..934dc9fbb 100644
--- a/sorc/ncep_post.fd/CMakeLists.txt
+++ b/sorc/ncep_post.fd/CMakeLists.txt
@@ -239,7 +239,7 @@ if(BUILD_POSTEXEC)
   target_link_libraries(${EXENAME} PRIVATE
     ${LIBNAME}
     w3emc::w3emc_4
-    sp::sp_4)
+    ip::ip_4)
   set_target_properties(${EXENAME} PROPERTIES LINKER_LANGUAGE Fortran)
   if(IFI_FOUND)
     target_link_libraries(${EXENAME} PRIVATE IFI)