Various fixes for CORDEX model data

esmvalcore/_recipe/to_datasets.py

@@ -33,12 +33,16 @@
 
 _ALIAS_INFO_KEYS: tuple[str, ...] = (
     "project",
-    "activity",
-    "driver",
     "dataset",
+    "rcm_version",
+    "driver",
+    "ensemble",
     "exp",
     "sub_experiment",
-    "ensemble",
+    "frequency",
+    "domain",
+    "region",
+    "grid",
     "version",
 )
 """List of keys to be used to compose the alias, ordered by priority."""

esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/cosmo_crclim_v1_1.py

@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from esmvalcore.cmor.fix import Fix
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+    from iris.cube import Cube
+
+
+class Snw(Fix):
+    """Fixes for snw."""
+
+    def fix_metadata(self, cubes: Sequence[Cube]) -> Sequence[Cube]:
+        cube = self.get_cube_from_list(cubes)
+        cube = cube.copy()
+        cube.remove_coord("height")
+        return [cube]

esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/hadrem3_ga7_05.py

@@ -1,9 +1,9 @@
 """Fixes for rcm HadREM3-GA7-05 driven by CNRM-CERFACS-CNRM-CM5."""
 
+from __future__ import annotations
+
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
-
-Pr = BaseFix
+AllVars = BaseFix

esmvalcore/cmor/_fixes/cordex/cordex_fixes.py

@@ -71,6 +71,9 @@ def fix_metadata(self, cubes):
         iris.cube.CubeList
         """
         for cube in cubes:
+            if self.vardef.standard_name:
+                cube.standard_name = self.vardef.standard_name
+            cube.long_name = self.vardef.long_name
             cube.coord("latitude").var_name = "lat"
             cube.coord("longitude").var_name = "lon"
             for coord in cube.coords("time"):

esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/cosmo_crclim_v1_1.py

@@ -0,0 +1,7 @@
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.cosmo_crclim_v1_1 import (
+    Snw as BaseSnw,
+)
+
+
+class Snw(BaseSnw):
+    """Fixes for snw."""

esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/hadrem3_ga7_05.py

@@ -4,6 +4,4 @@
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
-
-Pr = BaseFix
+AllVars = BaseFix

esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/cosmo_crclim_v1_1.py

@@ -0,0 +1,7 @@
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.cosmo_crclim_v1_1 import (
+    Snw as BaseSnw,
+)
+
+
+class Snw(BaseSnw):
+    """Fixes for snw."""

esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/hadrem3_ga7_05.py

@@ -4,6 +4,4 @@
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
-
-Pr = BaseFix
+AllVars = BaseFix

esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/cosmo_crclim_v1_1.py

@@ -0,0 +1,7 @@
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.cosmo_crclim_v1_1 import (
+    Snw as BaseSnw,
+)
+
+
+class Snw(BaseSnw):
+    """Fixes for snw."""

esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/hadrem3_ga7_05.py

@@ -4,6 +4,4 @@
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
-
-Pr = BaseFix
+AllVars = BaseFix

esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/cosmo_crclim_v1_1.py

@@ -0,0 +1,7 @@
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.cosmo_crclim_v1_1 import (
+    Snw as BaseSnw,
+)
+
+
+class Snw(BaseSnw):
+    """Fixes for snw."""

esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/hadrem3_ga7_05.py

@@ -4,6 +4,4 @@
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
-
-Pr = BaseFix
+AllVars = BaseFix

esmvalcore/config/configurations/defaults/extra_facets_cordex.yml

@@ -11,7 +11,19 @@ projects:
         '*':
           '*':
             use_standard_grid: true
+      COSMO-crCLIM-v1-1:
+        '*':
+          '*':
+            use_standard_grid: true  # lat/lon coords missing bounds
       HIRHAM5:
         '*':
           '*':
             use_standard_grid: true
+      RACMO22E:
+        '*':
+          '*':
+            use_standard_grid: true  # lat/lon coords missing bounds
+      RCA4:
+        '*':
+          '*':
+            use_standard_grid: true  # lat/lon coords missing bounds