diff --git a/ci/rt.sh b/ci/rt.sh index c556915cc..929c20fa9 100755 --- a/ci/rt.sh +++ b/ci/rt.sh @@ -65,26 +65,26 @@ if [ $mac2 = hf ]; then # for HERA export machine=HERA export homedir=${homedir:-"/scratch2/NAGAPE/epic/UPP/test_suite"} export rundir=${rundir:-"/scratch1/NCEPDEV/stmp2/${USER}"} - module use /scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core + module use /scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core module load stack-intel/2021.5.0 module load stack-intel-oneapi-mpi/2021.5.1 - module load prod_util/1.2.2 + module load prod_util/2.1.1 elif [ $mac = O ] ; then export machine=ORION export homedir=${homedir:-"/work/noaa/epic/UPP"} export rundir=${rundir:-"/work2/noaa/stmp/$USER"} - module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core + module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core module load stack-intel/2022.0.2 module load stack-intel-oneapi-mpi/2021.5.1 - module load prod-util/1.2.2 + module load prod-util/2.1.1 elif [ $mac3 = herc ] ; then export machine=HERCULES export homedir=${homedir:-"/work/noaa/epic/UPP"} export rundir=${rundir:-"/work2/noaa/stmp/$USER"} - module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core + module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core module load stack-intel/2021.9.0 module load stack-intel-oneapi-mpi/2021.9.0 - module load prod-util/1.2.2 + module load prod-util/2.1.1 fi #set working directory diff --git a/ci/spack.yaml b/ci/spack.yaml index ddfcfe83d..904b5eff0 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -6,19 +6,19 @@ spack: - intel - gcc@10:10 specs: - - netcdf-c@4.7.4 - - netcdf-fortran@4.5.3 + - netcdf-c@4.9.2 + - netcdf-fortran@4.6.1 - bacio@2.4.1 - - w3emc@2.9.2 + - w3emc@2.10.0 - g2@3.4.5 - - g2tmpl@1.10.0 - - sp@2.3.3 + - g2tmpl@1.10.2 + - sp@2.5.0 - ip@3.3.3 - sigio@2.3.2 - sfcio@1.4.1 - nemsio@2.5.4 - wrf-io@1.2.0 - - crtm@2.3.0 + - crtm@2.4.0.1 view: true concretizer: unify: true diff --git a/modulefiles/cheyenne b/modulefiles/cheyenne deleted file mode 100644 index f5a40a5bd..000000000 --- a/modulefiles/cheyenne +++ /dev/null @@ -1,39 +0,0 @@ -#%Module# - -proc ModulesHelp { } { -puts stderr "Loads modules required for building upp" -} -module-whatis "Loads UPP prerequisites on Cheyenne for Intel 2021.2" - -module purge - -module load cmake/3.18.2 -module load ncarenv/1.3 -module load intel/2021.2 -module load mpt/2.22 -module load ncarcompilers/0.5.0 -module unload netcdf - -module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack -module load hpc/1.2.0 -module load hpc-intel/2021.2 -module load hpc-mpt/2.22 - -module load jasper/2.0.25 -module load zlib/1.2.11 -module load png/1.6.35 - -module load hdf5/1.10.6 -module load netcdf/4.7.4 - -module load bacio/2.4.1 -module load crtm/2.3.0 -module load g2/3.4.2 -module load g2tmpl/1.10.0 -module load ip/3.3.3 -module load nemsio/2.5.2 -module load sfcio/1.4.1 -module load sigio/2.3.2 -module load sp/2.3.3 -module load w3emc/2.9.2 -module load wrf_io/1.2.0 diff --git a/modulefiles/cheyenne_gnu b/modulefiles/cheyenne_gnu deleted file mode 100644 index d14c372e6..000000000 --- a/modulefiles/cheyenne_gnu +++ /dev/null @@ -1,40 +0,0 @@ -#%Module# - -proc ModulesHelp { } { -puts stderr "Loads modules required for building upp" -} -module-whatis "Loads UPP prerequisites on Cheyenne for Intel 2021.2" - -module purge - -module load cmake/3.18.2 -module load ncarenv/1.3 -module load gnu/10.1.0 -module load mpt/2.22 -module load ncarcompilers/0.5.0 -module load python/3.7.9 -module unload netcdf - -module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack -module load hpc/1.2.0 -module load hpc-gnu/10.1.0 -module load hpc-mpt/2.22 - -module load jasper/2.0.25 -module load zlib/1.2.11 -module load png/1.6.35 - -module load hdf5/1.10.6 -module load netcdf/4.7.4 - -module load bacio/2.4.1 -module load crtm/2.3.0 -module load g2/3.4.2 -module load g2tmpl/1.10.0 -module load ip/3.3.3 -module load nemsio/2.5.2 -module load sfcio/1.4.1 -module load sigio/2.3.2 -module load sp/2.3.3 -module load w3emc/2.9.2 -module load wrf_io/1.2.0 diff --git a/modulefiles/hera.lua b/modulefiles/hera.lua index b59640cf3..5bd691da6 100644 --- a/modulefiles/hera.lua +++ b/modulefiles/hera.lua @@ -3,7 +3,7 @@ Load environment to build UPP on hera ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.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)) diff --git a/modulefiles/hercules.lua b/modulefiles/hercules.lua old mode 100755 new mode 100644 index a3c7a170f..b057df81e --- a/modulefiles/hercules.lua +++ b/modulefiles/hercules.lua @@ -3,7 +3,7 @@ Load environment to build UPP on hecules ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) diff --git a/modulefiles/jet b/modulefiles/jet deleted file mode 100644 index eaa92db3f..000000000 --- a/modulefiles/jet +++ /dev/null @@ -1,37 +0,0 @@ -#%Module###################################################################### -# Wen Meng 01/2021, Set up config. with the hpc-stack NCEPLIBS. -############################################################################## - -proc ModulesHelp { } { -puts stderr "Loads modules required for building upp" -} -module-whatis "Loads UPP prerequisites on Jet" - -module load cmake/3.16.1 - -module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack -module load hpc/1.1.0 -module load hpc-intel/18.0.5.274 -module load hpc-impi/2018.4.274 - -module load jasper/2.0.22 -module load zlib/1.2.11 -module load png/1.6.35 - -module load hdf5/1.10.6 -module load netcdf/4.7.4 - -module load bacio/2.4.1 -module load crtm/2.3.0 -module load g2/3.4.1 -module load g2tmpl/1.10.0 -module load ip/3.3.3 -module load nemsio/2.5.2 -module load sfcio/1.4.1 -module load sigio/2.3.2 -module load sp/2.3.3 -module load w3emc/2.9.2 -module load wrf_io/1.1.1 - -module use /lfs4/BMC/ifi/modulefiles -module try-load ifi/20230511-intel-18.0.5.274 diff --git a/modulefiles/jet.lua b/modulefiles/jet.lua new file mode 100644 index 000000000..dcd54d7b5 --- /dev/null +++ b/modulefiles/jet.lua @@ -0,0 +1,22 @@ +help([[ +Load environment to build UPP on Jet +]]) + +prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.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)) + +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)) + +load("upp_common") + +setenv("CC","mpiicc") +setenv("CXX","mpiicpc") +setenv("FC","mpiifort") + +whatis("Description: UPP build environment") diff --git a/modulefiles/orion.lua b/modulefiles/orion.lua index 4113b01fc..669c260d9 100644 --- a/modulefiles/orion.lua +++ b/modulefiles/orion.lua @@ -3,7 +3,7 @@ Load environment to build UPP on orion ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2" load(pathJoin("stack-intel", stack_intel_ver)) diff --git a/modulefiles/s4.lua b/modulefiles/s4.lua index 3a42fa888..58faca1ba 100644 --- a/modulefiles/s4.lua +++ b/modulefiles/s4.lua @@ -1,10 +1,11 @@ -- --------------------------------------------------------------------------- -- David Huber 06/2021, Set up config. with the hpc-stack NCEPLIBS. -- Innocent Souopgui 11/2023, Update to use spack-stack +-- David Huber 1/24, Update to use spack-stack v1.6.0 -- --------------------------------------------------------------------------- -prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.0" diff --git a/modulefiles/upp_common.lua b/modulefiles/upp_common.lua index 92eb093e2..e012f5652 100644 --- a/modulefiles/upp_common.lua +++ b/modulefiles/upp_common.lua @@ -8,14 +8,14 @@ local ufs_modules = { {["libpng"] = "1.6.37"}, {["hdf5"] = "1.14.0"}, {["netcdf-c"] = "4.9.2"}, - {["netcdf-fortran"] = "4.6.0"}, + {["netcdf-fortran"] = "4.6.1"}, {["parallelio"] = "2.5.10"}, {["bacio"] = "2.4.1"}, - {["crtm"] = "2.4.0"}, + {["crtm"] = "2.4.0.1"}, {["g2"] = "3.4.5"}, {["g2tmpl"] = "1.10.2"}, {["ip"] = "4.3.0"}, - {["sp"] = "2.3.3"}, + {["sp"] = "2.5.0"}, {["w3emc"] = "2.10.0"}, {["nemsio"] = "2.5.4"}, {["sigio"] = "2.3.2"},