Merge sedmor branch: updates to the transport formulas#814
Open
Merge sedmor branch: updates to the transport formulas#814
Conversation
…merge_branch_sedmor
…merge_branch_sedmor
…rnel/compute/getustbcfuhi.f90 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…ta/unstruc_model.f90 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…ST-9434_merge_branch_sedmor Resolved conflicts: # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_data/unstruc_model.f90 # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/compute/getustbcfuhi.f90 # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/compute/getustwav.f90 # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/compute_sediment/m_fm_bott3d.f90 # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/compute_waves/surfbeat/xbeach_math_tools.F90 # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/compute_waves/surfbeat/xbeachwaves.f90 # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/prepost/flow_allocflow.f90 # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/prepost/setbobs.f90
correct use hwavuni/hwavcom
…thub.com/Deltares/Delft3d into fm/feature/UNST-9434_merge_branch_sedmor
…ature/UNST-9434_merge_branch_sedmor
…merge_branch_sedmor # Conflicts: # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/compute_sediment/m_fm_bott3d.f90
Resolved conflicts: # src/engines_gpl/dflowfm/packages/dflowfm_kernel/src/dflowfm_kernel/compute_sediment/m_fm_bott3d.f90
Contributor
There was a problem hiding this comment.
Pull request overview
Updates morphology sediment-transport parameterization (Van Thiel/Van Rijn 2008 and Soulsby/Van Rijn “XBeach flavour”) by adjusting parameter handling/defaults and adding an optional grain-size scaling, plus a small robustness change in Van Rijn 2004 transport integration.
Changes:
- Add new optional parameter
alfad50to scale equilibrium concentrations intrab19/trab20, and expose it viardtrafrmparameter metadata. - Change how
facuainteracts withfacAs/facSk(allowfacuato override both when non-zero) and update defaults accordingly. - Prevent an out-of-bounds access in
bedtr2004when referencingconcin(k-1).
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| src/utils_gpl/morphology/packages/morphology_kernel/src/trab20.f90 | Adds alfad50 scaling and changes facua→facAs/facSk override logic for iform 20. |
| src/utils_gpl/morphology/packages/morphology_kernel/src/trab19.f90 | Adds alfad50 scaling and changes facua→facAs/facSk override logic for iform 19. |
| src/utils_gpl/morphology/packages/morphology_kernel/src/calseddf1993.f90 | Updates an explanatory comment about the mixing distribution source. |
| src/utils_gpl/morphology/packages/morphology_kernel/src/bedtr2004.f90 | Adds a guard to avoid k-1 access during concentration integration. |
| src/utils_gpl/morphology/packages/morphology_kernel/src/bedbc2004.f90 | Clarifies comment wording for orbital velocity magnitude. |
| src/utils_gpl/morphology/packages/morphology_io/src/rdtrafrm.f90 | Updates parameter metadata: defaults, optional-counts, and adds alfad50 keyword for iform 19/20. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
What was done
Updates morphology sediment-transport parameterization (Van Thiel/Van Rijn 2008 and Soulsby/Van Rijn “XBeach flavour”) by adjusting parameter handling/defaults and adding an optional grain-size scaling, plus a small robustness change in Van Rijn 2004 transport integration.
Evidence of the work done
<add video/figures if applicable>
Tests
<add testcase numbers if applicable, Issue number>
Documentation
Description of Van Thiel/Van Rijn 2008 updated; Soulsby/Van Rijn “XBeach flavour” is not yet documented.
Issue link
UNST-9434