#723: resolve merge conflicts

Author: mo-laurenboon

cdds/cdds/common/constants.py

@@ -9,6 +9,7 @@
 # Note that orography (m01s00i033) must not go in this list
 ANCIL_VARIABLES = [
     # soil moisture content
+    # root depth
     'm01s00i009',
     'm01s00i216',
     # land frac

cdds/cdds/common/plugins/cmip6_plus/cmip6_plus_models.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2023-2025, Met Office.
+# (C) British Crown Copyright 2023-2026, Met Office.
 # Please see LICENSE.md for license details.
 """The :mod:`cmip6_plus_models` module contains the code required to
 handle model parameters information for CMIP6Plus models.
@@ -21,11 +21,13 @@ def get_json_file(self) -> str:
         Returns
         -------
         str
-            Json file name for the model with current ID
+            JSON file name for the model with current ID
         """
         return '{}.json'.format(self.value)
 
     HadGEM3_GC31_LL = 'HadGEM3-GC31-LL'
+    HadGEM3_GC31_MM = 'HadGEM3-GC31-MM'
+    UKESM1_0_LL = 'UKESM1-0-LL'
 
 
 class HadGEM3_GC31_LL_Params(BaseModelParameters):
@@ -68,6 +70,90 @@ def um_version(self) -> str:
         return '10.7'
 
 
+class HadGEM3_GC31_MM_Params(BaseModelParameters):
+    """
+    Class to store the parameters for the HadGEM3_GC31_MM model.
+    """
+
+    def __init__(self) -> None:
+        super(HadGEM3_GC31_MM_Params, self).__init__(Cmip6PlusModelId.HadGEM3_GC31_MM)
+
+    @property
+    def model_version(self) -> str:
+        """Returns the model version of the HadGEM3_GC31_MM model.
+
+        Returns
+        -------
+        str
+            Model version of HadGEM3_GC31_MM
+        """
+        return '3.1'
+
+    @property
+    def data_request_version(self) -> str:
+        """Returns the data request version of the HadGEM3_GC31_MM model.
+
+        Returns
+        -------
+        str
+            Data request version of HadGEM3_GC31_MM
+        """
+        return '01.00.10'
+
+    @property
+    def um_version(self) -> str:
+        """Returns the UM version of the HadGEM3_GC31_MM model.
+
+        Returns
+        -------
+        str
+            UM version of HadGEM3_GC31_MM
+        """
+        return '10.7'
+
+
+class UKESM1_0_LL_Params(BaseModelParameters):
+    """
+    Class to store the parameters for the UKESM1_0_LL model.
+    """
+
+    def __init__(self) -> None:
+        super(UKESM1_0_LL_Params, self).__init__(Cmip6PlusModelId.UKESM1_0_LL)
+
+    @property
+    def model_version(self) -> str:
+        """Returns the model version of the UKESM1_0_LL model.
+
+        Returns
+        -------
+        str
+            Model version of UKESM1_0_LL
+        """
+        return '1.0'
+
+    @property
+    def data_request_version(self) -> str:
+        """Returns the data request version of the UKESM1_0_LL model.
+
+        Returns
+        -------
+        str
+            Data request version of UKESM1_0_LL
+        """
+        return '01.00.17'
+
+    @property
+    def um_version(self) -> str:
+        """Returns the UM version of the UKESM1_0_LL model.
+
+        Returns
+        -------
+        str
+            UM version of UKESM1_0_LL
+        """
+        return '10.8'
+
+
 class Cmip6PlusModelsStore(BaseModelStore):
     """Singleton class to store for each model the corresponding parameters.
     The parameters are defined in json files. The default parameters are
@@ -79,6 +165,8 @@ class Cmip6PlusModelsStore(BaseModelStore):
     def __init__(self) -> None:
         model_instances: List[BaseModelParameters] = [
             HadGEM3_GC31_LL_Params(),
+            HadGEM3_GC31_MM_Params(),
+            UKESM1_0_LL_Params(),
         ]
         super(Cmip6PlusModelsStore, self).__init__(model_instances)
         self.logger = logging.getLogger(self.__class__.__name__)