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,31 @@
 """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
+
 
-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/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

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

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,4 +1,4 @@
-"""Fixes for rcm HIRHAM driven by MOHC-HadGEM2."""
+"""Fixes for rcm HIRHAM5 driven by MOHC-HadGEM2."""
 
 from esmvalcore.cmor.fix import Fix
 

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,14 @@
 """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 (
+    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/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,14 @@
 """Fixes for rcm HadREM3-GA7-05 driven by NCC-NorESM1-M."""
 
+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/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

esmvalcore/preprocessor/_multimodel.py

@@ -889,7 +889,15 @@ def ensemble_statistics(
     :func:`esmvalcore.preprocessor.multi_model_statistics` for
     the full description of the core statistics function.
     """
-    ensemble_grouping = ("project", "dataset", "exp", "sub_experiment")
+    ensemble_grouping = (
+        "project",
+        "exp",
+        "dataset",
+        "rcm_version",
+        "driver",
+        "grid",
+        "sub_experiment",
+    )
     return multi_model_statistics(
         products=products,
         span=span,

esmvalcore/preprocessor/_regrid.py

@@ -249,6 +249,9 @@ def _cordex_stock_cube(domain_name: str) -> Cube:
     (cube,) = ncdata.iris_xarray.cubes_from_xarray(domain)
     cube.coord("grid_latitude").guess_bounds()
     cube.coord("grid_longitude").guess_bounds()
+    # Restore the units that iris changed to degrees.
+    cube.coord("latitude").units = domain.lat.attrs["units"]
+    cube.coord("longitude").units = domain.lon.attrs["units"]
 
     return cube
 

tests/integration/cmor/_fixes/cordex/test_cnrm_cerfacs_cnrm_cm5.py

@@ -10,6 +10,7 @@
 from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5 import (
     aladin53,
     aladin63,
+    hadrem3_ga7_05,
     wrf381p,
 )
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import CLMcomCCLM4817
@@ -54,6 +55,28 @@ def test_get_hadrem3ga705_fix(short_name):
     assert isinstance(fix[0], Fix)
 
 
+def test_hadrem3_ga7_05_sic() -> None:
+    fixes = Fix.get_fixes(
+        "CORDEX",
+        "HadREM3-GA7-05",
+        "day",
+        "sic",
+        extra_facets={"driver": "CNRM-CERFACS-CNRM-CM5"},
+    )
+    assert any(isinstance(fix, hadrem3_ga7_05.Sic) for fix in fixes)
+
+    cube = iris.cube.Cube(
+        np.array([0.5], dtype=np.float32),
+        var_name="sic",
+        standard_name="sea_ice_area_fraction",
+        units="%",
+    )
+    fix = next(fix for fix in fixes if isinstance(fix, hadrem3_ga7_05.Sic))
+    result = fix.fix_metadata([cube])
+    assert result[0].units == "%"
+    np.testing.assert_allclose(result[0].data, [50.0])
+
+
 def test_fix_aladin53_sftlf() -> None:
     fixes = Fix.get_fixes(
         "CORDEX",
@@ -193,7 +216,7 @@ def test_wrf381p_height_fix():
         var_name="tas",
         dim_coords_and_dims=[(time_coord, 0)],
     )
-    vardef = get_var_info("CMIP6", "Amon", "tas")
+    vardef = get_var_info("CORDEX", "day", "tas")
     fix = wrf381p.Tas(vardef)
     out_cubes = fix.fix_metadata([cube])
     assert out_cubes[0].coord("height").points == 2.0
@@ -208,3 +231,33 @@ def test_get_cclm4_8_17fix() -> None:
         extra_facets={"driver": "CNRM-CERFACS-CNRM-CM5"},
     )
     assert any(isinstance(fix, CLMcomCCLM4817) for fix in fixes)
+
+
+def test_cosmo_crclim_v1_1_snw_drop_height_coord():
+    height_coord = iris.coords.AuxCoord(
+        [2.0],
+        var_name="height",
+        standard_name="height",
+        long_name="height",
+    )
+    cube = iris.cube.Cube(
+        [10.0],
+        var_name="snw",
+        aux_coords_and_dims=[(height_coord, 0)],
+    )
+    fixes = Fix.get_fixes(
+        "CORDEX",
+        "COSMO-crCLIM-v1-1",
+        "day",
+        "snw",
+        extra_facets={
+            "driver": "CNRM-CERFACS-CNRM-CM5",
+            "domain": "EUR-11",
+        },
+    )
+    cubes = [cube]
+    for fix in fixes:
+        cubes = fix.fix_metadata(cubes)
+    assert len(cubes) == 1
+    assert cubes[0].var_name == "snw"
+    assert not cubes[0].coords("height")