Skip to content

[com1] Rheological Models for debris-flow simulations#1169

Merged
fso42 merged 5 commits into
masterfrom
RheologicalModels
Oct 15, 2025
Merged

[com1] Rheological Models for debris-flow simulations#1169
fso42 merged 5 commits into
masterfrom
RheologicalModels

Conversation

@JuLa96
Copy link
Copy Markdown
Contributor

@JuLa96 JuLa96 commented Aug 11, 2025

changes in:

com1DFA.com1DFACfg.ini -> input parameters

com1DFA.com1DFA.DFAIterate() -> adding new models to frictModelList

com1DFA.DFAfunctionsCython.computeForceC() -> adding new functions

com1DFA.com1DFA.createReportDict() -> adding new models to report output

theoryCom1DFA.rst -> documentation

https://docs.avaframe.org/en/rheologicalmodels/

@JuLa96 JuLa96 added the documentation Improvements or additions to documentation label Aug 11, 2025
@JuLa96 JuLa96 requested a review from fso42 August 11, 2025 13:20
@JuLa96 JuLa96 self-assigned this Aug 11, 2025
@JuLa96 JuLa96 added enhancement New feature or request com1DFAdev labels Aug 11, 2025
@JuLa96 JuLa96 requested a review from PaulaSp3 August 11, 2025 13:20
Comment thread avaframe/tests/test_DFAfunctionsCython.py Outdated
@fso42 fso42 requested a review from awirb August 12, 2025 07:16
@JuLa96 JuLa96 changed the title Rheological Models for debris-flow simulations [com1] Rheological Models for debris-flow simulations Aug 12, 2025
Copy link
Copy Markdown
Contributor

@awirb awirb left a comment

Choose a reason for hiding this comment

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

use citations and references in the documentation

Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread avaframe/com1DFA/com1DFA.py
Comment thread avaframe/com1DFA/com1DFACfg.ini
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread docs/theoryCom1DFA.rst
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
@PaulaSp3
Copy link
Copy Markdown
Contributor

Issue #1170 contains further ideas/tasks regarding rheological models.

@JuLa96 JuLa96 requested review from PaulaSp3 and awirb August 13, 2025 14:31
Copy link
Copy Markdown
Contributor

@fso42 fso42 left a comment

Choose a reason for hiding this comment

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

General question, also @awirb : should we move the whole fricition stuff to an [FRICTION] section instead of keeping it in [GENERAL]

Furthermore: as already discussed, we should make clear that one community talks about rhological models, the other about friction types, but both mean the same thing. (in the documentation)

Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
@JuLa96 JuLa96 requested a review from fso42 August 14, 2025 08:30
Comment thread avaframe/com1DFA/com1DFACfg.ini Outdated
@JuLa96 JuLa96 requested review from PaulaSp3 and schidli September 3, 2025 12:21
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread docs/theoryCom1DFA.rst Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
@JuLa96 JuLa96 removed the request for review from schidli September 9, 2025 10:51
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
@JuLa96 JuLa96 requested review from PaulaSp3 and fso42 September 16, 2025 16:29
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
@JuLa96 JuLa96 requested review from PaulaSp3 and fso42 October 6, 2025 12:45
Copy link
Copy Markdown
Contributor

@fso42 fso42 left a comment

Choose a reason for hiding this comment

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

So, 2 last points, after which I'm happy to merge this one :-)

Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
Comment thread avaframe/com1DFA/DFAfunctionsCython.pyx Outdated
@fso42
Copy link
Copy Markdown
Contributor

fso42 commented Oct 15, 2025

Standardtests ok

@fso42 fso42 merged commit 59a2c2d into master Oct 15, 2025
3 of 5 checks passed
@fso42 fso42 deleted the RheologicalModels branch October 15, 2025 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

DebrisFrame documentation Improvements or additions to documentation enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants