From 07ccd90d3226ae77d72a992791c9f0d5334fc726 Mon Sep 17 00:00:00 2001
From: David Burrows <David.Burrows@noaa.gov>
Date: Fri, 18 Oct 2024 08:06:33 -0400
Subject: [PATCH 1/8] update module versions for Gaea-C5 OS updgrade and
 spack-stack installation

---
 modulefiles/build.gaea.intel.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modulefiles/build.gaea.intel.lua b/modulefiles/build.gaea.intel.lua
index 2898c3a29..e9dd614b3 100644
--- a/modulefiles/build.gaea.intel.lua
+++ b/modulefiles/build.gaea.intel.lua
@@ -7,10 +7,10 @@ load("hsi")
 
 prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
+stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25"
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"

From 330b9b920d8b227bbe404a9d541dc9d1568bc659 Mon Sep 17 00:00:00 2001
From: DavidBurrows-NCO <David.Burrows@noaa.gov>
Date: Mon, 21 Oct 2024 09:42:37 -0400
Subject: [PATCH 2/8] Updates to build ufs-utils on Gaea C5 and C6

---
 fix/link_fixdirs.sh                           | 12 ++--
 ....gaea.intel.lua => build.gaeac5.intel.lua} |  0
 modulefiles/build.gaeac6.intel.lua            | 66 +++++++++++++++++++
 sorc/machine-setup.sh                         |  6 +-
 4 files changed, 76 insertions(+), 8 deletions(-)
 rename modulefiles/{build.gaea.intel.lua => build.gaeac5.intel.lua} (100%)
 create mode 100644 modulefiles/build.gaeac6.intel.lua

diff --git a/fix/link_fixdirs.sh b/fix/link_fixdirs.sh
index 97136e4db..d3c539fc4 100755
--- a/fix/link_fixdirs.sh
+++ b/fix/link_fixdirs.sh
@@ -9,7 +9,7 @@ set -ex
 #               'nco' (copies data).
 #
 #  $machine - is the machine. Choices are:
-#             'wcoss2', 'hera', 'jet', 'orion', 'hercules', 's4', 'gaea'
+#             'wcoss2', 'hera', 'jet', 'orion', 'hercules', 's4', 'gaeac5', 'gaeac6'
 
 RUN_ENVIR=${1}
 machine=${2}
