Skip to content

[com1DFA] Add TJEM entrainment model - #1339

Open
Michael-Pallua wants to merge 21 commits into
masterfrom
MP_com1DFA_addTJEM
Open

Michael-Pallua wants to merge 21 commits into
masterfrom
MP_com1DFA_addTJEM

Conversation

@Michael-Pallua

@Michael-Pallua Michael-Pallua commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

The goal is to make the TJEM entrainment model, which is already present in com9MoTVoellmy, available in com1DFA.

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.pyx and DFAfunctionsCython.pxd
    A new function, computeEntMassAndForceTjem(), which implements the equations of the TJEM entrainment model is added.

PR Checklist

Please confirm before requesting review:

  • I ran pytest locally without fails
  • I added/updated tests where needed
  • I updated documentation where needed

Confirm before the final merge/rebase into master

  • Commits are sensibly squashed and rebased onto latest master
  • Standardtest run without difference (with recompiled cython code)

@Michael-Pallua Michael-Pallua self-assigned this Sep 25, 2026
@Michael-Pallua Michael-Pallua added the enhancement New feature or request label Sep 25, 2026
@qltysh

qltysh Bot commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

All good ✅

Comment thread avaframe/com1DFA/com1DFA.py Resolved
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Resolved
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Resolved
Comment thread avaframe/com1DFA/com1DFA.py Resolved
Comment thread avaframe/com1DFA/com1DFACfg.ini Resolved
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Resolved
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Resolved
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Resolved
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Resolved
Comment thread avaframe/com1DFA/com1DFACfg.ini Resolved
Comment thread avaframe/com1DFA/com1DFACfg.ini Resolved
@fso42
fso42 requested a review from awirb November 5, 2026 08:28
@fso42
fso42 force-pushed the MP_com1DFA_addTJEM branch from 81c6920 to 02df759 Compare November 5, 2026 12:33
@qltysh

qltysh Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

Qlty


Coverage Impact

This PR will not change total coverage.

Modified Components (1)

RatingComponent% Diff
Coverage rating: C Coverage rating: C
com1DFA100.0%

Modified Files with Diff Coverage (1)

RatingFile% DiffUncovered Line #s
Coverage rating: B Coverage rating: B
avaframe/com1DFA/com1DFA.py100.0%
Total100.0%
🚦 See full report on Qlty Cloud »

🛟 Help
  • Diff Coverage: Coverage for added or modified lines of code (excludes deleted files). Learn more.

  • Total Coverage: Coverage for the whole repository, calculated as the sum of all File Coverage. Learn more.

  • File Coverage: Covered Lines divided by Covered Lines plus Missed Lines. (Excludes non-executable lines including blank lines and comments.)

    • Indirect Changes: Changes to File Coverage for files that were not modified in this PR. Learn more.

@Michael-Pallua
Michael-Pallua deleted the MP_com1DFA_addTJEM branch November 5, 2026 14:46
@fso42
fso42 restored the MP_com1DFA_addTJEM branch November 5, 2026 14:47
@fso42 fso42 reopened this Nov 5, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants