From 8c92408cc02a40490c194e8b785d94780f103bbb Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Tue, 20 Aug 2024 13:39:53 +1000 Subject: [PATCH] Specify MOM5 type variant in ACCESS-ESM1.5 SBD --- packages/access-esm1p5/package.py | 2 +- packages/mom5/package.py | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/access-esm1p5/package.py b/packages/access-esm1p5/package.py index 1184f8b..c3b64fd 100644 --- a/packages/access-esm1p5/package.py +++ b/packages/access-esm1p5/package.py @@ -30,7 +30,7 @@ class AccessEsm1p5(BundlePackage): version("latest") depends_on("cice4@access-esm1.5", type="run") - depends_on("mom5@access-esm1.5", type="run") + depends_on("mom5@access-esm1.5 type=ACCESS-CM", type="run") # um7 is in a private repository depends_on("um7@access-esm1.5", type="run") diff --git a/packages/mom5/package.py b/packages/mom5/package.py index 94d9172..66088af 100644 --- a/packages/mom5/package.py +++ b/packages/mom5/package.py @@ -25,11 +25,7 @@ class Mom5(MakefilePackage): variant("deterministic", default=False, description="Deterministic build.") variant("optimisation_report", default=False, description="Generate optimisation reports.") variant("type", default="ACCESS-OM", - # https://spack.readthedocs.io/en/latest/packaging_guide.html#conditional-possible-values - values=( - "ACCESS-CM", - # Spack does not have a spec syntax for NOT "@access-esm1.5", so use version ranges instead - conditional("ACCESS-ESM", "ACCESS-OM", "ACCESS-OM-BGC", "MOM_solo", when="@:access-esm0,access-esm2:")), + values=("ACCESS-CM", "ACCESS-ESM", "ACCESS-OM", "ACCESS-OM-BGC", "MOM_solo"), multi=False, description="Build MOM5 to support a particular use case.")