Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
9ea3251
Made ICON output UGRID-compliant (on-the-fly)
schlunma Jul 13, 2022
a0eee14
Fixed existing tests
schlunma Jul 13, 2022
2339dab
Added tests for mesh
schlunma Jul 13, 2022
f931a5b
Added test for the cube's location
schlunma Jul 13, 2022
fcf4102
Merge remote-tracking branch 'origin/main' into icon2ugrid
schlunma Oct 19, 2022
4ef5bf0
Make sure ICON lon is in [0, 360]
schlunma Oct 20, 2022
80ab5d0
Merge remote-tracking branch 'origin/main' into icon2ugrid
schlunma Nov 30, 2022
a731521
Fixed tests
schlunma Nov 30, 2022
8731faa
Fixed tests
schlunma Dec 1, 2022
392abbf
Merge remote-tracking branch 'origin/main' into icon2ugrid
schlunma Dec 2, 2022
bdfcb27
Merge branch 'main' into icon2ugrid
schlunma Jan 3, 2023
55b45b6
Remove an extra space character from a filename (#1883)
bouweandela Jan 4, 2023
a5fe2a2
Merge remote-tracking branch 'origin/main' into icon2ugrid
schlunma Jan 4, 2023
2b13817
Added doc
schlunma Jan 4, 2023
84bf928
Optimized doc
schlunma Jan 4, 2023
a82cfef
Optimized doc
schlunma Jan 4, 2023
cf5e256
Merge remote-tracking branch 'origin/main' into icon2ugrid
schlunma Jan 10, 2023
1b56c24
Do not overwrite regridding scheme in product.settings
schlunma Jan 10, 2023
daa6184
Updated necessary iris version
schlunma Jan 10, 2023
477510a
Merge remote-tracking branch 'origin/main' into icon2ugrid
schlunma Jan 12, 2023
1f83247
Merge branch 'main' into icon2ugrid
schlunma Jan 16, 2023
4956b90
Merge branch 'main' into icon2ugrid
schlunma Jan 16, 2023
67adc8d
Update doc/quickstart/find_data.rst
schlunma Jan 26, 2023
cea365f
Merge branch 'main' into icon2ugrid
schlunma Jan 27, 2023
4c4d63d
Make sure esmvaltool cache dir exists prior to downloading ICON grid …
schlunma Feb 1, 2023
bc2cf5d
Merge remote-tracking branch 'origin/main' into icon2ugrid
schlunma Feb 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions doc/quickstart/find_data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,32 @@ Key Description Default value if not specified
file default DRS is used)
============= ============================= =================================

ESMValCore automatically makes native ICON data `UGRID
<https://ugrid-conventions.github.io/ugrid-conventions/>`__-compliant when
loading the data.
The UGRID conventions provide a standardized format to store data on
unstructured grids, which is required by many software packages or tools to
work correctly.
An example is the horizontal regridding of native ICON data to a regular grid.
While the built-in :ref:`unstructured_nearest scheme <built-in regridding
schemes>` can handle unstructured grids not in UGRID format, using more complex
regridding algorithms (for example provided by the
:doc:`iris-esmf-regrid:index` package through :ref:`generic regridding
schemes`) requires the input data in UGRID format.
The following code snippet provides a preprocessor that regrids native ICON
data to a 1Β°x1Β° grid using `ESMF's first-order conservative regridding
algorithm <https://earthsystemmodeling.org/regrid/#regridding-methods>`__:

.. code-block:: yaml

preprocessors:
regrid_icon:
regrid:
target_grid: 1x1
scheme:
reference: esmf_regrid.experimental.unstructured_scheme:regrid_unstructured_to_rectilinear
method: conservative

.. hint::

To use the :func:`~esmvalcore.preprocessor.extract_levels` preprocessor on
Expand Down
16 changes: 8 additions & 8 deletions doc/recipe/preprocessor.rst
Original file line number Diff line number Diff line change
Expand Up @@ -932,17 +932,17 @@ arguments is also supported. The call function for such schemes must be defined
The `regrid` module will automatically pass the source and grid cubes as inputs
of the scheme. An example of this usage is
the :func:`~esmf_regrid.schemes.regrid_rectilinear_to_rectilinear`
scheme available in :doc:`iris-esmf-regrid:index`:git
scheme available in :doc:`iris-esmf-regrid:index`:

.. code-block:: yaml

preprocessors:
regrid_preprocessor:
regrid:
target_grid: 2.5x2.5
scheme:
reference: esmf_regrid.schemes:regrid_rectilinear_to_rectilinear
mdtol: 0.7
preprocessors:
regrid_preprocessor:
regrid:
target_grid: 2.5x2.5
scheme:
reference: esmf_regrid.schemes:regrid_rectilinear_to_rectilinear
mdtol: 0.7

.. _ensemble statistics:

Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- geopy
- humanfriendly
- importlib_resources
- iris>=3.2.1
- iris>=3.4.0
- iris-esmf-regrid
- isodate
- jinja2
Expand Down
1 change: 1 addition & 0 deletions esmvalcore/cmor/_fixes/icon/_base_fixes.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def get_horizontal_grid(self, cube):
# Download file if necessary
logger.debug("Attempting to download ICON grid file from '%s' to '%s'",
grid_url, grid_path)
self.CACHE_DIR.mkdir(parents=True, exist_ok=True)
with requests.get(grid_url, stream=True,
timeout=self.TIMEOUT) as response:
response.raise_for_status()
Expand Down
Loading