Skip to content

Add 'ERA5-Land' dataset to predefined datasets - #499

Open
MarkMelotto wants to merge 13 commits into
mainfrom
adding-era5LAND
Open

Add 'ERA5-Land' dataset to predefined datasets#499
MarkMelotto wants to merge 13 commits into
mainfrom
adding-era5LAND

Conversation

@MarkMelotto

@MarkMelotto MarkMelotto commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

Started as a 'adding ERA5-Land' now has become the start of eWaterCycle 2.5 PR

@codecov

codecov Bot commented Aug 19, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 97.31183% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 80.74%. Comparing base (13975dd) to head (b711285).

Files with missing lines Patch % Lines
src/ewatercycle/observation/grdc.py 89.47% 2 Missing and 2 partials ⚠️
src/ewatercycle/base/parameter_set.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #499      +/-   ##
==========================================
+ Coverage   79.17%   80.74%   +1.57%     
==========================================
  Files          28       29       +1     
  Lines        1882     2010     +128     
  Branches      168      195      +27     
==========================================
+ Hits         1490     1623     +133     
+ Misses        330      327       -3     
+ Partials       62       60       -2     
Files with missing lines Coverage Δ
src/ewatercycle/_forcings/caravan.py 83.01% <100.00%> (ø)
src/ewatercycle/analysis/__init__.py 100.00% <100.00%> (+12.96%) ⬆️
src/ewatercycle/analysis/hydrograph.py 100.00% <100.00%> (ø)
src/ewatercycle/esmvaltool/builder.py 68.96% <ø> (ø)
src/ewatercycle/esmvaltool/datasets.py 100.00% <ø> (ø)
src/ewatercycle/observation/caravan.py 100.00% <100.00%> (ø)
src/ewatercycle/util.py 86.92% <100.00%> (+1.53%) ⬆️
src/ewatercycle/base/parameter_set.py 62.37% <0.00%> (ø)
src/ewatercycle/observation/grdc.py 84.37% <89.47%> (+2.15%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@MarkMelotto

Copy link
Copy Markdown
Contributor Author

@BSchilperoort I dont see why this should not be fine

* add support for monthly GRDC station .txt file and 1 test

* placeholder docstring

* minor formatting

* docstring

* updated docstring with data description for original/calculated/flag
…493)

* split hydrograph from __init__.py

* add helper _to_pandas

* update error message

* update logic and error messages

* update hydrograph

* gitignore

* update init

* update test

* tests

* changed graph

* added some TODO notes

* fixed typo

* some more changes, distinction one ore more

* small fixes

* update title and docstring

* table column names from hydrostats

* initial discharge_statistics

* init py

* init.py

* completely revamped hydrograph to reduce complexity

* gitignore

* updated tests

* gitignore

* figures

* prepare for PR

* remove empty lines

* changed docstring discharge

* test metrics_list

* test for y_sim shape = 1

* update test for single comparison

* remove unused data from tests

* lint whitespace

* ruff update

* update ruff

* more ruff format

* remove old test
@MarkMelotto

Copy link
Copy Markdown
Contributor Author

added the work of @andrevdv to this PR so that it is the latest version of eWaterCycle

@BSchilperoort BSchilperoort left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Some small comments. nothing too major.

Only looked at the code, did not test any functionality (I assume you did ;) )

Comment thread src/ewatercycle/analysis/__init__.py Outdated
"""ewatercycle analysis module."""

import os
from . import hydrograph

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
from . import hydrograph
from ewatercycle.analysis import hydrograph

import numpy as np
import pandas as pd
import xarray as xr
from HydroErr.HydroErr import function_list

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This package isn't in the pyproject.toml. I guess it is installed via a different dependency. Should be added to direct dependencies though, as it's use directly here.

Comment thread src/ewatercycle/observation/grdc.py Outdated
return default


##------- Monthly GRDC data ----------

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
##------- Monthly GRDC data ----------

## - GRDC Monthly tests


def sample_grdc_monthly_file(tmp_path):

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

could be nicer as a fixture

return fn


def expected_results_monthly():

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Also nicer as a fixture

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants