Repository navigation
[com1DFA] Add TJEM entrainment model - #1339
Open
Michael-Pallua wants to merge 8 commits into
Open
Michael-Pallua wants to merge 8 commits into
Michael-Pallua wants to merge 8 commits into
Conversation
Contributor
This branch has not been deployed
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.
The goal is to make the TJEM entrainment model, which is already present in
com9MoTVoellmy, available incom1DFA.Short description of changed files:
com1DFACfg.ini:A parameter to select the desired entrainment model (etnrType) is included as well as the parameter of the new entrainment model: the shear strength of the erodible snow cover (entShearStrength).
com1DFA.py:Changes are made to implement the new selection between the two now available entrainment models.
DFAfunctionsCython.pyxandDFAfunctionsCython.pxdA new function,
computeEntMassAndForceTjem(), which implements the equations of the TJEM entrainment model is added.PR Checklist
Please confirm before requesting review:
pytestlocally without failsConfirm before the final merge/rebase into master