@@ -17,7 +17,7 @@ machine=${2}
 if [ $# -lt 2 ]; then
     set +x
     echo '***ERROR*** must specify two arguements: (1) RUN_ENVIR, (2) machine'
-    echo ' Syntax: link_fv3gfs.sh ( nco | emc ) ( wcoss2 |  hera  | jet | orion | hercules | s4 | gaea )'
+    echo ' Syntax: link_fv3gfs.sh ( nco | emc ) ( wcoss2 |  hera  | jet | orion | hercules | s4 | gaeac5 | gaeac6 )'
     exit 1
 fi
 
@@ -28,10 +28,10 @@ if [ $RUN_ENVIR != emc -a $RUN_ENVIR != nco ]; then
     exit 1
 fi
 
-if [ $machine != wcoss2 -a $machine != hera -a $machine != jet -a $machine != orion -a $machine != s4 -a $machine != hercules -a $machine != gaea ]; then
+if [ $machine != wcoss2 -a $machine != hera -a $machine != jet -a $machine != orion -a $machine != s4 -a $machine != hercules -a $machine != gaeac5 -a $machine != gaeac6 ]; then
     set +x
     echo '***ERROR*** unsupported machine'
-    echo 'Syntax: link_fv3gfs.sh ( nco | emc ) ( wcoss2 | hera | jet | orion | hercules | s4 | gaea )'
+    echo 'Syntax: link_fv3gfs.sh ( nco | emc ) ( wcoss2 | hera | jet | orion | hercules | s4 | gaeac5 | gaeac6 )'
     exit 1
 fi
 
@@ -54,8 +54,10 @@ elif [ $machine = "wcoss2" ]; then
     FIX_DIR="/lfs/h2/emc/global/noscrub/emc.global/FIX/fix"
 elif [ $machine = "s4" ]; then
     FIX_DIR="/data/prod/glopara/fix"
-elif [ $machine = "gaea" ]; then
+elif [ $machine = "gaeac5" ]; then
     FIX_DIR="/gpfs/f5/ufs-ard/world-shared/global/glopara/data/fix"
+elif [ $machine = "gaeac6" ]; then
+    FIX_DIR="/gpfs/f6/bil-fire8/world-shared/global/glopara/data/fix"
 fi
 
 am_ver=${am_ver:-20220805}
diff --git a/modulefiles/build.gaea.intel.lua b/modulefiles/build.gaeac5.intel.lua
similarity index 100%
rename from modulefiles/build.gaea.intel.lua
rename to modulefiles/build.gaeac5.intel.lua
diff --git a/modulefiles/build.gaeac6.intel.lua b/modulefiles/build.gaeac6.intel.lua
new file mode 100644
index 000000000..e9dd614b3
--- /dev/null
+++ b/modulefiles/build.gaeac6.intel.lua
@@ -0,0 +1,66 @@
+help([[
+Load environment to compile UFS_UTILS on Gaea using Intel
+]])
+
+prepend_path("MODULEPATH", "/sw/rdtn/modulefiles")
+load("hsi")
+
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
+load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
+bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+load(pathJoin("bacio", bacio_ver))
+
+g2_ver=os.getenv("g2_ver") or "3.4.5"
+load(pathJoin("g2", g2_ver))
+
+ip_ver=os.getenv("ip_ver") or "4.3.0"
+load(pathJoin("ip", ip_ver))
+
+nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
+load(pathJoin("nemsio", nemsio_ver))
+
+sp_ver=os.getenv("sp_ver") or "2.5.0"
+load(pathJoin("sp", sp_ver))
+
+w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
+load(pathJoin("w3emc", w3emc_ver))
+
+-- Uncomment when CHGRES_ALL is ON
+--sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+--load(pathJoin("sfcio", sfcio_ver))
+
+sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+load(pathJoin("sigio", sigio_ver))
+
+zlib_ver=os.getenv("zlib_ver") or "1.2.13"
+load(pathJoin("zlib", zlib_ver))
+
+png_ver=os.getenv("png_ver") or "1.6.37"
+load(pathJoin("libpng", png_ver))
+
+netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
+load(pathJoin("netcdf-c", netcdf_c_ver))
+
+netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
+load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
+
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
+
+esmf_ver=os.getenv("esmf_ver") or "8.6.0"
+load(pathJoin("esmf", esmf_ver))
+
+nco_ver=os.getenv("nco_ver") or "5.0.6"
+load(pathJoin("nco", nco_ver))
+
+whatis("Description: UFS_UTILS build environment")
+
diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
index 944c5e48c..bd398a0df 100644
--- a/sorc/machine-setup.sh
+++ b/sorc/machine-setup.sh
@@ -39,7 +39,7 @@ elif [[ -d /scratch1 ]] ; then
     target=hera
     module purge
 elif [[ "$(hostname)" == "gaea5"* && -d /gpfs/f5 ]] ; then
-    # We are on GAEA.
+    # We are on GAEAC5.
     if ( ! eval module help > /dev/null 2>&1 ) ; then
       # We cannot simply load the module command.  The GAEA
       # /etc/profile modifies a number of module-related variables
@@ -49,9 +49,9 @@ elif [[ "$(hostname)" == "gaea5"* && -d /gpfs/f5 ]] ; then
       source /etc/profile
     fi
     module reset
-    target=gaea
+    target=gaeac5
 elif [[ "$(hostname)" == "gaea6"* && -d /gpfs/f6 ]] ; then
-    target=gaeaC6
+    target=gaeac6
     source /opt/cray/pe/lmod/8.7.31/init/$__ms_shell
 elif [[ "$(hostname)" =~ "Orion" || "$(hostname)" =~ "orion" ]]; then
     target="orion"

From 5c8ab043ab88b289721d8a0d6a9e0cbd4977ca02 Mon Sep 17 00:00:00 2001
From: Mark A Potts <mark.potts@noaa.gov>
Date: Tue, 22 Oct 2024 13:08:54 +0000
Subject: [PATCH 3/8] Updates for building with containers

---
 modulefiles/build.container.intel.lua | 64 +++++++++++++++++++++++++++
 sorc/machine-setup.sh                 |  8 ++++
 2 files changed, 72 insertions(+)
 create mode 100644 modulefiles/build.container.intel.lua

diff --git a/modulefiles/build.container.intel.lua b/modulefiles/build.container.intel.lua
new file mode 100644
index 000000000..4baf273fb
--- /dev/null
+++ b/modulefiles/build.container.intel.lua
@@ -0,0 +1,64 @@
+help([[
+Load environment to compile UFS_UTILS on Hera using Intel
+]])
+
+hpss_ver=os.getenv("hpss_ver") or ""
+--load(pathJoin("hpss", hpss_ver))
+
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.8.0/envs/unified-env-rocky8/install/modulefiles/Core")
+
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+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"
+load(pathJoin("cmake", cmake_ver))
+
+bacio_ver=os.getenv("bacio_ver") or "2.4.1"
+load(pathJoin("bacio", bacio_ver))
+
+g2_ver=os.getenv("g2_ver") or "3.4.5"
+load(pathJoin("g2", g2_ver))
+
+ip_ver=os.getenv("ip_ver") or "4.3.0"
+load(pathJoin("ip", ip_ver))
+
+nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
+load(pathJoin("nemsio", nemsio_ver))
+
+sp_ver=os.getenv("sp_ver") or "2.5.0"
+load(pathJoin("sp", sp_ver))
+
+w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
+load(pathJoin("w3emc", w3emc_ver))
+
+sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
+load(pathJoin("sfcio", sfcio_ver))
+
+sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+load(pathJoin("sigio", sigio_ver))
+
+zlib_ver=os.getenv("zlib_ver") or "1.2.13"
+--load(pathJoin("zlib", zlib_ver))
+
+png_ver=os.getenv("png_ver") or "1.6.37"
+load(pathJoin("libpng", png_ver))
+
+netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
+load(pathJoin("netcdf-c", netcdf_c_ver))
+
+netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
+load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
+
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
+
+esmf_ver=os.getenv("esmf_ver") or "8.6.0"
+load(pathJoin("esmf", esmf_ver))
+
+nco_ver=os.getenv("nco_ver") or "5.0.6"
+load(pathJoin("nco", nco_ver))
+
+whatis("Description: UFS_UTILS build environment")
diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
index d14b4c05b..133df9277 100644
--- a/sorc/machine-setup.sh
+++ b/sorc/machine-setup.sh
@@ -30,6 +30,14 @@ if [[ -d /lfs5 ]] ; then
 elif [[ -d /lfs/h1 ]] ; then
     target=wcoss2
     module reset
+elif [[ -d /opt/spack-stack ]] ; then
+    # We are using a container 
+    if ( ! eval module help > /dev/null 2>&1 ) ; then
+        echo load the module command 1>&2
+        source /apps/lmod/lmod/init/$__ms_shell
+    fi
+    target=container
+    module purge
 elif [[ -d /scratch1 ]] ; then
     # We are on NOAA Hera
     if ( ! eval module help > /dev/null 2>&1 ) ; then

From a39f25556c7e9640283c118a4b39312281d92dbc Mon Sep 17 00:00:00 2001
From: Mark A Potts <mark.potts@noaa.gov>
Date: Tue, 22 Oct 2024 13:32:37 +0000
Subject: [PATCH 4/8] Updated version numbers for containers.

---
 modulefiles/build.container.intel.lua | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/modulefiles/build.container.intel.lua b/modulefiles/build.container.intel.lua
index 4baf273fb..ca4e09bfe 100644
--- a/modulefiles/build.container.intel.lua
+++ b/modulefiles/build.container.intel.lua
@@ -1,28 +1,28 @@
 help([[
-Load environment to compile UFS_UTILS on Hera using Intel
+Load environment to compile UFS_UTILS in a container using Intel
 ]])
 
 hpss_ver=os.getenv("hpss_ver") or ""
 --load(pathJoin("hpss", hpss_ver))
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.8.0/envs/unified-env-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/opt/spack-stack/spack-stack-1.8.0/envs/unified-env/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.12.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))
 
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.5"
+g2_ver=os.getenv("g2_ver") or "3.5.1"
 load(pathJoin("g2", g2_ver))
 
-ip_ver=os.getenv("ip_ver") or "4.3.0"
+ip_ver=os.getenv("ip_ver") or "5.0.0"
 load(pathJoin("ip", ip_ver))
 
 nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
@@ -40,9 +40,6 @@ load(pathJoin("sfcio", sfcio_ver))
 sigio_ver=os.getenv("sigio_ver") or "2.3.2"
 load(pathJoin("sigio", sigio_ver))
 
-zlib_ver=os.getenv("zlib_ver") or "1.2.13"
---load(pathJoin("zlib", zlib_ver))
-
 png_ver=os.getenv("png_ver") or "1.6.37"
 load(pathJoin("libpng", png_ver))
 
@@ -55,10 +52,10 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
-esmf_ver=os.getenv("esmf_ver") or "8.6.0"
+esmf_ver=os.getenv("esmf_ver") or "8.6.1"
 load(pathJoin("esmf", esmf_ver))
 
-nco_ver=os.getenv("nco_ver") or "5.0.6"
+nco_ver=os.getenv("nco_ver") or "5.1.6"
 load(pathJoin("nco", nco_ver))
 
 whatis("Description: UFS_UTILS build environment")

From 7c96a8f638d77828a38a27adff6c3671bba49c9c Mon Sep 17 00:00:00 2001
From: DavidBurrows-NCO <David.Burrows@noaa.gov>
Date: Mon, 4 Nov 2024 17:24:58 -0500
Subject: [PATCH 5/8] update to C6 module file install

---
 modulefiles/build.gaeaC6.intel.lua | 64 ------------------------------
 modulefiles/build.gaeac6.intel.lua |  4 +-
 2 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 modulefiles/build.gaeaC6.intel.lua

diff --git a/modulefiles/build.gaeaC6.intel.lua b/modulefiles/build.gaeaC6.intel.lua
deleted file mode 100644
index de35f3959..000000000
--- a/modulefiles/build.gaeaC6.intel.lua
+++ /dev/null
@@ -1,64 +0,0 @@
-help([[
-Load environment to compile UFS_UTILS on GAEA C6 using Intel
-]])
-
-prepend_path("MODULEPATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env-c6/install/modulefiles/Core")
-
-stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
-load(pathJoin("stack-intel", stack_intel_ver))
-
-stack_mpich_ver=os.getenv("stack_mpich_ver") or "8.1.29"
-load(pathJoin("stack-cray-mpich", stack_mpich_ver))
-
-craype_ver=os.getenv("craype_ver") or "2.7.30"
-load(pathJoin("craype", craype_ver))
-
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
-load(pathJoin("cmake", cmake_ver))
-
-bacio_ver=os.getenv("bacio_ver") or "2.4.1"
-load(pathJoin("bacio", bacio_ver))
-
-g2_ver=os.getenv("g2_ver") or "3.4.5"
-load(pathJoin("g2", g2_ver))
-
-ip_ver=os.getenv("ip_ver") or "4.3.0"
-load(pathJoin("ip", ip_ver))
-
-nemsio_ver=os.getenv("nemsio_ver") or "2.5.4"
-load(pathJoin("nemsio", nemsio_ver))
-
-sp_ver=os.getenv("sp_ver") or "2.5.0"
-load(pathJoin("sp", sp_ver))
-
-w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
-load(pathJoin("w3emc", w3emc_ver))
-
-sigio_ver=os.getenv("sigio_ver") or "2.3.2"
-load(pathJoin("sigio", sigio_ver))
-
-sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
-load(pathJoin("sfcio", sfcio_ver))
-
-zlib_ver=os.getenv("zlib_ver") or "1.2.13"
-load(pathJoin("zlib", zlib_ver))
-
-libpng_ver=os.getenv("libpng_ver") or "1.6.37"
-load(pathJoin("libpng", libpng_ver))
-
-netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
-load(pathJoin("netcdf-c", netcdf_c_ver))
-
-netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
-load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
-
-nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
-load(pathJoin("nccmp", nccmp_ver))
-
-esmf_ver=os.getenv("esmf_ver") or "8.5.0"
-load(pathJoin("esmf", esmf_ver))
-
-nco_ver=os.getenv("nco_ver") or "5.0.6"
-load(pathJoin("nco", nco_ver))
-
-whatis("Description: UFS_UTILS build environment")
diff --git a/modulefiles/build.gaeac6.intel.lua b/modulefiles/build.gaeac6.intel.lua
index e9dd614b3..5445c8aed 100644
--- a/modulefiles/build.gaeac6.intel.lua
+++ b/modulefiles/build.gaeac6.intel.lua
@@ -5,12 +5,12 @@ Load environment to compile UFS_UTILS on Gaea using Intel
 prepend_path("MODULEPATH", "/sw/rdtn/modulefiles")
 load("hsi")
 
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"

From bbde283f9f3fe7d0aabebe91b12eded2123c1504 Mon Sep 17 00:00:00 2001
From: DavidBurrows-NCO <David.Burrows@noaa.gov>
Date: Mon, 4 Nov 2024 17:35:23 -0500
Subject: [PATCH 6/8] correction from previous commit

---
 modulefiles/build.gaeac6.intel.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulefiles/build.gaeac6.intel.lua b/modulefiles/build.gaeac6.intel.lua
index 5445c8aed..e1f1cbfec 100644
--- a/modulefiles/build.gaeac6.intel.lua
+++ b/modulefiles/build.gaeac6.intel.lua
@@ -1,5 +1,5 @@
 help([[
-Load environment to compile UFS_UTILS on Gaea using Intel
+Load environment to compile UFS_UTILS on Gaea C6 using Intel
 ]])
 
 prepend_path("MODULEPATH", "/sw/rdtn/modulefiles")

From f775e7691718a1ab6c4a84e085d3c501bedfe937 Mon Sep 17 00:00:00 2001
From: Mark A Potts <mark.potts@noaa.gov>
Date: Thu, 14 Nov 2024 13:57:21 +0000
Subject: [PATCH 7/8] removed unnecessary modules

---
 modulefiles/build.container.intel.lua | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/modulefiles/build.container.intel.lua b/modulefiles/build.container.intel.lua
index ca4e09bfe..873194a66 100644
--- a/modulefiles/build.container.intel.lua
+++ b/modulefiles/build.container.intel.lua
@@ -2,9 +2,6 @@ help([[
 Load environment to compile UFS_UTILS in a container using Intel
 ]])
 
-hpss_ver=os.getenv("hpss_ver") or ""
---load(pathJoin("hpss", hpss_ver))
-
 prepend_path("MODULEPATH", "/opt/spack-stack/spack-stack-1.8.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
@@ -34,12 +31,6 @@ load(pathJoin("sp", sp_ver))
 w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
 load(pathJoin("w3emc", w3emc_ver))
 
-sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
-load(pathJoin("sfcio", sfcio_ver))
-
-sigio_ver=os.getenv("sigio_ver") or "2.3.2"
-load(pathJoin("sigio", sigio_ver))
-
 png_ver=os.getenv("png_ver") or "1.6.37"
 load(pathJoin("libpng", png_ver))
 
@@ -49,13 +40,7 @@ load(pathJoin("netcdf-c", netcdf_c_ver))
 netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
 load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 
-nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
-load(pathJoin("nccmp", nccmp_ver))
-
 esmf_ver=os.getenv("esmf_ver") or "8.6.1"
 load(pathJoin("esmf", esmf_ver))
 
-nco_ver=os.getenv("nco_ver") or "5.1.6"
-load(pathJoin("nco", nco_ver))
-
 whatis("Description: UFS_UTILS build environment")

From 221ddee03ab7262ba8f3d8e5a592788960a71162 Mon Sep 17 00:00:00 2001
From: Mark A Potts <mark.potts@noaa.gov>
Date: Thu, 14 Nov 2024 14:04:45 +0000
Subject: [PATCH 8/8] restored some modules

---
 modulefiles/build.container.intel.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modulefiles/build.container.intel.lua b/modulefiles/build.container.intel.lua
index 873194a66..5d4beb308 100644
--- a/modulefiles/build.container.intel.lua
+++ b/modulefiles/build.container.intel.lua
@@ -31,6 +31,9 @@ load(pathJoin("sp", sp_ver))
 w3emc_ver=os.getenv("w3emc_ver") or "2.10.0"
 load(pathJoin("w3emc", w3emc_ver))
 
+sigio_ver=os.getenv("sigio_ver") or "2.3.2"
+load(pathJoin("sigio", sigio_ver))
+
 png_ver=os.getenv("png_ver") or "1.6.37"
 load(pathJoin("libpng", png_ver))
 
@@ -40,7 +43,13 @@ load(pathJoin("netcdf-c", netcdf_c_ver))
 netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
 load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
+
 esmf_ver=os.getenv("esmf_ver") or "8.6.1"
 load(pathJoin("esmf", esmf_ver))
 
+nco_ver=os.getenv("nco_ver") or "5.1.6"
+load(pathJoin("nco", nco_ver))
+
 whatis("Description: UFS_UTILS build environment")