Skip to content

[com1]: stopping option for implicit friction; sfcChangeCum output file - #1343

Merged
fso42 merged 1 commit into
masterfrom
PS_stoppingImplicitFric
Nov 12, 2026
Merged

fso42 merged 1 commit into
masterfrom
PS_stoppingImplicitFric

Conversation

@PaulaSp3

@PaulaSp3 PaulaSp3 commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

standardTests are ident, except avaHofSnowGlideTest

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)

@PaulaSp3
PaulaSp3 requested review from awirb and fso42 October 14, 2026 08:59
@PaulaSp3 PaulaSp3 self-assigned this Oct 14, 2026
@qltysh

qltysh Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Analysis for project AvaFrame

❌ 2 blocking issues (4 total)

Tool Category Rule Count
ruff Lint f-string without any placeholders 1 ❌
black Style Incorrect formatting, autoformat by running qlty fmt. 1 ❌
qlty Structure Function with high complexity (count = 19): mergePartArea 1
qlty Structure Deeply nested control flow (level = 4) 1

@qltysh one-click actions:

  • Auto-fix formatting (qlty fmt && git push)

@qltysh

qltysh Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Qlty


Coverage Impact

⬆️ Merging this pull request will increase total coverage on master by 0.3%.

Modified Components (1)

RatingComponent% Diff
Coverage rating: C Coverage rating: C
com1DFA94.3%

Modified Files with Diff Coverage (3)

RatingFile% DiffUncovered Line #s
Coverage rating: B Coverage rating: B
avaframe/com1DFA/com1DFA.py92.9%2858-3208
Coverage rating: D Coverage rating: C
avaframe/com1DFA/particleTools.py100.0%
Coverage rating: A Coverage rating: A
avaframe/out3Plot/plotUtils.py100.0%
Total95.6%
🤖 Increase coverage with AI coding...
In the `PS_stoppingImplicitFric` branch, add test coverage for this new code:

- `avaframe/com1DFA/com1DFA.py` -- Line 2858-3208

🚦 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.

Comment thread avaframe/com1DFA/com1DFA.py Resolved
Comment thread avaframe/com1DFA/com1DFA.py Resolved
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Resolved
Comment thread avaframe/tests/test_com1DFA.py Resolved
Comment thread avaframe/com1DFA/com1DFA.py Resolved
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Resolved
@PaulaSp3
PaulaSp3 requested review from awirb and fso42 November 9, 2026 16:37
@PaulaSp3
PaulaSp3 force-pushed the PS_stoppingImplicitFric branch from c0e08dc to 7286e44 Compare November 10, 2026 16:17
@PaulaSp3 PaulaSp3 assigned fso42 and unassigned PaulaSp3 Nov 12, 2026
add cumulated sfc change to output files

adapt test

entrainable deposition is enabled if simType is without ent§

split and merge dmEnt and dmDet correctly

update DEM and erodable depth always, only adapt DEM normals and area above a threshold

chnage from .copy() to deepcopy

comments AW

comments FSO
@PaulaSp3
PaulaSp3 force-pushed the PS_stoppingImplicitFric branch from 7286e44 to 88a6933 Compare November 12, 2026 10:08
@fso42
fso42 merged commit d0451ce into master Nov 12, 2026
2 of 4 checks passed
@fso42
fso42 deleted the PS_stoppingImplicitFric branch November 12, 2026 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

default: make entrainable deposition True Can deposition be erodable if entrainment is switched off?

3 participants