Point to new hpc stack on Hera.

Fixes #629.
ufs-community · Mar 3, 2022 · 255828e · 255828e
1 parent d21d534
commit 255828e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/modulefiles/fv3gfs/global_cycle.hera.lua b/modulefiles/fv3gfs/global_cycle.hera.lua
@@ -2,9 +2,9 @@ help([[
 Load environment to compile UFS_UTILS global_cycle on Hera
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack-gfsv16/modulefiles/stack")
 
-hpc_ver=os.getenv("hpc_ver") or "1.1.0"
+hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 load(pathJoin("hpc", hpc_ver))
 
 hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
@@ -25,9 +25,14 @@ load(pathJoin("w3nco", w3nco_ver))
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles")
+hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
+load(pathJoin("hdf5", hdf5_ver))
+
+zlib_ver=os.getenv("zlib_ver") or "1.2.11"
+load(pathJoin("zlib", zlib_ver))
+
 netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
-load(pathJoin("netcdf_parallel", netcdf_ver))
+load(pathJoin("netcdf", netcdf_ver))
 
 setenv("FCMP","mpiifort")
 

diff --git a/modulefiles/modulefile.global_emcsfc_ice_blend.hera.lua b/modulefiles/modulefile.global_emcsfc_ice_blend.hera.lua
@@ -2,9 +2,9 @@ help([[
 Load environment to compile UFS_UTILS emcsfc_ice_blend on Hera
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack-gfsv16/modulefiles/stack")
 
-hpc_ver=os.getenv("hpc_ver") or "1.1.0"
+hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 load(pathJoin("hpc", hpc_ver))
 
 hpc_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
@@ -16,15 +16,15 @@ load(pathJoin("w3nco", w3nco_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.3"
+g2_ver=os.getenv("g2_ver") or "3.4.5"
 load(pathJoin("g2", g2_ver))
 
 jasper_ver=os.getenv("jasper_ver") or "2.0.25"
 load(pathJoin("jasper", jasper_ver))
 setenv("JASPER_LIB","${JASPER_LIBRARIES}/libjasper.a")
 
-libpng_ver=os.getenv("libpng_ver") or "1.6.35"
-load(pathJoin("png", libpng_ver))
+libpng_ver=os.getenv("libpng_ver") or "1.6.37"
+load(pathJoin("libpng", libpng_ver))
 setenv("PNG_LIB","${PNG_ROOT}/lib64/libpng.a")
 
 zlib_ver=os.getenv("zlib_ver") or "1.2.11"

diff --git a/modulefiles/modulefile.global_emcsfc_snow2mdl.hera.lua b/modulefiles/modulefile.global_emcsfc_snow2mdl.hera.lua
@@ -2,9 +2,9 @@ help([[
 Load environment to compile UFS_UTILS snow2mdl on Hera
 ]])
 
-prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack-gfsv16/modulefiles/stack")
 
-hpc_ver=os.getenv("hpc_ver") or "1.1.0"
+hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 load(pathJoin("hpc", hpc_ver))
 
 hpc_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
@@ -33,11 +33,11 @@ zlib_ver=os.getenv("zlib_ver") or "1.2.11"
 load(pathJoin("zlib", zlib_ver))
 setenv("Z_LIB","${ZLIB_LIBRARIES}/libz.a")
 
-libpng_ver=os.getenv("libpng_ver") or "1.6.35"
-load(pathJoin("png", libpng_ver))
+libpng_ver=os.getenv("libpng_ver") or "1.6.37"
+load(pathJoin("libpng", libpng_ver))
 setenv("PNG_LIB","${PNG_ROOT}/lib64/libpng.a")
 
-g2_ver=os.getenv("g2_ver") or "3.4.3"
+g2_ver=os.getenv("g2_ver") or "3.4.5"
 load(pathJoin("g2", g2_ver))
 
 setenv("FCOMP","ifort")