Skip to content
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.

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

Convert to ewc-plugin structure. Add forcing generation #7

Merged
merged 10 commits into from
Nov 1, 2023

Conversation

BSchilperoort
Copy link
Member

@BSchilperoort BSchilperoort commented Oct 24, 2023

This PR overhauls this repository.

Added:

  • Wflow.jl forcing generation
    • ERA5
    • CMIP
  • eWaterCycle model for Wflow.jl (local only)
  • example notebooks.

Note for reviewers: Just look at the new repo structure and files https://github.com/eWaterCycle/pywflow/tree/ewatercycle_plugin Basically everything is new.
Too many files have been removed to make the "files changed" tab useful.


To do after this pr:

  • Rename repo to "ewatercycle-wflowjl"
  • Add package to PyPI.

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@BSchilperoort
Copy link
Member Author

@sverhoeven Wflow.jl now uses the grid types "scalar", "points" and "unstructured". I guess changes will have to be made in ewatercycle to support those in e.g. model.get_value and model.get_value_as_xarray?

@BSchilperoort BSchilperoort marked this pull request as ready for review October 27, 2023 15:13
@sverhoeven
Copy link
Member

@sverhoeven Wflow.jl now uses the grid types "scalar", "points" and "unstructured". I guess changes will have to be made in ewatercycle to support those in e.g. model.get_value and model.get_value_as_xarray?

You overwrote those methods in src/ewatercycle_wflowjl/model.py:WflowJl class, but indeed moving those to ewatercycle would be nicer for the next non-rectilinear plugin. Created eWaterCycle/ewatercycle#389 .

Copy link
Member

@sverhoeven sverhoeven left a comment

Choose a reason for hiding this comment

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

Works for me.
I was able to install (editable mode) and run the notebooks.

I used parameter set from dcache.
The model was running quit slow so I did not run full period.

src/ewatercycle_wflowjl/model.py Show resolved Hide resolved
docs/generate_cmip_forcing.ipynb Outdated Show resolved Hide resolved
src/ewatercycle_wflowjl/model.py Show resolved Hide resolved
src/ewatercycle_wflowjl/model.py Outdated Show resolved Hide resolved
src/ewatercycle_wflowjl/model.py Show resolved Hide resolved
docs/wflowjl_local.ipynb Outdated Show resolved Hide resolved
docs/wflowjl_local.ipynb Outdated Show resolved Hide resolved
src/ewatercycle_wflowjl/model.py Show resolved Hide resolved
@Peter9192
Copy link

@BSchilperoort @sverhoeven can this be merged?

@BSchilperoort BSchilperoort merged commit 000d739 into main Nov 1, 2023
1 check passed
@BSchilperoort BSchilperoort deleted the ewatercycle_plugin branch November 1, 2023 12:26
@BSchilperoort BSchilperoort restored the ewatercycle_plugin branch November 1, 2023 12:27
@BSchilperoort BSchilperoort deleted the ewatercycle_plugin branch November 1, 2023 12:27
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