diff --git a/CMakeLists.txt b/CMakeLists.txt index ceee4e502..cbe73331a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -276,7 +276,7 @@ endif() target_link_libraries(${DYCORE_TARGET} PUBLIC w3emc::w3emc_d sp::sp_d bacio::bacio_4 - esmf) + ESMF::ESMF) # OpenMP if(OPENMP) diff --git a/ci/spack.yaml b/ci/spack.yaml index 32bb71616..944d73a12 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -13,11 +13,11 @@ spack: specs: - bacio@2.4.1 - crtm@2.4.0 - - esmf@8.6.0 - - fms@2023.04 +gfs_phys +openmp +pic +quad_precision +deprecated_io constants=GFS precision=32,64 + - esmf@8.8.0 + - fms@2024.02 +gfs_phys +openmp +pic +quad_precision +deprecated_io constants=GFS precision=32,64 - g2@3.5.1 - g2tmpl@1.13.0 - - ip@4.3.0 precision=4,d,8 + - ip@5.1.0 precision=4,d,8 - netcdf-c@4.9.2 ~blosc - netcdf-fortran@4.6.1 - sp@2.5.0 precision=4,d,8 diff --git a/fv3/atmos_cubed_sphere b/fv3/atmos_cubed_sphere index b0a1b0957..0ca27bab3 160000 --- a/fv3/atmos_cubed_sphere +++ b/fv3/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit b0a1b0957d3b79d642f3c01e5cd9441936c7c832 +Subproject commit 0ca27bab375c9cbabf98619712d1ec81b8000986 diff --git a/mpas/CMakeLists.txt b/mpas/CMakeLists.txt index 8954cf774..ea02adabd 100644 --- a/mpas/CMakeLists.txt +++ b/mpas/CMakeLists.txt @@ -51,7 +51,7 @@ if(NOT ESMF_FOUND) find_package(ESMF REQUIRED) endif() add_definitions(-DMPAS_EXTERNAL_ESMF_LIB -DMPAS_NO_ESMF_INIT) -add_library(${PROJECT_NAME}::external::esmf ALIAS esmf) +add_library(${PROJECT_NAME}::external::esmf ALIAS ESMF::ESMF) # MPAS Namelist add_subdirectory(MPAS-Model/src/tools/input_gen) # Targets: namelist_gen, streams_gen