From 505a473c9adecf181e8a00c25903be4bfd94e931 Mon Sep 17 00:00:00 2001
From: Grant Firl <grant.firl@noaa.gov>
Date: Tue, 11 Jun 2024 16:14:12 +0000
Subject: [PATCH] update Hera modulefiles to match the latest UFS

---
 scm/etc/modules/hera_gnu.lua   | 19 +++++++++----------
 scm/etc/modules/hera_intel.lua | 15 ++++++---------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/scm/etc/modules/hera_gnu.lua b/scm/etc/modules/hera_gnu.lua
index 0e28df2d0..48188e850 100644
--- a/scm/etc/modules/hera_gnu.lua
+++ b/scm/etc/modules/hera_gnu.lua
@@ -5,23 +5,22 @@ the NOAA RDHPC machine Hera using GNU 9.2.0
 
 whatis([===[Loads libraries needed for building the CCPP SCM on Hera with GNU compilers ]===])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
 
-load("cmake/3.28.1")
-load("miniconda/3.9.12")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/gnu/modulefiles")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/openmpi/modulefiles")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/spack-stack/spack-stack-1.6.0_gnu13/envs/ufs-wm-srw-rocky8/install/modulefiles/Core")
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
-
-load("stack-gcc/9.2.0")
-load("stack-openmpi/4.1.5")
-load("stack-python/3.10.8")
+load("stack-gcc/13.3.0")
+load("stack-openmpi/4.1.6")
+load("cmake/3.23.1")
+load("stack-python/3.10.13")
 load("py-f90nml")
 load("py-netcdf4/1.5.8")
 
 load("netcdf-c/4.9.2")
-load("netcdf-fortran/4.6.0")
+load("netcdf-fortran/4.6.1")
 load("bacio/2.4.1")
-load("sp/2.3.3")
+load("sp/2.5.0")
 load("w3emc")
 
 setenv("CMAKE_C_COMPILER","mpicc")
diff --git a/scm/etc/modules/hera_intel.lua b/scm/etc/modules/hera_intel.lua
index 6cdbf7d4c..e682bef4e 100644
--- a/scm/etc/modules/hera_intel.lua
+++ b/scm/etc/modules/hera_intel.lua
@@ -5,23 +5,20 @@ the NOAA RDHPC machine Hera using Intel-2021.5.0
 
 whatis([===[Loads libraries needed for building the CCPP SCM on Hera with Intel compilers ]===])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
-load("cmake/3.28.1")
-load("miniconda/3.9.12")
-
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
 
 load("stack-intel/2021.5.0")
 load("stack-intel-oneapi-mpi/2021.5.1")
-load("stack-python/3.10.8")
+load("cmake/3.23.1")
+load("stack-python/3.10.13")
 load("py-f90nml")
 load("py-netcdf4/1.5.8")
 
 load("netcdf-c/4.9.2")
-load("netcdf-fortran/4.6.0")
+load("netcdf-fortran/4.6.1")
 load("bacio/2.4.1")
-load("sp/2.3.3")
-load("w3emc")
+load("sp/2.5.0")
+load("w3emc/2.10.0")
 
 setenv("CMAKE_C_COMPILER","mpiicc")
 setenv("CMAKE_CXX_COMPILER","mpiicpc")