#736 Add and test UKCM2 plugin

cdds/cdds/common/mip_tables.py

@@ -1,12 +1,19 @@
-# (C) British Crown Copyright 2017-2025, Met Office.
+# (C) British Crown Copyright 2017-2026, Met Office.
 # Please see LICENSE.md for license details.
 
 from os import listdir
 from os.path import isfile, join
 import json
 
 # If a file matches one of the following suffixes, then it is ignored when loading MIP tables
-NON_TABLE_FILE_SUFFIXES = ['_CV.json', '_coordinate.json', '_grids.json', '_formula_terms.json']
+NON_TABLE_FILE_SUFFIXES = [
+    '_CV.json',
+    '_coordinate.json',
+    '_grids.json',
+    '_formula_terms.json',
+    '_long_name_overrides.json',  # Added for CMIP7
+    '_cell_measures.json',  # Added for CMIP7
+]
 
 
 class MipTables(object):

cdds/cdds/common/plugins/cmip7/cmip7_grid.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2021-2025, Met Office.
+# (C) British Crown Copyright 2021-2026, Met Office.
 # Please see LICENSE.md for license details.
 """The :mod:`cmip7_grid` module contains the code required
 handle grid information for CMIP7 models.
@@ -37,12 +37,12 @@ def from_name(cls, name: str) -> 'GridLabel':
                 return grid_label
         raise KeyError('Not supported grid labels for {}'.format(name))
 
-    NATIVE = 'native', 'gn', False
-    NATIVE_ZONAL = 'native-zonal', 'gnz', False
-    REGRIDDED = 'regridded', 'gr', False
-    GLOBAL_MEAN = 'global-mean', 'gm', False
-    UGRID = 'ugrid', 'gn', True
-    VGRID = 'vgrid', 'gn', True
-    UVGRID = 'uvgrid', 'gn', True
-    UVGRID_ZONAL = 'uvgrid-zonal', 'gnz', True
-    SITES = 'sites', 'gn', False
+    NATIVE = 'native', 'g100', False
+    NATIVE_ZONAL = 'native-zonal', 'g100z', False
+    REGRIDDED = 'regridded', 'g100', False
+    GLOBAL_MEAN = 'global-mean', 'g100m', False
+    UGRID = 'ugrid', 'g100', True
+    VGRID = 'vgrid', 'g100', True
+    UVGRID = 'uvgrid', 'g100', True
+    UVGRID_ZONAL = 'uvgrid-zonal', 'g100z', True
+    SITES = 'sites', 'g100', False

cdds/cdds/common/plugins/cmip7/cmip7_models.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2021-2025, Met Office.
+# (C) British Crown Copyright 2021-2026, Met Office.
 # Please see LICENSE.md for license details.
 """The :mod:`cmip7_models` module contains the code required to
 handle model parameters information for CMIP7 models.
@@ -27,6 +27,7 @@ def get_json_file(self) -> str:
         return '{}.json'.format(self.value)
 
     UKESM1_3_LL = 'UKESM1-3-LL'
+    UKCM2_0_LL = 'UKCM2-0-LL'
 
 
 class UKESM1_3_LL_Params(BaseModelParameters):
@@ -70,6 +71,47 @@ def um_version(self) -> str:
         return '10.8'
 
 
+class UKCM2_0_LL_Params(BaseModelParameters):
+    """Class to store the parameters for the UKESM1_3_LL model."""
+
+    def __init__(self) -> None:
+        super(UKCM2_0_LL_Params, self).__init__(Cmip7ModelId.UKCM2_0_LL)
+        self._grid_mappings: CMIP7GridMapping = CMIP7GridMapping()
+
+    @property
+    def model_version(self) -> str:
+        """Returns the model version of the UKESM1_3_LL model.
+
+        Returns
+        -------
+        str
+            Model version of UKESM1_3_LL
+        """
+        return '1.0'
+
+    @property
+    def data_request_version(self) -> str:
+        """Returns the data request version of the UKESM1_3_LL model.
+
+        Returns
+        -------
+        str
+            Data request version of UKESM1_3_LL
+        """
+        return '01.00.17'
+
+    @property
+    def um_version(self) -> str:
+        """Returns the UM version of the UKESM1_3_LL model.
+
+        Returns
+        -------
+        str
+            UM version of UKESM1_3_LL
+        """
+        return '10.8'
+
+
 class Cmip7ModelsStore(BaseModelStore):
     """Singleton class to store for each model the corresponding parameters.
     The parameters are defined in json files. The default parameters are
@@ -81,6 +123,7 @@ class Cmip7ModelsStore(BaseModelStore):
     def __init__(self) -> None:
         model_instances: List[BaseModelParameters] = [
             UKESM1_3_LL_Params(),
+            UKCM2_0_LL_Params(),
         ]
         super(Cmip7ModelsStore, self).__init__(model_instances)
         self.logger = logging.getLogger(self.__class__.__name__)

cdds/cdds/common/plugins/cmip7/cmip7_plugin.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2021-2025, Met Office.
+# (C) British Crown Copyright 2021-2026, Met Office.
 # Please see LICENSE.md for license details.
 """The :mod:`cmip7_plugin` module contains the code for the CMIP7 plugin."""
 import os
@@ -18,7 +18,7 @@
     from cdds.common.request.request import Request
 
 
-CMIP7_LICENSE = "CC-BY 4.0"
+CMIP7_LICENSE = "CC-BY-4-0"
 
 
 class Cmip7Plugin(BasePlugin):
@@ -121,4 +121,4 @@ def mip_table_dir(self) -> str:
         str
             Path to the MIP table directory
         """
-        return os.path.join(os.environ['CDDS_ETC'], 'mip_tables', 'CMIP7', '01.00.29')
+        return os.path.join(os.environ['CDDS_ETC'], 'mip_tables', 'CMIP7', 'DR-1.2.2.3-v1.0.2')