Merge remote-tracking branch 'me/feature/spack-stack_gw' into feature…

…/spack-stack_gw
DavidHuber-NOAA · Oct 24, 2023 · d137f86 · d137f86
2 parents 5d05b1d + caa4593
commit d137f86
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/modulefiles/build.hera.gnu.lua b/modulefiles/build.hera.gnu.lua
@@ -42,20 +42,14 @@ 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))
-
 hdf5_ver=os.getenv("hdf5_ver") or "1.14.0"
 load(pathJoin("hdf5", hdf5_ver))
 
-netcdf_ver=os.getenv("netcdf_c_ver") or "4.9.2"
-load(pathJoin("netcdf-c", netcdf_ver))
+netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
+load(pathJoin("netcdf-c", netcdf_c_ver))
 
-netcdf_ver=os.getenv("netcdf_fortran_ver") or "4.6.0"
-load(pathJoin("netcdf-fortran", netcdf_ver))
+netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0"
+load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))

diff --git a/modulefiles/build.hera.intel.lua b/modulefiles/build.hera.intel.lua
@@ -46,14 +46,11 @@ load(pathJoin("zlib", zlib_ver))
 png_ver=os.getenv("png_ver") or "1.6.37"
 load(pathJoin("libpng", png_ver))
 
-hdf5_ver=os.getenv("hdf5_ver") or "1.14.0"
-load(pathJoin("hdf5", hdf5_ver))
+netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
+load(pathJoin("netcdf-c", netcdf_c_ver))
 
-netcdf_ver=os.getenv("netcdf_c_ver") or "4.9.2"
-load(pathJoin("netcdf-c", netcdf_ver))
-
-netcdf_ver=os.getenv("netcdf_fortran_ver") or "4.6.0"
-load(pathJoin("netcdf-fortran", netcdf_ver))
+netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0"
+load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))