SBR: Remove variant type and generic-tracers from mom5 specs

Author: dougiesquire

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=ACCESS-CM", type="run")
+    depends_on("[email protected]", type="run")
     # um7 is in a private repository
     depends_on("[email protected]", type="run")
 

packages/access-esm1p6/package.py

@@ -37,11 +37,6 @@ class AccessEsm1p6(BundlePackage):
         values=("4", "5"),
         multi=False,
     )
-    variant(
-        "generic-tracers",
-        default=True,
-        description="Enable generic tracers.",
-    )
     variant(
         "um",
         default="access-esm1.6",
@@ -52,18 +47,7 @@ class AccessEsm1p6(BundlePackage):
 
     depends_on("[email protected]", type="run", when="cice=4")
     depends_on("[email protected]", type="run", when="cice=5")
-    # TODO: Use the access-esm1.6 branch when it has been confirmed that
-    #       MOM5 master supports building with generic tracers disabled.
-    depends_on(
-        "[email protected] type=ACCESS-CM",
-        type="run",
-        when="~generic-tracers",
-    )
-    depends_on(
-        "[email protected] type=ACCESS-ESM",
-        type="run",
-        when="+generic-tracers",
-    )
+    depends_on("[email protected]", type="run")
     # um7 is in a private repository
     depends_on("[email protected]", type="run", when="um=access-esm1.5")
     depends_on("[email protected]", type="run", when="um=access-esm1.6")

packages/access-om2-bgc/package.py

@@ -24,15 +24,7 @@ class AccessOm2Bgc(BundlePackage):
     depends_on("libaccessom2~deterministic", when="~deterministic", type="run")
     depends_on("cice5+deterministic", when="+deterministic", type="run")
     depends_on("cice5~deterministic", when="~deterministic", type="run")
-    depends_on(
-        "mom5+deterministic type=ACCESS-OM-BGC",
-        when="+deterministic",
-        type="run"
-    )
-    depends_on(
-        "mom5~deterministic type=ACCESS-OM-BGC",
-        when="~deterministic",
-        type="run"
-    )
+    depends_on("mom5+deterministic", when="+deterministic", type="run")
+    depends_on("mom5~deterministic", when="~deterministic", type="run")
 
     # There is no need for install() since there is no code.