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

Remove lower limit of zero for sbm.runoff #373

Merged
merged 9 commits into from
Apr 8, 2024
Merged

Remove lower limit of zero for sbm.runoff #373

merged 9 commits into from
Apr 8, 2024

Conversation

verseve
Copy link
Member

@verseve verseve commented Mar 18, 2024

Issue addressed

Fixes #372

Explanation

See #372.

Checklist

  • Updated tests or added new tests
  • Branch is up to date with master
  • Tests & pre-commit hooks pass
  • Updated documentation if needed
  • Updated changelog.md if needed

Setting a lower limit of zero for `sbm.runoff` originates from the wflow_sbm Python implementation, when surface runoff was computed with one kinematic wave, to avoid a very slow kinematic wave solution. In the Python code the kinematic wave was split into a river and land component. While for river runoff the lower limit was removed, this was not done for land runoff yet.
Compute mean values of variables runoff, soilevap and snow, and add variables actevap and actinfilt.
@verseve verseve marked this pull request as ready for review March 19, 2024 10:41
@CFBaptista CFBaptista requested review from CFBaptista and removed request for JoostBuitink April 4, 2024 09:40
Copy link
Contributor

@CFBaptista CFBaptista left a comment

Choose a reason for hiding this comment

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

Fixed conflicting changelog.md.
LGTM now!

Copy link
Contributor

@JoostBuitink JoostBuitink left a comment

Choose a reason for hiding this comment

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

Based on a discussion with @verseve, we decided to tackle this in a slightly different way, in order to be consistent with runoff_river and net_runoff_river. In the runoff variable, we do not subtract the ea_openw_l variable, and the net_runoff will become equal to runoff - ae_openw_l. This would require a bit more changes, to ensure that the net_runoff will be used throughout the code.

Copy link
Contributor

@JoostBuitink JoostBuitink left a comment

Choose a reason for hiding this comment

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

Thanks for updating the code to work with net_runoff! I have one minor suggestion, all other changes look good to me!

src/sbm.jl Outdated Show resolved Hide resolved
@verseve verseve merged commit 1a6bd31 into master Apr 8, 2024
10 checks passed
@verseve verseve deleted the sbm_runoff branch April 8, 2024 12:00
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.

Remove lower limit of zero for sbm.runoff
3 participants