Skip to content

Commit 4fba2fb

Browse files
FernandoAndrade-NOAAFernandoAndrade-NOAA
authored
Spack Stack 1.8.0 (#1062)
Upgrade to space-stack v1.8.0 --------- Co-authors: @FernandoAndrade-NOAA @WenMeng-NOAA @AlexanderRichert-NOAA @gspetro-NOAA
1 parent ce5f3b1 commit 4fba2fb

File tree

15 files changed

+229
-201
lines changed

15 files changed

+229
-201
lines changed

‎CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,11 @@ if(BUILD_POSTEXEC)
8989
find_package(nemsio REQUIRED)
9090
find_package(sigio REQUIRED)
9191
endif()
92-
find_package(sp REQUIRED)
92+
find_package(sp QUIET)
93+
find_package(ip 5.0 QUIET)
94+
if((NOT ip_VERSION VERSION_GREATER_EQUAL 5.0) AND (NOT sp_FOUND))
95+
message(SEND_ERROR "UPP requires sp or ip v5+.")
96+
endif()
9397
find_package(w3emc REQUIRED)
9498
if(BUILD_WITH_WRFIO)
9599
find_package(wrf_io REQUIRED)

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ Required NCEPLIBS packages:
7272

7373
- [NCEPLIBS-g2](https://github.com/NOAA-EMC/NCEPLIBS-g2)
7474
- [NCEPLIBS-g2tmpl](https://github.com/NOAA-EMC/NCEPLIBS-g2tmpl)
75-
- [NCEPLIBS-sp](https://github.com/NOAA-EMC/NCEPLIBS-sp)
7675
- [NCEPLIBS-ip](https://github.com/NOAA-EMC/NCEPLIBS-ip)
7776
- [NCEPLIBS-bacio](https://github.com/NOAA-EMC/NCEPLIBS-bacio)
7877
- [NCEPLIBS-w3emc](https://github.com/NOAA-EMC/NCEPLIBS-w3emc)
@@ -135,4 +134,4 @@ States Government.
135134

136135
## UPP Terms of Use Notice
137136

138-
The UPP Terms of Use Notice is available at: https://github.com/NOAA-EMC/UPP/wiki/UPP-Terms-of-Use-Notice
137+
The UPP Terms of Use Notice is available at: https://github.com/NOAA-EMC/UPP/wiki/UPP-Terms-of-Use-Notice

‎ci/rt.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ if [ $mac2 = hf ]; then # for HERA
6767
export machine=HERA
6868
export homedir=${homedir:-"/scratch2/NAGAPE/epic/UPP/test_suite"}
6969
export rundir=${rundir:-"/scratch1/NCEPDEV/stmp2/${USER}"}
70-
module use /scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
70+
module use /contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core
7171
module load stack-intel/2021.5.0
7272
module load stack-intel-oneapi-mpi/2021.5.1
7373
module load prod_util/2.1.1
7474
elif [ $mac3 = orio ] ; then
7575
export machine=ORION
7676
export homedir=${homedir:-"/work/noaa/epic/UPP"}
7777
export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
78-
module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
78+
module use /apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core
7979
module load stack-intel/2021.9.0
8080
module load stack-intel-oneapi-mpi/2021.9.0
8181
module load prod_util/2.1.1
@@ -84,7 +84,7 @@ elif [ $mac3 = herc ] ; then
8484
export machine=HERCULES
8585
export homedir=${homedir:-"/work/noaa/epic/UPP"}
8686
export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
87-
module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
87+
module use /apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core
8888
module load stack-intel/2021.9.0
8989
module load stack-intel-oneapi-mpi/2021.9.0
9090
module load prod_util/2.1.1

‎ci/spack.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ spack:
1212
- [email protected]
1313
- [email protected]
1414
- [email protected]
15-
- [email protected]
16-
- [email protected]
15+
- [email protected]
1716
- [email protected]
1817
- [email protected]
1918
- [email protected]

‎doc/UserGuide/BuildingRunningTesting/BuildingUPP.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ the instructions in the :doc:`spack-stack User's Guide <spack-stack:index>`.
3131
Common Modules
3232
----------------
3333

34-
As of February 1, 2024, the UPP uses the following `common modules <https://github.com/NOAA-EMC/UPP/blob/develop/modulefiles/upp_common.lua>`__ from spack-stack:
34+
As of October 2024, the UPP uses the following `common modules <https://github.com/NOAA-EMC/UPP/blob/develop/modulefiles/upp_common.lua>`__ from spack-stack:
3535

3636
.. code-block:: console
3737
@@ -46,8 +46,7 @@ As of February 1, 2024, the UPP uses the following `common modules <https://gith
4646
g2tmpl 1.10.2
4747
parallelio 2.5.10
4848
bacio 2.4.1
49-
ip 4.3.0
50-
sp 2.5.0
49+
ip 5.0.0
5150
crtm 2.4.0.1
5251
w3emc 2.10.0
5352
nemsio 2.5.4

‎modulefiles/gaeac5.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ help([[
55

66
whatis([===[Loads libraries needed for building the UPP on Gaea C5 ]===])
77

8-
prepend_path("MODULEPATH", "/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
8+
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core")
99

1010
stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
1111
load(pathJoin("stack-intel", stack_intel_ver))
1212

1313
stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
1414
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
1515

16-
cmake_ver=os.getenv("cmake_ver") or "3.23.1"
16+
cmake_ver=os.getenv("cmake_ver") or "3.27.9"
1717
load(pathJoin("cmake", cmake_ver))
1818

1919
load("upp_common")

‎modulefiles/hera.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ Load environment to build UPP on hera
33
]])
44

55

6-
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
6+
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core")
77

88
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
99
load(pathJoin("stack-intel", stack_intel_ver))
1010

1111
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
1212
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
1313

14-
cmake_ver=os.getenv("cmake_ver") or "3.23.1"
14+
cmake_ver=os.getenv("cmake_ver") or "3.27.9"
1515
load(pathJoin("cmake", cmake_ver))
1616

1717
load("upp_common")

‎modulefiles/hercules.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ Load environment to build UPP on hecules
33
]])
44

55

6-
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
6+
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core")
77

88
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
99
load(pathJoin("stack-intel", stack_intel_ver))
1010

1111
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
1212
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
1313

14-
cmake_ver=os.getenv("cmake_ver") or "3.23.1"
14+
cmake_ver=os.getenv("cmake_ver") or "3.27.9"
1515
load(pathJoin("cmake", cmake_ver))
1616

1717
python_ver=os.getenv("python_ver") or "3.10.8"

‎modulefiles/orion.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ Load environment to build UPP on orion
33
]])
44

55

6-
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
6+
prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.9.0/install/modulefiles/Core")
77

88
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
99
load(pathJoin("stack-intel", stack_intel_ver))
1010

1111
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
1212
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
1313

14-
cmake_ver=os.getenv("cmake_ver") or "3.23.1"
14+
cmake_ver=os.getenv("cmake_ver") or "3.27.9"
1515
load(pathJoin("cmake", cmake_ver))
1616

1717
python_ver=os.getenv("python_ver") or "3.10.8"

‎modulefiles/upp_common.lua

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@ whatis("Description: UPP build environment common libraries")
33
help([[Load UFS Model common libraries]])
44

55
local ufs_modules = {
6-
{["jasper"] = "2.0.32"},
7-
{["zlib"] = "1.2.13"},
8-
{["libpng"] = "1.6.37"},
9-
{["hdf5"] = "1.14.0"},
10-
{["netcdf-c"] = "4.9.2"},
11-
{["netcdf-fortran"] = "4.6.1"},
12-
{["bacio"] = "2.4.1"},
6+
{["jasper"] = "2.0.32" },
7+
{["zlib-ng"] = "2.1.6" },
8+
{["libpng"] = "1.6.37" },
9+
{["hdf5"] = "1.14.3" },
10+
{["netcdf-c"] = "4.9.2" },
11+
{["netcdf-fortran"] = "4.6.1" },
12+
{["bacio"] = "2.4.1" },
1313
{["crtm"] = "2.4.0.1"},
14-
{["g2"] = "3.5.1"},
15-
{["g2tmpl"] = "1.13.0"},
16-
{["ip"] = "4.3.0"},
17-
{["sp"] = "2.5.0"},
18-
{["w3emc"] = "2.10.0"},
19-
{["nemsio"] = "2.5.4"},
20-
{["sigio"] = "2.3.2"},
21-
{["wrf-io"] = "1.2.0"},
14+
{["g2"] = "3.5.1" },
15+
{["g2tmpl"] = "1.13.0" },
16+
{["ip"] = "5.0.0" },
17+
{["w3emc"] = "2.10.0" },
18+
{["nemsio"] = "2.5.4" },
19+
{["sigio"] = "2.3.2" },
20+
{["wrf-io"] = "1.2.0" },
2221
}
2322

2423
for i = 1, #ufs_modules do

0 commit comments

Comments
 (0)