diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index cf36fd812..834a84fc2 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -21,7 +21,7 @@ packages: bufr: require: - '+python' - - any_of: ['@=12.0.1', '@=11.7.0'] + - '@=12.1.0' cairo: require: '+pic' cdo: diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml index a3942234e..c876f7c4f 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -1,6 +1,6 @@ ### spack-stack-1.6.0 / skylab-7.x.y containers for fv3-jedi and mpas-jedi (but not for ufs-jedi) specs: [base-env@1.0.0, jedi-base-env@1.0.0, ewok-env@1.0.0, jedi-fv3-env@1.0.0, - jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.0.1, ecbuild@3.7.2, eccodes@2.33.0, ecflow@5, + jedi-mpas-env@1.0.0, bacio@2.4.1, bison@3.8.2, bufr@12.1.0, ecbuild@3.7.2, eccodes@2.33.0, ecflow@5, eckit@1.24.5, ecmwf-atlas@0.38.1 +fckit +trans +tesselation +fftw, fiat@1.2.0, ectrans@1.2.0 +fftw, eigen@3.4.0, fckit@0.11.0, fms@2023.04, g2@3.4.9, g2tmpl@1.10.2, gsibec@1.2.1, hdf@4.2.15, hdf5@1.14.3, ip@5.0.0, jasper@2.0.32, jedi-cmake@1.4.0, diff --git a/configs/templates/ufs-srw-dev/spack.yaml b/configs/templates/ufs-srw-dev/spack.yaml index 55a1db94e..79aacf061 100644 --- a/configs/templates/ufs-srw-dev/spack.yaml +++ b/configs/templates/ufs-srw-dev/spack.yaml @@ -35,7 +35,7 @@ spack: - parallelio@2.5.10 - esmf@8.4.2 - fms@2023.01 - - bufr@12.0.0 + - bufr@12.1.0 - bacio@2.4.1 - crtm@2.4.0 - g2@3.4.5 diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index 46a6f3037..38374580a 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -23,7 +23,7 @@ spack: - jedi-um-env - neptune-env ~python ^esmf@=8.7.0b11 snapshot=b11 - soca-env - - ufs-srw-app-env ^esmf@=8.6.1 + - ufs-srw-app-env ^esmf@=8.6.1 ^metplus@5.1.0 ^met@11.1.1 - ufs-weather-model-env ^esmf@=8.6.1 # Various crtm tags (list all to avoid duplicate packages) diff --git a/spack b/spack index fb50a614c..f7a216a28 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit fb50a614cc6f927e4844476acd38e06ea55292c4 +Subproject commit f7a216a2864bd4645d8be3cf687ffa89d28ab96d diff --git a/spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py b/spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py index bdfba80d7..92327a480 100644 --- a/spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py +++ b/spack-ext/repos/spack-stack/packages/emc-verif-global-env/package.py @@ -36,7 +36,9 @@ class EmcVerifGlobalEnv(BundlePackage): depends_on("wgrib2", when="%intel") depends_on("python") depends_on("prod-util") - depends_on("met") - depends_on("metplus") + depends_on("met@9.1.3", when="%gcc") + depends_on("met@9.1.3", when="%intel") + depends_on("metplus@3.1.1", when="%gcc") + depends_on("metplus@3.1.1", when="%intel") # There is no need for install() since there is no code. diff --git a/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py b/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py index c80be09a0..3879d4767 100644 --- a/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py +++ b/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py @@ -43,8 +43,10 @@ class GlobalWorkflowEnv(BundlePackage): depends_on("wgrib2", when="%apple-clang") depends_on("wgrib2", when="%gcc") depends_on("wgrib2", when="%intel") - depends_on("met") - depends_on("metplus") + depends_on("met@9.1.3", when="%gcc") + depends_on("met@9.1.3", when="%intel") + depends_on("metplus@3.1.1", when="%gcc") + depends_on("metplus@3.1.1", when="%intel") depends_on("gsi-ncdiag") depends_on("crtm@2.4.0.1") depends_on("py-wxflow", when="+python")