Local inertial solution 1-D/2-D #182
Merged
Conversation
This file contains 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
verseve
force-pushed
the
shallow_water
branch
2 times, most recently
from
10a3617
to
232ec2f
Compare
JoostBuitink
reviewed
Jan 7, 2022
update of wflow_sbm model Moselle (including states and forcing), includes now river elevation data for local inertial approach.
with different struct for Land and River part
should have been part of previous commit. for lateral subsurface flow/ groundwater kinematic wave is used for now.
update function with sub-grid channel model: local inertial approximation of the shallow water equation (Almeida et al., 2012), 1D (sub-grid) for the river channel, and 2D for the floodplain/ overland flow.
- runoff to land domain of shallow water now also includes river and lateral ssf inputs - moved update of land and river domain from sbm_swf_model.jl to a function in flow.jl - adaptive time stepping is calculated (was fixed)
- cleanup code in sbm_swf_model.jl - decreased memory allocation by Wflow.update_sbm_swf(model)
- sbm_swf_model and update of forcing/cyclic (load_dynamic_input!(model)) and prepare_reader - related to new version of test model Moselle
- local inertial model for land and river domain are now part of surface routing - implemented for sbm_model as option to run local inertial model for both river and land domain
- warm state working correctly now for local inertial routing (overland and river flow) - update of sbm Moselle test model and test results based on HydroMT updates (river bathymetry) - small test for local inertial routing (overland and river flow) - update of fields ShallowWaterLand
- for local inertial approach river and overland flow.
- move check for zero flow width - remove double entry "lateral.land.volume .= ..."
Removes MacOS from the tests since it is unlikely to find any additional issues, and takes the most time in CI.
for the calculation of the effective flow width as part of local inertial overland flow, a check on the maximum index was missing.
and preserve the floating point type
visr
reviewed
Jan 21, 2022
visr
approved these changes
Jan 21, 2022
There was a problem hiding this comment.
Looks good to me! I added some commits, please check them before merging.
Possibly there are more performance gains still on the table, but we can always improve on that later. Would be nice to have some animations of local inertial 2D spreading along the land, maybe as embedded videos in the documentation? Not for this PR though.
|
Thanks for the review @visr! I agree, there are probably more performance gains, just came across this interesting paper (lisflood-fp): |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Routing for model type
sbmhas been extended with a local inertial solution for 2-D for overland/ floodplain flow. It is linked to the existing local inertial solution for 1-D river flow (subgrid channel). The 2-D solution makes use of a D4 (four direction) routing scheme, while the 1-D river flow solution uses a D8 (eight direction) routing scheme. For 2-D overland/ floodplain on a staggered grid the numerical scheme proposed by Almeida et al. (2012) is adopted.