Skip to content

Add wet snow friction type [com1DFA] - #799

Merged
fso42 merged 2 commits into
masterfrom
wetSnow
Jan 9, 2023
Merged

Add wet snow friction type [com1DFA]#799
fso42 merged 2 commits into
masterfrom
wetSnow

Conversation

@awirb

@awirb awirb commented Dec 29, 2022 •
edited by fso42
Loading

Copy link
Copy Markdown
Contributor

Here is the option to add an enthalpy-dependent friction angle (and a diffusion force).

https://hedgedoc.avaframe.org/UrhmNu-4QN6Uh0lPG6gU_g#

@awirb
awirb requested a review from fso42 December 29, 2022 13:51
@codecov

codecov Bot commented Dec 29, 2022 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Base: 75.17% // Head: 75.07% // Decreases project coverage by -0.10% ⚠️

Coverage data is based on head (c427007) compared to base (93c5113).
Patch coverage: 68.85% of modified lines in pull request are covered.

❗ Current head c427007 differs from pull request most recent head ef34841. Consider uploading reports for the commit ef34841 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master     #799      +/-   ##
==========================================
- Coverage   75.17%   75.07%   -0.11%     
==========================================
  Files          59       59              
  Lines       12929    12965      +36     
==========================================
+ Hits         9720     9734      +14     
- Misses       3209     3231      +22
Impacted Files Coverage Δ
avaframe/com1DFA/DFAfunctionsCython.pyx 86.05% <60.41%> (-1.71%) ⬇️
avaframe/com1DFA/com1DFA.py 91.22% <100.00%> (+0.06%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@fso42 fso42 added the enhancement New feature or request label Dec 29, 2022
@fso42 fso42 added this to the Version 1.4 milestone Dec 29, 2022
@fso42 fso42 changed the title Wet snow Add wet snow [com1DFA] Dec 29, 2022
fso42
fso42 requested changes Jan 2, 2023
View reviewed changes

@fso42 fso42 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@awirb: how do you want to handle the documentation for wet snow? In a separate PR?

Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
Comment thread avaframe/tests/test_com1DFA.py Outdated
Comment thread avaframe/tests/test_com1DFA.py Outdated
Comment thread avaframe/tests/test_com1DFA.py Outdated
Comment thread avaframe/tests/test_com1DFA.py Outdated
fso42
fso42 requested changes Jan 4, 2023
View reviewed changes
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
@fso42 fso42 assigned fso42 and unassigned awirb Jan 4, 2023
qlty-cloud-legacy[bot]
qlty-cloud-legacy Bot reviewed Jan 5, 2023
View reviewed changes

@qlty-cloud-legacy qlty-cloud-legacy Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR diff size of 9061 lines exceeds the maximum allowed for the inline comments feature.

@fso42 fso42 changed the title Add wet snow [com1DFA] Add wet snow friction type [com1DFA] Jan 9, 2023
matthiasto and others added 2 commits January 9, 2023 19:50
matthiasto @fso42
Add wet snow friction type to com1DFA
fb6a5f0 
	- only update entrainment enthalpy if entrainedMass bigger 0
	- move ent computation also for entrEnth into if
	- remove Fidff dqdt and update pytests
@awirb @fso42
Move wetsnow to own frictType; add wetsnow test cases
ef34841
@fso42 fso42 mentioned this pull request Jan 9, 2023
Closed
3 tasks
qlty-cloud-legacy[bot]
qlty-cloud-legacy Bot reviewed Jan 9, 2023
View reviewed changes

@qlty-cloud-legacy qlty-cloud-legacy Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR diff size of 9061 lines exceeds the maximum allowed for the inline comments feature.

@qlty-cloud-legacy

qlty-cloud-legacy Bot commented Jan 9, 2023

Copy link
Copy Markdown

Code Climate has analyzed commit ef34841 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 67.8% (50% is the threshold).

This pull request will bring the total coverage in the repository to 73.2% (0.0% change).

View more on Code Climate.

@fso42

fso42 commented Jan 9, 2023

Copy link
Copy Markdown
Contributor

Standardtests ok

@fso42
fso42 merged commit 7d2f3d9 into master Jan 9, 2023
@fso42
fso42 deleted the wetSnow branch January 9, 2023 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fso42 fso42 fso42 approved these changes
+1 more reviewer
@qlty-cloud-legacy qlty-cloud-legacy[bot] qlty-cloud-legacy[bot] left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@fso42 fso42

Labels

enhancement New feature or request

Projects

None yet

Milestone

Version 1.4

Development

Successfully merging this pull request may close these issues.

2 participants

@awirb @fso42