cmip6plus support

conda-env/ci.yml

@@ -7,7 +7,7 @@ dependencies:
   # ====================
   - python >=3.11,<3.14
   - setuptools
-  - cmor >=3.7.0
+  - cmor >=3.9.0
   - dask
   - nco >=5.1.4
   - netcdf4

conda-env/dev.yml

@@ -8,7 +8,7 @@ dependencies:
   # ====================
   - python >=3.11,<3.14
   - setuptools
-  - cmor >=3.7.0
+  - cmor >=3.9.0
   - dask
   - nco >=5.1.4
   - netcdf4

e3sm_to_cmip/argparser.py

@@ -121,6 +121,17 @@ def setup_argparser() -> argparse.ArgumentParser:
         default="mon",
     )
 
+    optional_run.add_argument(
+        "-M",
+        "--mip_era",
+        type=str,
+        help=(
+            "The cmip_era (default is 'cmip6'). Accepted "
+            "values are 'cmip6', 'cmip6plus', 'cmip7'."
+        ),
+        default="cmip6",
+    )
+
     # ======================================================================
     # Paths references.
     # ======================================================================

e3sm_to_cmip/cmor_handlers/handler.py

@@ -218,6 +218,8 @@ def cmorize(
         # ----------------------------------------------------------------------
         self._setup_cmor_module(self.name, tables_path, metadata_path, cmor_log_dir)
 
+        print(metadata_path)
+
         # Get parameters for running CMOR operations
         # ----------------------------------------------------------------------
         # Check if the output CMIP variable has a time dimension, which determines
@@ -339,7 +341,10 @@ def _get_var_time_dim(self, table_path: str) -> str | None:
         with open(table_path, "r") as inputstream:
             table_info = json.load(inputstream)
 
-        axis_info = table_info["variable_entry"][self.name]["dimensions"].split(" ")
+        try:
+            axis_info = table_info["variable_entry"][self.name]["dimensions"].split(" ")
+        except AttributeError:
+            axis_info = table_info["variable_entry"][self.name]["dimensions"][:]
 
         for dim in TIME_DIMS:
             if dim in axis_info: