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.

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

Jump to bottom

Change hydrological modelling to classes, add Hydrotel #18

Merged
merged 86 commits into from
Apr 16, 2024
Merged

Change hydrological modelling to classes, add Hydrotel #18

merged 86 commits into from
Apr 16, 2024

Conversation

RondeauG
Copy link
Collaborator

@RondeauG RondeauG commented Jul 21, 2023 •
edited
Loading

Pull Request Checklist:

  • This PR addresses an already opened issue (for bug fixes / features)
  • (If applicable) Documentation has been added / updated (for bug fixes / features).
  • (If applicable) Tests have been added.
  • HISTORY.rst has been updated (with summary of main changes).
    • Link to issue (:issue:number) and pull request (:pull:number) has been added.

What kind of change does this PR introduce?

  • Changed the hydrological modelling module to use classes instead of a dictionary,
  • Code to prepare, then run a Hydrotel project.
  • Partial standardisation of the outputs. The 'Atlas-style' formatting is performed elsewhere.
  • Added a new notebook to describe hydrological modelling.

Does this PR introduce a breaking change?

  • Kinda. hydrological_modelling has changed substantially, but was very new.

Other information:

RondeauG and others added 30 commits July 18, 2023 16:24
@RondeauG
first working version
e06655e
@RondeauG
first working version
160d544
@RondeauG
removed extra file
edefaa2
@RondeauG
better docstrings
d393736
@RondeauG
restore xhydro
8b3eace
@RondeauG
changed calendar logic
0ef45d8
@RondeauG
xclim-compatible standard name
d041fad
@RondeauG
renamed datachecks to fit closer to xclim
0ade3f0
@RondeauG
cleanup
cdc0fbb
@RondeauG
xscen health_checks
ee1d9f0
@RondeauG
Merge remote-tracking branch 'origin/main' into hydrotel
6f3867f
@RondeauG
remove todos
3ded3f7
@RondeauG
finalised changes
a14b116
@RondeauG
small fix
6311c81
@RondeauG
tmp_commit
bd92018
@Zeitsperre
small fixes
a93491f
@RondeauG
Merge remote-tracking branch 'origin/hydrotel' into hydrotel
6d97d4c
@RondeauG
Merge remote-tracking branch 'origin/main' into hydrotel
82a143c
@Zeitsperre
Merge branch 'main' into hydrotel
09f29de
@RondeauG
added tests + bugfix
1dd71d3
@RondeauG
Merge remote-tracking branch 'origin/hydrotel' into hydrotel
2df9e1d
@RondeauG
full cov
148710e
@RondeauG
maybe fix test
6b45d03
@RondeauG
maybe fix again...
8b5a2f1
@RondeauG
maybe fix again...
651334d
@RondeauG
remove faulty encoding
18f0f20
@RondeauG
upd History
c1b974d
@RondeauG
added notebook
8a33347
@RondeauG
add weather config file
d20fb79
@RondeauG
upd notebooks
abf0798
richardarsenault
richardarsenault reviewed Mar 3, 2024
View reviewed changes
Copy link
Contributor

@richardarsenault richardarsenault left a comment

Choose a reason for hiding this comment

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

Pour ma part ça semble super et ça implémente les changements comme on a convenu. Toute la partie Hydrotel je laisserai aux experts, mais de ce que je vois je pense qu'on peut merger sans problème.

@github-actions github-actions bot added the notebooks Run tests against notebooks label Mar 20, 2024
JPelletierDumont
JPelletierDumont requested changes Mar 26, 2024
View reviewed changes
Copy link
Collaborator

@JPelletierDumont JPelletierDumont left a comment

Choose a reason for hiding this comment

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

@RondeauG on peut se prévoir une rencontre lorsque tu seras disponible pour regarder le tout ensemble

xhydro/modelling/_hydrotel.py Show resolved Hide resolved
xhydro/testing/utils.py Outdated Show resolved Hide resolved
@github-actions github-actions bot added the approved Approved for additional tests label Apr 16, 2024
@RondeauG RondeauG merged commit dfaf268 into main Apr 16, 2024
23 checks passed
@RondeauG RondeauG deleted the hydrotel branch April 16, 2024 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zeitsperre Zeitsperre Zeitsperre left review comments

@richardarsenault richardarsenault richardarsenault left review comments

@JPelletierDumont JPelletierDumont JPelletierDumont approved these changes

@EdouardMailhot EdouardMailhot Awaiting requested review from EdouardMailhot

Assignees
No one assigned
Labels
approved Approved for additional tests CI notebooks Run tests against notebooks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Modélisation hydrologique par classes ou par dictionnaire
4 participants
@RondeauG @Zeitsperre @richardarsenault @JPelletierDumont