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

Show file tree
Hide file tree
Changes from 22 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
107 changes: 38 additions & 69 deletions esmvalcore/cmor/_fixes/native6/era5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,53 +20,22 @@
logger = logging.getLogger(__name__)


def get_frequency(cube):
"""Determine time frequency of input cube."""
try:
time = cube.coord(axis="T")
except iris.exceptions.CoordinateNotFoundError:
return "fx"

time.convert_units("days since 1850-1-1 00:00:00.0")
if len(time.points) == 1:
acceptable_long_names = (
"Geopotential",
"Percentage of the Grid Cell Occupied by Land (Including Lakes)",
)
if cube.long_name not in acceptable_long_names:
msg = (
"Unable to infer frequency of cube "
f"with length 1 time dimension: {cube}"
)
raise ValueError(
msg,
)
return "fx"

interval = time.points[1] - time.points[0]

if interval - 1 / 24 < 1e-4:
return "hourly"
if interval - 1.0 < 1e-4:
return "daily"
return "monthly"


def fix_hourly_time_coordinate(cube):
def fix_hourly_time_coordinate(cube, frequency):
"""Shift aggregated variables 30 minutes back in time."""
if get_frequency(cube) == "hourly":
if frequency == "1hr":
time = cube.coord(axis="T")
time.points = time.points - 1 / 48
return cube


def fix_accumulated_units(cube):
def fix_accumulated_units(cube, frequency):
"""Convert accumulations to fluxes."""
if get_frequency(cube) == "monthly":
if frequency == "mon":
cube.units = cube.units * "d-1"
elif get_frequency(cube) == "hourly":
elif frequency == "1hr":
cube.units = cube.units * "h-1"
elif get_frequency(cube) == "daily":
elif frequency == "day":
msg = (
f"Fixing of accumulated units of cube "
f"{cube.summary(shorten=True)} is not implemented for daily data"
Expand Down Expand Up @@ -163,8 +132,8 @@ def fix_metadata(self, cubes):
for cube in cubes:
# Set input cube units for invalid units were ignored on load
cube.units = "m"
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
multiply_with_density(cube)
# Correct sign to align with CMOR standards
cube.data = cube.core_data() * -1.0
Expand All @@ -180,8 +149,8 @@ def fix_metadata(self, cubes):
for cube in cubes:
# Set input cube units for invalid units were ignored on load
cube.units = "m"
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
multiply_with_density(cube)
# Correct sign to align with CMOR standards
cube.data = cube.core_data() * -1.0
Expand All @@ -205,8 +174,8 @@ class Mrro(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
multiply_with_density(cube)

return cubes
Expand Down Expand Up @@ -246,8 +215,8 @@ class Pr(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
multiply_with_density(cube)

return cubes
Expand All @@ -265,8 +234,8 @@ def fix_metadata(self, cubes):
for cube in cubes:
# Set input cube units for invalid units were ignored on load
cube.units = "m"
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
multiply_with_density(cube)

return cubes
Expand Down Expand Up @@ -319,8 +288,8 @@ class Rlds(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
cube.attributes["positive"] = "down"

return cubes
Expand All @@ -332,8 +301,8 @@ class Rlns(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
cube.attributes["positive"] = "down"

return cubes
Expand All @@ -345,7 +314,7 @@ class Rls(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_hourly_time_coordinate(cube, self.frequency)
cube.attributes["positive"] = "down"

return cubes
Expand All @@ -357,8 +326,8 @@ class Rlus(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
cube.attributes["positive"] = "up"

return cubes
Expand Down Expand Up @@ -396,8 +365,8 @@ class Rsds(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
cube.attributes["positive"] = "down"

return cubes
Expand All @@ -409,8 +378,8 @@ class Rsns(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
cube.attributes["positive"] = "down"

return cubes
Expand All @@ -422,8 +391,8 @@ class Rsus(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
cube.attributes["positive"] = "up"

return cubes
Expand All @@ -435,8 +404,8 @@ class Rsdt(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
cube.attributes["positive"] = "down"

return cubes
Expand All @@ -448,8 +417,8 @@ class Rss(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_accumulated_units(cube)
fix_hourly_time_coordinate(cube, self.frequency)
fix_accumulated_units(cube, self.frequency)
cube.attributes["positive"] = "down"

return cubes
Expand Down Expand Up @@ -482,7 +451,7 @@ class Tasmax(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_hourly_time_coordinate(cube, self.frequency)
return cubes


Expand All @@ -492,7 +461,7 @@ class Tasmin(Fix):
def fix_metadata(self, cubes):
"""Fix metadata."""
for cube in cubes:
fix_hourly_time_coordinate(cube)
fix_hourly_time_coordinate(cube, self.frequency)
return cubes


Expand Down Expand Up @@ -567,7 +536,7 @@ def _fix_coordinates( # noqa: C901
):
coord.guess_bounds()

self._fix_monthly_time_coord(cube)
self._fix_monthly_time_coord(cube, self.frequency)

# Fix coordinate increasing direction
if cube.coords("latitude") and not has_unstructured_grid(cube):
Expand All @@ -582,9 +551,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"):
coord = cube.coord(axis="T")
end = []
for cell in coord.cells():
Expand Down
Loading