Merge branch 'main' into update_om2

Author: rbeucher

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
-      - uses: prefix-dev/[email protected].2
+      - uses: prefix-dev/[email protected].3
         with:
           pixi-version: v0.39.5
       - name: Run pre-commit
@@ -37,7 +37,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Setup pixi
-        uses: prefix-dev/[email protected].2
+        uses: prefix-dev/[email protected].3
         with:
           pixi-version: v0.39.5
 

.github/workflows/full-tests.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v5.0.0
 
       - name: Setup pixi
-        uses: prefix-dev/setup-pixi@59d669bca01299140a23e5e8a9f713ad36f1f069 # v0.9.0
+        uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.0
         with:
           pixi-version: v0.39.5
 
@@ -60,7 +60,7 @@ jobs:
 
       - name: Upload coverage artifacts
         if: github.event.inputs.test_type == 'all'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: coverage-report
           path: htmlcov/

src/access_moppy/driver.py

@@ -27,6 +27,7 @@ def __init__(
         output_path: Optional[Union[str, Path]] = ".",
         drs_root: Optional[Union[str, Path]] = None,
         parent_info: Optional[Dict[str, Dict[str, Any]]] = None,
+        model_id: Optional[str] = None,
     ):
         """
         Initializes the CMORiser with necessary parameters.
@@ -40,6 +41,7 @@ def __init__(
         :param output_path: Path to write the CMORised output.
         :param drs_root: Optional root path for DRS structure.
         :param parent_info: Optional dictionary with parent experiment metadata.
+        :param model_id: Optional model identifier for model-specific mappings (e.g., 'ACCESS-ESM1.6').
         """
 
         self.input_paths = input_paths
@@ -50,7 +52,8 @@ def __init__(
         self.variant_label = variant_label
         self.grid_label = grid_label
         self.activity_id = activity_id
-        self.variable_mapping = load_cmip6_mappings(compound_name)
+        self.model_id = model_id
+        self.variable_mapping = load_model_mappings(compound_name, model_id)
         self.drs_root = Path(drs_root) if isinstance(drs_root, str) else drs_root
         if not parent_info:
             warnings.warn(