Specify MOM5 type variant in ACCESS-ESM1.5 SBD

ACCESS-NRI · Aug 20, 2024 · 8c92408 · 8c92408
1 parent 3f45685
commit 8c92408
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/packages/access-esm1p5/package.py b/packages/access-esm1p5/package.py
@@ -30,7 +30,7 @@ class AccessEsm1p5(BundlePackage):
     version("latest")
 
     depends_on("[email protected]", type="run")
-    depends_on("[email protected]", type="run")
+    depends_on("[email protected] type=ACCESS-CM", type="run")
     # um7 is in a private repository
     depends_on("[email protected]", type="run")
 

diff --git 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.")