diff --git a/ci/spack.yaml b/ci/spack.yaml index f0db7c2ac..c779b40a6 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -7,16 +7,15 @@ spack: - netcdf-c@4.9.2 - netcdf-fortran@4.6.1 - bacio@2.4.1 - - g2@3.4.5 - - ip@4.4.0 precision=d + - g2@3.5.1 + - ip@5.0.0 - nemsio@2.5.4 - - sp@2.5.0 - w3emc@2.10.0 - sfcio@1.4.1 - sigio@2.3.2 - nccmp@1.9.0.1 - - parallelio@2.5.10+fortran~pnetcdf - - esmf@8.6.0 + - parallelio@2.6.2+pnetcdf + - esmf@8.6.1 view: true concretizer: unify: when_possible diff --git a/modulefiles/build.hera.intel.lua b/modulefiles/build.hera.intel.lua index 377b0dda6..ececfd4b9 100644 --- a/modulefiles/build.hera.intel.lua +++ b/modulefiles/build.hera.intel.lua @@ -5,7 +5,7 @@ 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.6.0/envs/unified-env-rocky8/install/modulefiles/Core") +prepend_path("MODULEPATH", '/scratch1/NCEPDEV/global/David.Huber/SPACK/ss_1.8.0/envs/unified-env/install/modulefiles/Core') stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -13,24 +13,21 @@ 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)) 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" 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)) @@ -41,8 +38,8 @@ load(pathJoin("w3emc", w3emc_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)) +zlib_ver=os.getenv("zlib_ver") or "2.1.6" +load(pathJoin("zlib-ng", zlib_ver)) png_ver=os.getenv("png_ver") or "1.6.37" load(pathJoin("libpng", png_ver)) @@ -56,10 +53,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") diff --git a/reg_tests/ice_blend/driver.hera.sh b/reg_tests/ice_blend/driver.hera.sh index ec31d773f..863083e41 100755 --- a/reg_tests/ice_blend/driver.hera.sh +++ b/reg_tests/ice_blend/driver.hera.sh @@ -37,7 +37,7 @@ module load build.$target.$compiler module load grib-util # Because of a bug in the grib-util module, the wgrib2 module # must be loaded last. -module load wgrib2/2.0.8 +module load wgrib2/3.1.1 module list export DATA="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}" diff --git a/reg_tests/snow2mdl/driver.hera.sh b/reg_tests/snow2mdl/driver.hera.sh index f2c07ba5a..872f034ae 100755 --- a/reg_tests/snow2mdl/driver.hera.sh +++ b/reg_tests/snow2mdl/driver.hera.sh @@ -26,7 +26,7 @@ source ../../sorc/machine-setup.sh > /dev/null 2>&1 module use ../../modulefiles module load build.$target.$compiler module load grib-util -module load wgrib2/2.0.8 +module load wgrib2/3.1.1 module list # Because of a bug in the grib-util module, need to construct this