diff --git a/CMakeLists.txt b/CMakeLists.txt index a8a9dc3b7..133d5ef48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,11 @@ if(BUILD_POSTEXEC) find_package(nemsio REQUIRED) find_package(sigio REQUIRED) endif() - find_package(sp REQUIRED) + find_package(sp QUIET) + find_package(ip 5.0 QUIET) + if((NOT ip_VERSION VERSION_GREATER_EQUAL 5.0) AND (NOT sp_FOUND)) + message(SEND_ERROR "UPP requires sp or ip v5+.") + endif() find_package(w3emc REQUIRED) if(BUILD_WITH_WRFIO) find_package(wrf_io REQUIRED) diff --git a/README.md b/README.md index 291765289..0f63f496f 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,6 @@ Required NCEPLIBS packages: - [NCEPLIBS-g2](https://github.com/NOAA-EMC/NCEPLIBS-g2) - [NCEPLIBS-g2tmpl](https://github.com/NOAA-EMC/NCEPLIBS-g2tmpl) -- [NCEPLIBS-sp](https://github.com/NOAA-EMC/NCEPLIBS-sp) - [NCEPLIBS-ip](https://github.com/NOAA-EMC/NCEPLIBS-ip) - [NCEPLIBS-bacio](https://github.com/NOAA-EMC/NCEPLIBS-bacio) - [NCEPLIBS-w3emc](https://github.com/NOAA-EMC/NCEPLIBS-w3emc) @@ -135,4 +134,4 @@ States Government. ## UPP Terms of Use Notice -The UPP Terms of Use Notice is available at: https://github.com/NOAA-EMC/UPP/wiki/UPP-Terms-of-Use-Notice \ No newline at end of file +The UPP Terms of Use Notice is available at: https://github.com/NOAA-EMC/UPP/wiki/UPP-Terms-of-Use-Notice diff --git a/ci/rt.sh b/ci/rt.sh index dba1e239f..997e33b33 100755 --- a/ci/rt.sh +++ b/ci/rt.sh @@ -67,7 +67,7 @@ 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.6.0/envs/upp-addon-env/install/modulefiles/Core + module use /contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core module load stack-intel/2021.5.0 module load stack-intel-oneapi-mpi/2021.5.1 module load prod_util/2.1.1 @@ -75,7 +75,7 @@ elif [ $mac3 = orio ] ; 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.6.0/envs/upp-addon-env/install/modulefiles/Core + module use /apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core module load stack-intel/2021.9.0 module load stack-intel-oneapi-mpi/2021.9.0 module load prod_util/2.1.1 @@ -84,7 +84,7 @@ 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.6.0/envs/upp-addon-env/install/modulefiles/Core + module use /apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core module load stack-intel/2021.9.0 module load stack-intel-oneapi-mpi/2021.9.0 module load prod_util/2.1.1 diff --git a/ci/spack.yaml b/ci/spack.yaml index 4f3714ed1..672d18068 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -12,8 +12,7 @@ spack: - w3emc@2.10.0 - g2@3.5.1 - g2tmpl@1.13.0 - - sp@2.5.0 - - ip@4.3.0 + - ip@5.0.0 - sigio@2.3.2 - sfcio@1.4.1 - nemsio@2.5.4 diff --git a/doc/UserGuide/BuildingRunningTesting/BuildingUPP.rst b/doc/UserGuide/BuildingRunningTesting/BuildingUPP.rst index ca11fa689..b18d29ef2 100644 --- a/doc/UserGuide/BuildingRunningTesting/BuildingUPP.rst +++ b/doc/UserGuide/BuildingRunningTesting/BuildingUPP.rst @@ -31,7 +31,7 @@ the instructions in the :doc:`spack-stack User's Guide `. Common Modules ---------------- -As of February 1, 2024, the UPP uses the following `common modules `__ from spack-stack: +As of October 2024, the UPP uses the following `common modules `__ from spack-stack: .. code-block:: console @@ -46,8 +46,7 @@ As of February 1, 2024, the UPP uses the following `common modules