From af643cc853d6891b44c8707bdb4d6a01551da4a9 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 5 Aug 2024 12:03:07 -0600 Subject: [PATCH 01/14] Bump Python to 3.11.7 --- configs/common/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index b26f9a038..164d1fb0b 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -184,7 +184,7 @@ proj: require: '~tiff' python: - require: '@3.10.13' + require: '@3.11.7' py-attrs: # https://github.com/JCSDA/spack-stack/issues/740 require: '@21.4.0' From a12300cf288952fdaaa707a08fa3453b844bfb8f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 5 Aug 2024 13:01:50 -0600 Subject: [PATCH 02/14] Update .gitmodules and submodule pointer for spack for code review and testing --- .gitmodules | 6 ++++-- spack | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a69f3e4f1..b3b180b16 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + #url = https://github.com/jcsda/spack + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack + branch = feature/cherry_pick_globus_updates_from_spack_develop [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index e77862a08..c259af1cc 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e77862a0839789e9ee5bb501aba3884b6b0e4119 +Subproject commit c259af1cca85d5a6d6881f2a21a256920f78fd86 From 89fa6eabd6d40a8c03c3a1bc29c067aa2b31bd21 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 5 Aug 2024 15:30:18 -0600 Subject: [PATCH 03/14] Bump Python in Github actions to 3.11.7 --- .github/workflows/macos-ci-aarch64.yaml | 2 +- .github/workflows/ubuntu-ci-x86_64-gnu.yaml | 2 +- .github/workflows/ubuntu-ci-x86_64-intel.yaml | 2 +- .github/workflows/ubuntu-ci-x86_64-oneapi.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos-ci-aarch64.yaml b/.github/workflows/macos-ci-aarch64.yaml index 514b01d0d..f1b3bc864 100644 --- a/.github/workflows/macos-ci-aarch64.yaml +++ b/.github/workflows/macos-ci-aarch64.yaml @@ -168,7 +168,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-apple-clang/14.0.3 module load stack-openmpi/5.0.3 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml index 8a60dc15c..15ecfef74 100644 --- a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml @@ -199,7 +199,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-gcc/11.4.0 module load stack-openmpi/5.0.3 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-intel.yaml b/.github/workflows/ubuntu-ci-x86_64-intel.yaml index a4a299b2b..56ee63fe1 100644 --- a/.github/workflows/ubuntu-ci-x86_64-intel.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-intel.yaml @@ -224,7 +224,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-intel/2021.10.0 module load stack-intel-oneapi-mpi/2021.10.0 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml index 585bcc773..c490ec6a5 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml @@ -244,7 +244,7 @@ jobs: module use ${ENVDIR}/install/modulefiles/Core module load stack-oneapi/2024.2.0 module load stack-intel-oneapi-mpi/2021.13 - module load stack-python/3.10.13 + module load stack-python/3.11.7 module available module load jedi-ufs-env From ee7ca359bdb4d9e3327605af260e415be5088a7c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 6 Aug 2024 16:08:02 -0600 Subject: [PATCH 04/14] Revert .gitmodules and update submodule pointer for spack --- .gitmodules | 6 ++---- spack | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3b180b16..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/jcsda/spack - #branch = spack-stack-dev - url = https://github.com/climbfuji/spack - branch = feature/cherry_pick_globus_updates_from_spack_develop + url = https://github.com/jcsda/spack + branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/spack b/spack index c259af1cc..fffff276c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit c259af1cca85d5a6d6881f2a21a256920f78fd86 +Subproject commit fffff276c9c7eff3646053d0d2eb8d75b37b834a From 559fca50c7c786d1cc621a61591d4cbbf3662c66 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 9 Aug 2024 16:10:37 -0600 Subject: [PATCH 05/14] Update submodule pointer for spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index e28d8ef9a..e422f4293 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e28d8ef9a3dc4e36de12b26d227dcb7523371af9 +Subproject commit e422f42938148d69e310c85a4c15b4795c9c000b From 85fe5d400dab2abfb3bee214d1963449b4eaca6f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 15 Aug 2024 17:52:32 -0600 Subject: [PATCH 06/14] Add 'py-dask +delayed' to gmao-swell-env and add comments in that package and in py-xnrl about the +delayed variant --- .../spack-stack/packages/gmao-swell-env/package.py | 11 +++++++---- .../repos/spack-stack/packages/py-xnrl/package.py | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py b/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py index 28b73d67f..092fe668e 100644 --- a/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py +++ b/spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py @@ -45,10 +45,13 @@ class GmaoSwellEnv(BundlePackage): depends_on("py-urllib3", type="run") depends_on("py-wheel", type="run") depends_on("py-setuptools", type="run") - - # Different versions than other bundles - depends_on("py-pycodestyle@2.10:", type="run") - depends_on("py-pyyaml@6:", type="run") + depends_on("py-pycodestyle", type="run") + depends_on("py-pyyaml", type="run") + # Note that the +delayed option is for compatibility + # with the py-xnrl package (this restricts py-dask + # to certain versions, since the newest versions + # don't have that option anymore. + depends_on("py-dask +delayed", type="run") # Future dependencies needed # depends_on("py-bokeh", type="run") diff --git a/spack-ext/repos/spack-stack/packages/py-xnrl/package.py b/spack-ext/repos/spack-stack/packages/py-xnrl/package.py index 8f620efea..add77b186 100644 --- a/spack-ext/repos/spack-stack/packages/py-xnrl/package.py +++ b/spack-ext/repos/spack-stack/packages/py-xnrl/package.py @@ -27,6 +27,8 @@ class PyXnrl(PythonPackage): depends_on("py-poetry", type="build") depends_on("py-metpy", type=("build", "run")) + # Note: if the +delayed option is removed, also + # need to remove it from gmao-swell-env. depends_on("py-dask +delayed", type=("build", "run")) depends_on("py-h5netcdf", type=("build", "run")) depends_on("py-netcdf4", type=("build", "run")) From 8a47c7e934a8468080c544980b9e684c675a54be Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Mon, 19 Aug 2024 15:12:23 +0000 Subject: [PATCH 07/14] Add MET/METplus v9.1.3/v3.1.1 to the unified-env requirements matrix --- configs/common/packages.yaml | 7 +++++-- configs/templates/ufs-srw-dev/spack.yaml | 2 +- .../spack-stack/packages/global-workflow-env/package.py | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 334f188c4..a413e84dd 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -132,9 +132,12 @@ packages: variants: '+pflogger' # If making changes here, also check the Discover site configs and the CI workflows met: - require: '@11.1.1 +python +grib2' + require: + - any_of: ['@=11.1.1', '@=9.1.3'] + - '+python +grib2' metplus: - require: '@5.1.0' + require: + - any_of: ['@=5.1.0', '@=3.1.1'] metis: require: '+int64 +real64' mpich: diff --git a/configs/templates/ufs-srw-dev/spack.yaml b/configs/templates/ufs-srw-dev/spack.yaml index d2d5b4aaa..55a1db94e 100644 --- a/configs/templates/ufs-srw-dev/spack.yaml +++ b/configs/templates/ufs-srw-dev/spack.yaml @@ -54,5 +54,5 @@ spack: - wrf-io@1.2.0 - ncio@1.1.2 - gsi-ncdiag@1.1.2 - - met@11.1.0 + - met@11.1.1 - metplus@5.1.0 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..5b26deeab 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,8 @@ 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") + depends_on("metplus@3.1.1") depends_on("gsi-ncdiag") depends_on("crtm@2.4.0.1") depends_on("py-wxflow", when="+python") From 8673c478b0f57dfec2b66f709ed0b5722bb63df0 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Mon, 19 Aug 2024 15:12:23 +0000 Subject: [PATCH 08/14] Add MET/METplus v9.1.3/v3.1.1 to the unified-env requirements matrix Refs #1251 --- configs/common/packages.yaml | 7 +++++-- configs/templates/ufs-srw-dev/spack.yaml | 2 +- .../spack-stack/packages/global-workflow-env/package.py | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 334f188c4..a413e84dd 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -132,9 +132,12 @@ packages: variants: '+pflogger' # If making changes here, also check the Discover site configs and the CI workflows met: - require: '@11.1.1 +python +grib2' + require: + - any_of: ['@=11.1.1', '@=9.1.3'] + - '+python +grib2' metplus: - require: '@5.1.0' + require: + - any_of: ['@=5.1.0', '@=3.1.1'] metis: require: '+int64 +real64' mpich: diff --git a/configs/templates/ufs-srw-dev/spack.yaml b/configs/templates/ufs-srw-dev/spack.yaml index d2d5b4aaa..55a1db94e 100644 --- a/configs/templates/ufs-srw-dev/spack.yaml +++ b/configs/templates/ufs-srw-dev/spack.yaml @@ -54,5 +54,5 @@ spack: - wrf-io@1.2.0 - ncio@1.1.2 - gsi-ncdiag@1.1.2 - - met@11.1.0 + - met@11.1.1 - metplus@5.1.0 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..5b26deeab 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,8 @@ 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") + depends_on("metplus@3.1.1") depends_on("gsi-ncdiag") depends_on("crtm@2.4.0.1") depends_on("py-wxflow", when="+python") From a39d81e88e7b757e9d086f51689ce955dbd4812e Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Mon, 19 Aug 2024 19:58:16 +0000 Subject: [PATCH 09/14] Update to Python 3.11.7 in the gsi-addon and pull upstream python packages --- configs/common/packages.yaml | 4 +++- configs/templates/gsi-addon-dev/spack.yaml | 9 +-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index a413e84dd..cf36fd812 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -19,7 +19,9 @@ packages: boost: require: '@1.84 ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams ~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex +serialization ~signals +system +test +thread +timer ~wave cxxstd=17 visibility=hidden' bufr: - require: '@12.0.1 +python' + require: + - '+python' + - any_of: ['@=12.0.1', '@=11.7.0'] cairo: require: '+pic' cdo: diff --git a/configs/templates/gsi-addon-dev/spack.yaml b/configs/templates/gsi-addon-dev/spack.yaml index 0a8aedf6d..08e5fb2bc 100644 --- a/configs/templates/gsi-addon-dev/spack.yaml +++ b/configs/templates/gsi-addon-dev/spack.yaml @@ -12,8 +12,7 @@ spack: - site - common definitions: - # Note: Set 'compilers' manually; must match upstream list - - compilers: [] + - compilers: ['%aocc', '%apple-clang', '%gcc', '%intel', '%oneapi'] - packages: - global-workflow-env ^bufr@11.7.0 ^metplus@3.1.1 ^met@9.1.3 - ufs-weather-model-env @@ -23,9 +22,3 @@ spack: - matrix: - [$packages] - [$compilers] - - packages: - python:: - require: ['@3.11.6'] - py-numpy:: - require: ['@1.23.4'] From ebb4d2f197f9c65ffa6dbeb24a51cf56afd4ff3a Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Mon, 19 Aug 2024 20:01:39 +0000 Subject: [PATCH 10/14] Revert mandatory met/metplus versions in the global-workflow env --- .../repos/spack-stack/packages/global-workflow-env/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5b26deeab..c80be09a0 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,8 @@ class GlobalWorkflowEnv(BundlePackage): depends_on("wgrib2", when="%apple-clang") depends_on("wgrib2", when="%gcc") depends_on("wgrib2", when="%intel") - depends_on("met@9.1.3") - depends_on("metplus@3.1.1") + depends_on("met") + depends_on("metplus") depends_on("gsi-ncdiag") depends_on("crtm@2.4.0.1") depends_on("py-wxflow", when="+python") From 31c876d648482768a9e76d84cd913e22891dfe74 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Mon, 19 Aug 2024 21:27:49 +0000 Subject: [PATCH 11/14] Add Python library dependencies to verif-global --- .../spack-stack/packages/emc-verif-global-env/package.py | 5 +++++ 1 file changed, 5 insertions(+) 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 e06c15e82..bdfba80d7 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 @@ -22,6 +22,11 @@ class EmcVerifGlobalEnv(BundlePackage): depends_on("nco") depends_on("prod-util") depends_on("grib-util") + depends_on("py-cartopy") + depends_on("py-numpy") + depends_on("py-netcdf4") + depends_on("py-matplotlib") + depends_on("py-pandas") # Test grads # depends_on('grads') # Currently, wgrib2 doesn't build with oneapi, From 5b92456fade215b2b84c900010a3d0b483c7e80b Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Tue, 20 Aug 2024 12:14:22 +0000 Subject: [PATCH 12/14] De-specify met/metplus versions for the global-workflow --- .../repos/spack-stack/packages/global-workflow-env/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5b26deeab..c80be09a0 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,8 @@ class GlobalWorkflowEnv(BundlePackage): depends_on("wgrib2", when="%apple-clang") depends_on("wgrib2", when="%gcc") depends_on("wgrib2", when="%intel") - depends_on("met@9.1.3") - depends_on("metplus@3.1.1") + depends_on("met") + depends_on("metplus") depends_on("gsi-ncdiag") depends_on("crtm@2.4.0.1") depends_on("py-wxflow", when="+python") From fa34fb60ef581ed6b6c7837db16e481d53dddff5 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Tue, 20 Aug 2024 19:28:06 +0000 Subject: [PATCH 13/14] Add emc-verif-global-env to gsi-addon-dev --- configs/templates/gsi-addon-dev/spack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/templates/gsi-addon-dev/spack.yaml b/configs/templates/gsi-addon-dev/spack.yaml index 08e5fb2bc..f4b1f9384 100644 --- a/configs/templates/gsi-addon-dev/spack.yaml +++ b/configs/templates/gsi-addon-dev/spack.yaml @@ -16,6 +16,7 @@ spack: - packages: - global-workflow-env ^bufr@11.7.0 ^metplus@3.1.1 ^met@9.1.3 - ufs-weather-model-env + - emc-verif-global-env - gsi-env specs: From 3a4144c51e40ade23b4df9c73e1a69e5e68540e2 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Wed, 21 Aug 2024 12:43:06 +0000 Subject: [PATCH 14/14] Upgrade BUFR to 12.1.0 --- configs/common/packages.yaml | 2 +- configs/containers/specs/jedi-ci.yaml | 2 +- configs/templates/ufs-srw-dev/spack.yaml | 2 +- configs/templates/unified-dev/spack.yaml | 2 +- spack | 2 +- .../spack-stack/packages/emc-verif-global-env/package.py | 6 ++++-- .../spack-stack/packages/global-workflow-env/package.py | 6 ++++-- 7 files changed, 13 insertions(+), 9 deletions(-) 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")