diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml index 4cc4d43e6..144db4ef7 100644 --- a/configs/common/modules_lmod.yaml +++ b/configs/common/modules_lmod.yaml @@ -132,8 +132,8 @@ modules: ^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-debug' ^esmf@8.7.0~debug snapshot=none: 'esmf-8.7.0' ^esmf@8.7.0+debug snapshot=none: 'esmf-8.7.0-debug' - ^esmf@8.8.0b10~debug snapshot=b10: esmf-8.8.0b10 - ^esmf@8.8.0b10+debug snapshot=b10: esmf-8.8.0b10-debug + ^esmf@8.8.0~debug snapshot=none: 'esmf-8.8.0' + ^esmf@8.8.0+debug snapshot=none: 'esmf-8.8.0-debug' openmpi: environment: set: diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml index b59e3a9f6..d144e0eeb 100644 --- a/configs/common/modules_tcl.yaml +++ b/configs/common/modules_tcl.yaml @@ -134,8 +134,8 @@ modules: ^esmf@8.6.1+debug snapshot=none: 'esmf-8.6.1-debug' ^esmf@8.7.0~debug snapshot=none: 'esmf-8.7.0' ^esmf@8.7.0+debug snapshot=none: 'esmf-8.7.0-debug' - ^esmf@8.8.0b10~debug snapshot=b10: esmf-8.8.0b10 - ^esmf@8.8.0b10+debug snapshot=b10: esmf-8.8.0b10-debug + ^esmf@8.8.0~debug snapshot=none: 'esmf-8.8.0' + ^esmf@8.8.0+debug snapshot=none: 'esmf-8.8.0-debug' openmpi: environment: set: diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 366bee3d5..72e0356a8 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -64,7 +64,7 @@ packages: esmf: require: - '~xerces ~pnetcdf +shared +external-parallelio' - - any_of: ['@=8.6.1 snapshot=none', '@=8.8.0b10 snapshot=b10'] + - any_of: ['@=8.6.1 snapshot=none', '@=8.8.0 snapshot=none'] - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"'] when: "%intel" message: "Extra ESMF compile options for Intel" diff --git a/configs/templates/neptune-dev/spack.yaml b/configs/templates/neptune-dev/spack.yaml index 3e03f9164..8a7828e58 100644 --- a/configs/templates/neptune-dev/spack.yaml +++ b/configs/templates/neptune-dev/spack.yaml @@ -8,8 +8,8 @@ spack: definitions: - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi'] - packages: - - neptune-env +espc ^esmf@=8.8.0b10 - - neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.8.0b10 + - neptune-env +espc ^esmf@=8.8.0 + - neptune-python-env +xnrl ^neptune-env +espc ^esmf@=8.8.0 specs: - matrix: diff --git a/configs/templates/skylab-dev/spack.yaml b/configs/templates/skylab-dev/spack.yaml index 104b6784b..c4d83d532 100644 --- a/configs/templates/skylab-dev/spack.yaml +++ b/configs/templates/skylab-dev/spack.yaml @@ -14,11 +14,11 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.6.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.8.0b10 + - jedi-neptune-env ^esmf@=8.8.0 - jedi-ufs-env ^esmf@=8.6.1 - jedi-um-env - - neptune-env ^esmf@=8.8.0b10 - - neptune-python-env ^esmf@=8.8.0b10 + - neptune-env ^esmf@=8.8.0 + - neptune-python-env ^esmf@=8.8.0 - soca-env # Various crtm tags (list all to avoid duplicate packages) @@ -27,7 +27,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none - - esmf@=8.8.0b10 snapshot=b10 + - esmf@=8.8.0 snapshot=none specs: - matrix: diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index f4dab2eb5..8d8242cfe 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -17,12 +17,12 @@ spack: - jedi-fv3-env - jedi-geos-env ^esmf@=8.6.1 - jedi-mpas-env - - jedi-neptune-env ^esmf@=8.8.0b10 + - jedi-neptune-env ^esmf@=8.8.0 - jedi-tools-env - jedi-ufs-env ^esmf@=8.6.1 - jedi-um-env - - neptune-env ^esmf@=8.8.0b10 - - neptune-python-env ^esmf@=8.8.0b10 + - neptune-env ^esmf@=8.8.0 + - neptune-python-env ^esmf@=8.8.0 - soca-env - ufs-srw-app-env ^esmf@=8.6.1 - ufs-weather-model-env ^esmf@=8.6.1 @@ -33,7 +33,7 @@ spack: # Various esmf tags (list all to avoid duplicate packages) - esmf@=8.6.1 snapshot=none - - esmf@=8.8.0b10 snapshot=b10 + - esmf@=8.8.0 snapshot=none # MADIS for WCOSS2 decoders. - madis@4.5 diff --git a/spack b/spack index dd99fc1e1..ffeffba28 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit dd99fc1e177cbae412e1753f3a81499df90cee27 +Subproject commit ffeffba282acd873a288efb9dbb8e964f128c7e4