From aff45ec351676594acb8801f3e236ce61ed86a34 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 1 Jul 2026 12:42:58 -0700 Subject: [PATCH 1/2] ufs-weather-model-env: remove base-env dependency/explicitly list deps; make nccmp, cprnc optional --- .../packages/ufs_weather_model_env/package.py | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py index f00d05cf1..2e455910e 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py @@ -22,25 +22,34 @@ class UfsWeatherModelEnv(BundlePackage): default=False, description="Build a debug version of certain dependencies (ESMF, MAPL)", ) - variant("python", default=True, description="Build Python dependencies") + variant("python", default=True, description="Include extra Python packages") + variant("ncutils", default=True, description="Include extra NetCDF utilities (cprnc and nccmp)") - depends_on("base-env", type="run") - depends_on("ufs-pyenv", type="run", when="+python") + depends_on("cmake", type="run") + depends_on("python", type="run") - depends_on("fms +gfs_phys constants=GFS", type="run") depends_on("bacio", type="run") depends_on("crtm", type="run") + depends_on("fms +gfs_phys constants=GFS", type="run") depends_on("g2", type="run") depends_on("g2tmpl", type="run") + depends_on("hdf5", type="run") depends_on("ip", type="run") + depends_on("netcdf-c", type="run") + depends_on("netcdf-fortran", type="run") + depends_on("parallelio", type="run") + depends_on("scotch", type="run") depends_on("sp", type="run", when="^ip@:4") depends_on("w3emc", type="run") - depends_on("scotch", type="run") - depends_on("cprnc", type="run") + depends_on("zlib-api", type="run") depends_on("esmf~debug", type="run", when="~debug") depends_on("esmf+debug", type="run", when="+debug") depends_on("mapl~debug", type="run", when="~debug") depends_on("mapl+debug", type="run", when="+debug") + depends_on("ufs-pyenv", type="run", when="+python") + depends_on("cprnc", type="run", when="+ncutils") + depends_on("nccmp", type="run", when="+ncutils") + # There is no need for install() since there is no code. From 2118ec874558bbbde5dd135178421a8d34d31f49 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 1 Jul 2026 12:47:40 -0700 Subject: [PATCH 2/2] reconcile deps with ufs_common.lua --- .../packages/ufs_weather_model_env/package.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py index 2e455910e..2a3c079db 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/ufs_weather_model_env/package.py @@ -8,7 +8,7 @@ class UfsWeatherModelEnv(BundlePackage): - """Development environment for ufs-weathermodel-bundle""" + """Development environment for ufs-weather-model""" homepage = "https://github.com/ufs-community/ufs-weather-model" git = "https://github.com/ufs-community/ufs-weather-model.git" @@ -30,11 +30,18 @@ class UfsWeatherModelEnv(BundlePackage): depends_on("bacio", type="run") depends_on("crtm", type="run") + depends_on("esmf~debug", type="run", when="~debug") + depends_on("esmf+debug", type="run", when="+debug") depends_on("fms +gfs_phys constants=GFS", type="run") depends_on("g2", type="run") depends_on("g2tmpl", type="run") + depends_on("gftl-shared", type="run") depends_on("hdf5", type="run") depends_on("ip", type="run") + depends_on("jasper", type="run") + depends_on("libpng", type="run") + depends_on("mapl~debug", type="run", when="~debug") + depends_on("mapl+debug", type="run", when="+debug") depends_on("netcdf-c", type="run") depends_on("netcdf-fortran", type="run") depends_on("parallelio", type="run") @@ -43,11 +50,6 @@ class UfsWeatherModelEnv(BundlePackage): depends_on("w3emc", type="run") depends_on("zlib-api", type="run") - depends_on("esmf~debug", type="run", when="~debug") - depends_on("esmf+debug", type="run", when="+debug") - depends_on("mapl~debug", type="run", when="~debug") - depends_on("mapl+debug", type="run", when="+debug") - depends_on("ufs-pyenv", type="run", when="+python") depends_on("cprnc", type="run", when="+ncutils") depends_on("nccmp", type="run", when="+ncutils")