Skip to content

Commit

Permalink
Upgrade to spack-stack 1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidHuber-NOAA committed Sep 9, 2024
1 parent 2af8422 commit 9a92e92
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if(BUILD_POSTEXEC)
find_package(nemsio REQUIRED)
find_package(sigio REQUIRED)
endif()
find_package(sp REQUIRED)
find_package(ip REQUIRED)
find_package(w3emc REQUIRED)
if(BUILD_WITH_WRFIO)
find_package(wrf_io REQUIRED)
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/hera.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Load environment to build UPP on hera
]])


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/gsi-addon/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"
cmake_ver=os.getenv("cmake_ver") or "3.27.9"
load(pathJoin("cmake", cmake_ver))

load("upp_common")
Expand Down
13 changes: 6 additions & 7 deletions modulefiles/upp_common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@ help([[Load UFS Model common libraries]])

local ufs_modules = {
{["jasper"] = "2.0.32"},
{["zlib"] = "1.2.13"},
{["zlib-ng"] = "2.1.6"},
{["libpng"] = "1.6.37"},
{["hdf5"] = "1.14.0"},
{["hdf5"] = "1.14.3"},
{["netcdf-c"] = "4.9.2"},
{["netcdf-fortran"] = "4.6.1"},
{["parallelio"] = "2.5.10"},
{["parallelio"] = "2.6.2"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0.1"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["ip"] = "4.3.0"},
{["sp"] = "2.5.0"},
{["g2"] = "3.5.1"},
{["g2tmpl"] = "1.13.0"},
{["ip"] = "5.0.0"},
{["w3emc"] = "2.10.0"},
{["nemsio"] = "2.5.4"},
{["sigio"] = "2.3.2"},
Expand Down
2 changes: 1 addition & 1 deletion sorc/ncep_post.fd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ if(BUILD_POSTEXEC)
target_link_libraries(${EXENAME} PRIVATE
${LIBNAME}
w3emc::w3emc_4
sp::sp_4)
ip::ip_4)
set_target_properties(${EXENAME} PROPERTIES LINKER_LANGUAGE Fortran)
if(IFI_FOUND)
target_link_libraries(${EXENAME} PRIVATE IFI)
Expand Down

0 comments on commit 9a92e92

Please sign in to comment.