Default grid_label to g999 for CMIP7 (#451)

Author: rbeucher

src/access_moppy/driver.py

@@ -112,7 +112,7 @@ def __init__(
         experiment_id: str,
         source_id: str,
         variant_label: str,
-        grid_label: str,
+        grid_label: str | None = None,
         cmip_version: str = "CMIP6",
         activity_id: str | None = None,
         output_path: str | Path | None = ".",
@@ -139,7 +139,8 @@ def __init__(
             experiment_id: CMIP experiment ID, e.g. ``"historical"``.
             source_id: CMIP source ID, e.g. ``"ACCESS-ESM1-5"``.
             variant_label: CMIP variant label, e.g. ``"r1i1p1f1"``.
-            grid_label: CMIP grid label, e.g. ``"gn"``.
+            grid_label: CMIP grid label, e.g. ``"gn"``.  Defaults to
+                ``"g999"`` for CMIP7 and ``"gn"`` for CMIP6/CMIP6Plus.
             cmip_version: Vocabulary family to use: ``"CMIP6"``,
                 ``"CMIP6Plus"``, or ``"CMIP7"``.
             activity_id: Optional CMIP activity ID, e.g. ``"CMIP"``.
@@ -192,6 +193,10 @@ def __init__(
             resource-backed variable is used.
         """
 
+        # Apply version-specific defaults
+        if grid_label is None:
+            grid_label = "g999" if cmip_version == "CMIP7" else "gn"
+
         # Validate CMIP version
         if cmip_version not in ("CMIP6", "CMIP6Plus", "CMIP7"):
             raise ValueError(

tests/integration/test_full_cmorisation.py

@@ -375,7 +375,6 @@ def test_cmorisation_variable(
                     experiment_id=experiment_id,
                     source_id=source_id,
                     variant_label="r1i1p1f1",
-                    grid_label="gn",
                     cmip_version=cmip_version,
                     activity_id="CMIP",
                     parent_info=parent_info,
@@ -690,7 +689,6 @@ def test_quick_integration_sample(self, parent_experiment_config):
                     experiment_id="historical",
                     source_id="ACCESS-ESM1-6",
                     variant_label="r1i1p1f1",
-                    grid_label="gn",
                     activity_id="CMIP",
                     parent_info=parent_experiment_config,
                     output_path=output_dir,