Merge branch 'main' into dev_volcello_extract_shape

.zenodo.json

@@ -200,6 +200,10 @@
             "affiliation": "BSC, Spain",
             "name": "Martin-Martinez, Eneko",
             "orcid": "0000-0002-9213-7818"
+        },
+        {
+            "affiliation": "DLR, Germany",
+            "name": "Cammarano, Diego"
         }
     ],
     "description": "ESMValCore: A community tool for pre-processing data from Earth system models in CMIP and running analysis scripts.",

CITATION.cff

@@ -204,6 +204,10 @@ authors:
     family-names: Martin-Martinez
     given-names: Eneko
     orcid: "https://orcid.org/0000-0002-9213-7818"
+  -
+    affiliation: "DLR, Germany"
+    family-names: Cammarano
+    given-names: Diego
 
 cff-version: 1.2.0
 date-released: 2023-12-19

README.md

@@ -5,7 +5,7 @@
 [![Chat on Matrix](https://matrix.to/img/matrix-badge.svg)](https://matrix.to/#/#ESMValGroup_Lobby:gitter.im)
 [![CircleCI](https://circleci.com/gh/ESMValGroup/ESMValCore/tree/main.svg?style=svg)](https://circleci.com/gh/ESMValGroup/ESMValCore/tree/main)
 [![codecov](https://codecov.io/gh/ESMValGroup/ESMValCore/branch/main/graph/badge.svg?token=wQnDzguwq6)](https://codecov.io/gh/ESMValGroup/ESMValCore)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/5d496dea9ef64ec68e448a6df5a65783)](https://www.codacy.com/gh/ESMValGroup/ESMValCore?utm_source=github.com&utm_medium=referral&utm_content=ESMValGroup/ESMValCore&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/5d496dea9ef64ec68e448a6df5a65783)](https://app.codacy.com/gh/ESMValGroup/ESMValCore/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Docker Build Status](https://img.shields.io/docker/cloud/build/esmvalgroup/esmvalcore)](https://hub.docker.com/r/esmvalgroup/esmvalcore/)
 [![Anaconda-Server Badge](https://img.shields.io/conda/vn/conda-forge/ESMValCore?color=blue&label=conda-forge&logo=conda-forge&logoColor=white)](https://anaconda.org/conda-forge/esmvalcore)
 [![Github Actions Test](https://github.com/ESMValGroup/ESMValCore/actions/workflows/run-tests.yml/badge.svg)](https://github.com/ESMValGroup/ESMValCore/actions/workflows/run-tests.yml)

doc/quickstart/find_data.rst

@@ -388,7 +388,9 @@ This grid file can either be specified as absolute or relative (to
 with the facet ``horizontal_grid`` in the recipe or the extra facets (see
 below), or retrieved automatically from the `grid_file_uri` attribute of the
 input files.
-In the latter case, the file is downloaded once and then cached.
+In the latter case, ESMValCore first searches the input directories specified
+for ICON for a grid file with that name, and if that was not successful, tries
+to download the file and cache it.
 The cached file is valid for 7 days.
 
 ESMValCore can automatically make native ICON data `UGRID
@@ -467,7 +469,7 @@ Key                 Description                      Default value if not specif
 =================== ================================ ===================================
 ``horizontal_grid`` Absolute or relative (to         If not given, use file attribute
                     ``auxiliary_data_dir`` defined   ``grid_file_uri`` to retrieve ICON
-                    in the                           grid file
+                    in the                           grid file (see details above)
                     :ref:`user configuration file`)
                     path to the ICON grid file
 ``latitude``        Standard name of the latitude    ``latitude``

doc/recipe/preprocessor.rst

@@ -177,12 +177,12 @@ Calculate the global non-weighted root mean square:
     global_mean:
       area_statistics:
         operator: rms
-        weighted: false
+        weights: false
 
 .. warning::
 
   The disabling of weights by specifying the keyword argument ``weights:
-  False`` needs to be used with great care; from a scientific standpoint, we
+  false`` needs to be used with great care; from a scientific standpoint, we
   strongly recommend to **not** use it!
 
 

environment.yml

@@ -30,7 +30,7 @@ dependencies:
   - netcdf4
   - numpy !=1.24.3
   - packaging
-  - pandas !=2.2.0  # github.com/ESMValGroup/ESMValCore/pull/2305
+  - pandas !=2.2.0,!=2.2.1  # github.com/ESMValGroup/ESMValCore/pull/2305 and #2349
   - pillow
   - pip !=21.3
   - prov

esmvalcore/cmor/_fixes/cmip6/gfdl_cm4.py

@@ -76,10 +76,6 @@ class Tasmax(Tas):
     """Fixes for tasmax."""
 
 
-class SfcWind(Tas):
-    """Fixes for sfcWind."""
-
-
 class Hurs(Tas):
     """Fixes for hurs."""
 
@@ -110,6 +106,10 @@ class Vas(Uas):
     """Fixes for vas."""
 
 
+class SfcWind(Uas):
+    """Fixes for sfcWind."""
+
+
 Omon = BaseOmon
 
 

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

@@ -0,0 +1,36 @@
+"""Fixes for rcm WRF381P driven by CNRM-CERFACS-CNRM-CM5."""
+from esmvalcore.cmor._fixes.shared import add_scalar_height_coord
+from esmvalcore.cmor.fix import Fix
+
+
+class Tas(Fix):
+    """Fixes for tas."""
+
+    def fix_metadata(self, cubes):
+        """Add height (2m) coordinate and correct long_name for time.
+
+        Parameters
+        ----------
+        cubes : iris.cube.CubeList
+            Input cubes.
+
+        Returns
+        -------
+        iris.cube.CubeList
+        """
+        cube = self.get_cube_from_list(cubes)
+        add_scalar_height_coord(cube)
+
+        return cubes
+
+
+Tasmin = Tas
+
+
+Tasmax = Tas
+
+
+Hurs = Tas
+
+
+Huss = Tas

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

@@ -0,0 +1,36 @@
+"""Fixes for rcm WRF381P driven by ICHEC-EC-EARTH."""
+from esmvalcore.cmor._fixes.shared import add_scalar_height_coord
+from esmvalcore.cmor.fix import Fix
+
+
+class Tas(Fix):
+    """Fixes for tas."""
+
+    def fix_metadata(self, cubes):
+        """Add height (2m) coordinate and correct long_name for time.
+
+        Parameters
+        ----------
+        cubes : iris.cube.CubeList
+            Input cubes.
+
+        Returns
+        -------
+        iris.cube.CubeList
+        """
+        cube = self.get_cube_from_list(cubes)
+        add_scalar_height_coord(cube)
+
+        return cubes
+
+
+Tasmin = Tas
+
+
+Tasmax = Tas
+
+
+Hurs = Tas
+
+
+Huss = Tas

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

@@ -0,0 +1 @@
+"""Fixes for CORDEX data."""

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

@@ -0,0 +1,36 @@
+"""Fixes for rcm WRF381P driven by IPSL-IPSL-CM5A-MR."""
+from esmvalcore.cmor._fixes.shared import add_scalar_height_coord
+from esmvalcore.cmor.fix import Fix
+
+
+class Tas(Fix):
+    """Fixes for tas."""
+
+    def fix_metadata(self, cubes):
+        """Add height (2m) coordinate and correct long_name for time.
+
+        Parameters
+        ----------
+        cubes : iris.cube.CubeList
+            Input cubes.
+
+        Returns
+        -------
+        iris.cube.CubeList
+        """
+        cube = self.get_cube_from_list(cubes)
+        add_scalar_height_coord(cube)
+
+        return cubes
+
+
+Tasmin = Tas
+
+
+Tasmax = Tas
+
+
+Hurs = Tas
+
+
+Huss = Tas

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

@@ -0,0 +1,36 @@
+"""Fixes for rcm WRF381P driven by MOHC-HadGEM2-ES."""
+from esmvalcore.cmor._fixes.shared import add_scalar_height_coord
+from esmvalcore.cmor.fix import Fix
+
+
+class Tas(Fix):
+    """Fixes for tas."""
+
+    def fix_metadata(self, cubes):
+        """Add height (2m) coordinate and correct long_name for time.
+
+        Parameters
+        ----------
+        cubes : iris.cube.CubeList
+            Input cubes.
+
+        Returns
+        -------
+        iris.cube.CubeList
+        """
+        cube = self.get_cube_from_list(cubes)
+        add_scalar_height_coord(cube)
+
+        return cubes
+
+
+Tasmin = Tas
+
+
+Tasmax = Tas
+
+
+Hurs = Tas
+
+
+Huss = Tas

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

@@ -0,0 +1,36 @@
+"""Fixes for rcm WRF381P driven by NCC-NorESM1-M."""
+from esmvalcore.cmor._fixes.shared import add_scalar_height_coord
+from esmvalcore.cmor.fix import Fix
+
+
+class Tas(Fix):
+    """Fixes for tas."""
+
+    def fix_metadata(self, cubes):
+        """Add height (2m) coordinate and correct long_name for time.
+
+        Parameters
+        ----------
+        cubes : iris.cube.CubeList
+            Input cubes.
+
+        Returns
+        -------
+        iris.cube.CubeList
+        """
+        cube = self.get_cube_from_list(cubes)
+        add_scalar_height_coord(cube)
+
+        return cubes
+
+
+Tasmin = Tas
+
+
+Tasmax = Tas
+
+
+Hurs = Tas
+
+
+Huss = Tas