Various fixes for CORDEX model data

esmvalcore/_recipe/to_datasets.py

@@ -33,12 +33,13 @@
 
 _ALIAS_INFO_KEYS: tuple[str, ...] = (
     "project",
-    "activity",
-    "driver",
-    "dataset",
     "exp",
-    "sub_experiment",
+    "dataset",
+    "rcm_version",
+    "driver",
     "ensemble",
+    "sub_experiment",
+    "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,43 @@
 """Fixes for rcm HadREM3-GA7-05 driven by CNRM-CERFACS-CNRM-CM5."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import iris
+import iris.cube
+
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix,
 )
+from esmvalcore.cmor.fix import Fix
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+AllVars = BaseFix
+
+
+class Clivi(Fix):
+    """Fixes for variable clivi."""
+
+    def fix_metadata(
+        self,
+        cubes: Sequence[iris.cube.Cube],
+    ) -> Sequence[iris.cube.Cube]:
+        cube = self.get_cube_from_list(iris.cube.CubeList(cubes)).copy()
+        cube.data = cube.core_data() * 0.1
+        return [cube]
+
 
-Tas = BaseFix
+class Sic(Fix):
+    """Fixes for variable sic."""
 
-Pr = BaseFix
+    def fix_metadata(
+        self,
+        cubes: Sequence[iris.cube.Cube],
+    ) -> Sequence[iris.cube.Cube]:
+        cube = self.get_cube_from_list(iris.cube.CubeList(cubes)).copy()
+        cube.units = 1
+        cube.convert_units("%")
+        return [cube]

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

@@ -0,0 +1,38 @@
+"""Fixes for rcm HIRHAM5 driven by CNRM-CERFACS-CNRM-CM5."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import iris
+import iris.cube
+
+from esmvalcore.cmor.fix import Fix
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+
+class Clivi(Fix):
+    """Fixes for variable clivi."""
+
+    def fix_metadata(
+        self,
+        cubes: Sequence[iris.cube.Cube],
+    ) -> Sequence[iris.cube.Cube]:
+        cube = self.get_cube_from_list(iris.cube.CubeList(cubes)).copy()
+        cube.units = "g m-2"
+        cube.convert_units("kg m-2")
+        return [cube]
+
+
+class Prw(Fix):
+    """Fixes for variable prw."""
+
+    def fix_metadata(
+        self,
+        cubes: Sequence[iris.cube.Cube],
+    ) -> Sequence[iris.cube.Cube]:
+        cube = self.get_cube_from_list(iris.cube.CubeList(cubes)).copy()
+        cube.data = cube.core_data() / 200.0
+        return [cube]

esmvalcore/cmor/_fixes/cordex/cordex_fixes.py

@@ -72,6 +72,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

@@ -1,9 +1,14 @@
 """Fixes for rcm HadREM3-GA7-05 driven by ICHEC-EC-EARTH."""
 
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hadrem3_ga7_05 import (
+    Clivi as BaseClivi,
+)
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
+AllVars = BaseFix
+
 
-Pr = BaseFix
+class Clivi(BaseClivi):
+    """Fixes for variable clivi."""

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

@@ -0,0 +1,9 @@
+"""Fixes for rcm HIRHAM5 driven by ICHEC-EC-EARTH."""
+
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hirham5 import (
+    Clivi as BaseClivi,
+)
+
+
+class Clivi(BaseClivi):
+    """Fixes for variable clivi."""

esmvalcore/cmor/_fixes/cordex/ipsl_ipsl_cm5a_mr/hirham5.py

@@ -0,0 +1,9 @@
+"""Fixes for rcm HIRHAM5 driven by IPSL-IPSL-CM5A-MR."""
+
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hirham5 import (
+    Clivi as BaseClivi,
+)
+
+
+class Clivi(BaseClivi):
+    """Fixes for variable clivi."""

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

@@ -1,7 +1,44 @@
 """Fixes for rcm CCLM4-8-17 driven by MOHC-HadGEM2-ES."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import iris
+import iris.cube
+
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     CLMcomCCLM4817 as BaseFix,
 )
+from esmvalcore.cmor.fix import Fix
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 AllVars = BaseFix
+
+
+class Clivi(Fix):
+    """Fixes for variable clivi."""
+
+    def fix_metadata(
+        self,
+        cubes: Sequence[iris.cube.Cube],
+    ) -> Sequence[iris.cube.Cube]:
+        cube = self.get_cube_from_list(iris.cube.CubeList(cubes)).copy()
+        cube.units = "Mg m-2"
+        cube.convert_units("kg m-2")
+        return [cube]
+
+
+class Prw(Fix):
+    """Fixes for variable prw."""
+
+    def fix_metadata(
+        self,
+        cubes: Sequence[iris.cube.Cube],
+    ) -> Sequence[iris.cube.Cube]:
+        cube = self.get_cube_from_list(iris.cube.CubeList(cubes)).copy()
+        cube.units = "Mg m-2"
+        cube.convert_units("kg m-2")
+        return [cube]

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

@@ -1,9 +1,14 @@
 """Fixes for rcm HadREM3-GA7-05 driven by MOHC-HadGEM2-ES."""
 
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hadrem3_ga7_05 import (
+    Sic as BaseSic,
+)
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
+AllVars = BaseFix
+
 
-Pr = BaseFix
+class Sic(BaseSic):
+    """Fixes for variable sic."""

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

@@ -1,5 +1,8 @@
-"""Fixes for rcm HIRHAM driven by MOHC-HadGEM2."""
+"""Fixes for rcm HIRHAM5 driven by MOHC-HadGEM2."""
 
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hirham5 import (
+    Clivi as BaseClivi,
+)
 from esmvalcore.cmor.fix import Fix
 
 
@@ -24,3 +27,7 @@ def fix_metadata(self, cubes):
             cube.coord("longitude").attributes = {}
 
         return cubes
+
+
+class Clivi(BaseClivi):
+    """Fixes for variable clivi."""

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

@@ -1,9 +1,21 @@
 """Fixes for rcm HadREM3-GA7-05 driven by MPI-M-MPI-ESM-LR."""
 
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hadrem3_ga7_05 import (
+    Clivi as BaseClivi,
+)
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hadrem3_ga7_05 import (
+    Sic as BaseSic,
+)
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
+AllVars = BaseFix
+
+
+class Clivi(BaseClivi):
+    """Fixes for variable clivi."""
+
 
-Pr = BaseFix
+class Sic(BaseSic):
+    """Fixes for variable sic."""

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

@@ -0,0 +1,9 @@
+"""Fixes for rcm HIRHAM5 driven by ICHEC-EC-EARTH."""
+
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hirham5 import (
+    Clivi as BaseClivi,
+)
+
+
+class Clivi(BaseClivi):
+    """Fixes for variable clivi."""

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

@@ -0,0 +1,41 @@
+"""Fixes for rcm WRF381P driven by MPI-M-MPI-ESM-LR."""
+
+from esmvalcore.cmor.fix import Fix
+from esmvalcore.preprocessor._regrid import _cordex_stock_cube
+
+
+class AllVars(Fix):
+    """Fixes for all vars."""
+
+    def fix_metadata(self, cubes):
+        cube = self.get_cube_from_list(cubes).copy()
+        if cube.coords("projection_x_coordinate"):
+            # WRF381P datasets with the MPI-M-MPI-ESM-LR driver have bad
+            # projection coordinates containing all zeros, but the latitude
+            # and longitude points match those of the standard grid. Therefore
+            # we replace the bad coordinates with the standard rotated pole
+            # coordinates.
+            # https://github.com/ESMValGroup/ESMValCore/issues/3145
+            standard_grid = _cordex_stock_cube(self.extra_facets["domain"])
+            x_dim = cube.coord_dims("projection_x_coordinate")
+            y_dim = cube.coord_dims("projection_y_coordinate")
+
+            # Remove the bad coordinates.
+            cube.remove_coord("projection_x_coordinate")
+            cube.remove_coord("projection_y_coordinate")
+            cube.remove_coord("longitude")
+            cube.remove_coord("latitude")
+
+            # Add the standard rotated pole coordinates.
+            cube.add_dim_coord(
+                standard_grid.coord("grid_longitude"),
+                x_dim,
+            )
+            cube.add_dim_coord(
+                standard_grid.coord("grid_latitude"),
+                y_dim,
+            )
+            cube.add_aux_coord(standard_grid.coord("longitude"), y_dim + x_dim)
+            cube.add_aux_coord(standard_grid.coord("latitude"), y_dim + x_dim)
+
+        return [cube]

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

@@ -1,9 +1,21 @@
 """Fixes for rcm HadREM3-GA7-05 driven by NCC-NorESM1-M."""
 
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hadrem3_ga7_05 import (
+    Clivi as BaseClivi,
+)
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hadrem3_ga7_05 import (
+    Sic as BaseSic,
+)
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix,
 )
 
-Tas = BaseFix
+AllVars = BaseFix
+
+
+class Clivi(BaseClivi):
+    """Fixes for variable clivi."""
+
 
-Pr = BaseFix
+class Sic(BaseSic):
+    """Fixes for variable sic."""

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

@@ -0,0 +1,9 @@
+"""Fixes for rcm HIRHAM5 driven by ICHEC-EC-EARTH."""
+
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.hirham5 import (
+    Clivi as BaseClivi,
+)
+
+
+class Clivi(BaseClivi):
+    """Fixes for variable clivi."""