Update hydrograph - add xarray support, and improve plotting/metrics - #493
Merged
MarkMelotto merged 36 commits intoAug 31, 2026
Merged
Conversation
Member
Author
|
done for the day, do i need to do something with these?
if yes, i will work on it tomorrow. |
MarkMelotto
self-requested a review
January 12, 2026 08:52
MarkMelotto
reviewed
Jan 12, 2026
| precipitation: pd.DataFrame | pd.Series | xr.DataArray | xr.Dataset | None = None, | ||
| dpi: int | None = None, | ||
| title: str | None = None, | ||
| discharge_units: str = "m$^3$ s$^{-1}$", |
Contributor
There was a problem hiding this comment.
These should come standard with the data
MarkMelotto
reviewed
Jan 12, 2026
| return new_df, new_period | ||
|
|
||
|
|
||
| def _to_pandas(data_in): |
Contributor
There was a problem hiding this comment.
missing docstrings with a short explanation for most helper functions
MarkMelotto
reviewed
Jan 12, 2026
| return table | ||
|
|
||
|
|
||
| def hydrograph( |
Contributor
There was a problem hiding this comment.
also there are a lot of inputs for this function this way.
MarkMelotto
requested changes
Jan 12, 2026
MarkMelotto
left a comment
MarkMelotto
left a comment
Contributor
There was a problem hiding this comment.
Very nice work!
Some small explanation steps are needed for the helper functions I feel.
Maybe it is also good to make an example notebook that is simple and explains all functionality.
Also for the helper functions it is not always clear how they are used and what they do specifically.
Contributor
|
I think for the testing: we just need to run the test again? |
MarkMelotto
merged commit Aug 31, 2026
c1e8b1c
into
eWaterCycle:adding-era5LAND
3 of 4 checks passed
MarkMelotto
added a commit
that referenced
this pull request
Sep 1, 2026
* Add 'ERA5-Land' dataset to predefined datasets * ruff fixes * ruff fixes * ruff fixes, returning PLC0207 * ruff fixes, # noqa: S310 * ruff fixing, but patch will fail * Add support for reading monthly GRDC discharge data (.txt) (#494) * 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 * Update hydrograph - add xarray support, and improve plotting/metrics (#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 * added testing * ruff * fixed the comments from Bart * fixing fixtures * fixing errors --------- Co-authored-by: André van der Veen <220902110+andrevdv@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Directly related to Issue #477 -
xarraysupportxarray.Datasetby converting to a pandas DataFrame internally.Other changes:
Structure
__init__.pyinto its own file(hydrograph.py).hydrograph()function into multiple helper functions to reduce complexity and improve maintainability.plot:
metrics:
metrics_listargument:hydrostatspackage.["nse", "kge_2009", "sa", "me"].other changes:
selected_yearto slice both discharge and precipitation to a single year.known issues at the moment
possible improvements