diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index 97978e76e..5dd418baa 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -147,6 +147,8 @@ modules: ^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-debug' ^esmf@8.7.0b04~debug snapshot=b04: 'esmf-8.7.0b04' ^esmf@8.7.0b04+debug snapshot=b04: 'esmf-8.7.0b04-debug' + ^esmf@8.7.0b11~debug snapshot=b04: 'esmf-8.7.0b11' + ^esmf@8.7.0b11+debug snapshot=b04: 'esmf-8.7.0b11-debug' openmpi: environment: set: diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index 3a462d06a..dddfa9a34 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -149,6 +149,8 @@ modules: ^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-debug' ^esmf@8.7.0b04~debug snapshot=b04: 'esmf-8.7.0b04' ^esmf@8.7.0b04+debug snapshot=b04: 'esmf-8.7.0b04-debug' + ^esmf@8.7.0b11~debug snapshot=b04: 'esmf-8.7.0b11' + ^esmf@8.7.0b11+debug snapshot=b04: 'esmf-8.7.0b11-debug' openmpi: environment: set: diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 2e8f5bc1d..353220c0e 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -54,7 +54,7 @@ esmf: require: - '~xerces ~pnetcdf +shared +external-parallelio' - - any_of: ['@=8.6.1 snapshot=none', '@=8.7.0b04 snapshot=b04'] + - any_of: ['@=8.6.1 snapshot=none', '@=8.7.0b11 snapshot=b11'] - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"'] when: "%intel" message: "Extra ESMF compile options for Intel" diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index 794ecc460..b3e83f105 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -14,7 +14,7 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.6.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.7.0b04 + - jedi-neptune-env ^esmf@=8.7.0b11 - jedi-ufs-env ^esmf@=8.6.1 - jedi-um-env - soca-env @@ -25,7 +25,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none - - esmf@=8.7.0b04 snapshot=b04 + - esmf@=8.7.0b11 snapshot=b11 specs: - matrix: diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index bdecf4e20..2d0b301aa 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -17,11 +17,11 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.6.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.7.0b04 + - jedi-neptune-env ^esmf@=8.7.0b11 - jedi-tools-env - jedi-ufs-env ^esmf@=8.6.1 - jedi-um-env - - neptune-env ~python ^esmf@=8.7.0b04 + - neptune-env ~python ^esmf@=8.7.0b11 - soca-env - ufs-srw-app-env ^esmf@=8.6.1 - ufs-weather-model-env ^esmf@=8.6.1 @@ -32,7 +32,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none - - esmf@=8.7.0b04 snapshot=b04 + - esmf@=8.7.0b11 snapshot=b11 # MADIS for WCOSS2 decoders. - madis@4.5 diff --git a/spack b/spack index e422f4293..c06c82918 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e422f42938148d69e310c85a4c15b4795c9c000b +Subproject commit c06c8291877e7b472367d8b944f38717b1b7e792