Support storage column in basin profile - #2278
Merged
verheem merged 37 commits intoJun 3, 2025
Merged
Conversation
SouthEndMusic
left a comment
SouthEndMusic
left a comment
Collaborator
There was a problem hiding this comment.
Overall this looks good! I left a few comments. I'm also missing an update of the Basin documentation in basin.qmd.
|
|
||
| """ | ||
| Validated the initialisation of basins. Each basin at least need a level-area or level storage relationship. | ||
| We recommend to initialise all basins in the same way, which can be level-area, level-storage or level-area-storage. |
Collaborator
There was a problem hiding this comment.
It's good to have this here, but this is typically something that you also put into the documentation.
SouthEndMusic
marked this pull request as ready for review
May 20, 2025 13:07
Co-authored-by: Bart de Koning <74617371+SouthEndMusic@users.noreply.github.com>
…https://github.com/Deltares/Ribasim into Ribasim#2254-Support-storage-column-in-Basin-profile
evetion
changed the title
visr
reviewed
Jun 3, 2025
Comment on lines
+679
to
+700
|
|
||
| @testitem "init_basin_only_storage" begin | ||
| toml_path = normpath( | ||
| @__DIR__, | ||
| "../../generated_testmodels/basic_basin_only_storage/ribasim.toml", | ||
| ) | ||
| @test ispath(toml_path) | ||
| model = Ribasim.run(toml_path) | ||
| @test model isa Ribasim.Model | ||
| @test success(model) | ||
| end | ||
|
|
||
| @testitem "init_basin_only_area" begin | ||
| toml_path = | ||
| normpath(@__DIR__, "../../generated_testmodels/basic_basin_only_area/ribasim.toml") | ||
| @test ispath(toml_path) | ||
| model = Ribasim.run(toml_path) | ||
| @test model isa Ribasim.Model | ||
| @test success(model) | ||
| end | ||
|
|
||
| @testitem "init_basin_both_area_and_storage" begin |
Member
There was a problem hiding this comment.
Note that if you don't have model specific tests but just want to make sure the models run without error, there is no need to add them here, because all testmodels will be run as part of
Lines 166 to 169 in b50232d
SouthEndMusic
approved these changes
Jun 3, 2025
SouthEndMusic
left a comment
SouthEndMusic
left a comment
Collaborator
There was a problem hiding this comment.
I added some final comments, nice work!
| end | ||
|
|
||
| function Basin(db::DB, config::Config, graph::MetaGraph) | ||
| function Basin(db::DB, config::Config, graph::MetaGraph)::Basin |
Collaborator
There was a problem hiding this comment.
It's a bit inconsistent to only have this here. Either do it for all node types or none of them. We don't need it, so it's fine to leave this out.
| profiles::StructVector{BasinProfileV1}, | ||
| )::Nothing | ||
| for (i, group) in enumerate(IterTools.groupby(row -> row.node_id, profiles)) | ||
| group_area = getproperty.(group, :area) |
Collaborator
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
3 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.
Fixes #2254
Notes: