Skip to content

Fix ERA5 native6 fix to handle single monthly-averaged NetCDF files. #2512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open

Fix ERA5 native6 fix to handle single monthly-averaged NetCDF files. #2512

Changes from 18 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dd26339
Fix ERA5 native6 fix to handle single monthly-averaged NetCDF files.
rbeucher Aug 14, 2024
e87106e
Fix string
rbeucher Aug 14, 2024
ebd5512
Fix cosmetics
rbeucher Aug 14, 2024
a4b13a1
happy?
rbeucher Aug 14, 2024
ce1c78c
Formatting
rbeucher Aug 14, 2024
5bbae26
Fix test
rbeucher Aug 14, 2024
485dd11
Merge branch 'main' into era5_native6_monthly
rbeucher Nov 25, 2024
edd9564
Ruff fixing
rbeucher Nov 25, 2024
75e8346
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 25, 2024
552a0e9
Merge branch 'main' into era5_native6_monthly
valeriupredoi Feb 13, 2025
7b92ede
update get time frequency
flicj191 Sep 16, 2025
210dc60
Merge branch 'main' into era5_native6_monthly
flicj191 Sep 16, 2025
ece7ca2
remove blank line
flicj191 Sep 16, 2025
84d6994
log warning
flicj191 Sep 17, 2025
be63ec9
Merge branch 'main' into era5_native6_monthly
flicj191 Sep 17, 2025
389ea2b
revert get frequency, use when freq not specified
flicj191 Sep 18, 2025
ac6eef6
revert test for fx
flicj191 Sep 18, 2025
5dd56cc
ruff check branches
flicj191 Sep 18, 2025
3228c72
remove mo, test mon freq
flicj191 Sep 23, 2025
dc00c12
ruff
flicj191 Sep 23, 2025
030e5e5
remove comment
flicj191 Sep 23, 2025
4948f38
remove get_frequency, tests freq for some vars
flicj191 Sep 29, 2025
5de098e
Revert "remove get_frequency, tests freq for some vars"
flicj191 Oct 7, 2025
9dbf26c
add to error message
flicj191 Oct 8, 2025
0b6af74
Fix ERA5 without get_frequency (#2855)
bouweandela Oct 14, 2025
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
9 changes: 6 additions & 3 deletions esmvalcore/cmor/_fixes/native6/era5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,10 @@ def _fix_coordinates( # noqa: C901
):
coord.guess_bounds()

self._fix_monthly_time_coord(cube)
frequency = (
get_frequency(cube) if self.frequency is None else self.frequency
)
self._fix_monthly_time_coord(cube, frequency)

# Fix coordinate increasing direction
if cube.coords("latitude") and not has_unstructured_grid(cube):
Expand All @@ -582,9 +585,9 @@ def _fix_coordinates( # noqa: C901
return cube

@staticmethod
def _fix_monthly_time_coord(cube):
def _fix_monthly_time_coord(cube, frequency):
"""Set the monthly time coordinates to the middle of the month."""
if get_frequency(cube) == "monthly":
if frequency in ("monthly", "mon", "mo"):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe "mo" is not needed, as it looks like monthly frequency will be either "monthly" as returned by the get_frequency function or "mon" from the CMOR table:

ESMValCore/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CV.json

Lines 2460 to 2477 in 9ef036a

"frequency":{
"1hr":"sampled hourly",
"1hrCM":"monthly-mean diurnal cycle resolving each day into 1-hour means",
"1hrPt":"sampled hourly, at specified time point within an hour",
"3hr":"sampled every 3 hours",
"3hrPt":"sampled 3 hourly, at specified time point within the time period",
"6hr":"sampled every 6 hours",
"6hrPt":"sampled 6 hourly, at specified time point within the time period",
"day":"daily mean samples",
"dec":"decadal mean samples",
"fx":"fixed (time invariant) field",
"mon":"monthly mean samples",
"monC":"monthly climatology computed from monthly mean samples",
"monPt":"sampled monthly, at specified time point within the time period",
"subhrPt":"sampled sub-hourly, at specified time point within an hour",
"yr":"annual mean samples",
"yrPt":"sampled yearly, at specified time point within the time period"
},

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @bouweandela, I'm not sure I can speak to the get_frequency function.. it was added for some use cases?
I have added a test for "mon" frequency repeating one for "monthly"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added a test for "mon" frequency repeating one for "monthly"

Great!

Thanks @bouweandela, I'm not sure I can speak to the get_frequency function.. it was added for some use cases?

It was added before we passed all the facets and their values from the recipe to the fix functions. I've thought about it some more, and it can be removed. In rare cases where the frequency is wrongly inferred from the mip, the user can specify the right frequency value in the recipe.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah ok, should I create a new issue/PR to discuss specifically or I can just change here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just change it here

coord = cube.coord(axis="T")
end = []
for cell in coord.cells():
Expand Down