[com1]: time dependent release option (hydrograph) for timestep 0 #1215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open

PaulaSp3 wants to merge 21 commits into master from PS_hydr_timestep0

Contributor

PaulaSp3 commented Nov 25, 2025 •

edited

Loading

correction that a hydrograph as a general release option also works for time step 0 and without a release area (in REL folder).
Rename "hydrograph" to "time dependent release "
Polygon and CSV file for time dependent release are in REL folder
save time dependent values in configurationFiles folder
save plot for mass sources
closes Only hydrograph as input DebrisFrame#20
closes Rename hydrograph to time dependent release DebrisFrame#38
closes Save hydrograph csv in configurationFiles folder DebrisFrame#31
closes Add reports plot for mass source DebrisFrame#33

massSource_hydrKot_8574457310_C_S_entres_dfa

PaulaSp3 self-assigned this

PaulaSp3 added com1DFAdev DebrisFrame labels

PaulaSp3 requested review from awirb and fso42

November 25, 2025 11:25

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

Contributor

qltysh bot commented Nov 25, 2025 •

edited

Loading

❌ 3 blocking issues (5 total)

Tool	Category	Rule	Count
black	Style	Incorrect formatting, autoformat by running `qlty fmt`.	1	❌
ruff	Lint	Local variable `pfvTimeMax` is assigned to but never used	1	❌
ruff	Lint	Redefinition of unused `test\_updateInitialVelocity` from line 1008	1	❌
qlty	Structure	Function with high complexity (count = 10): prepareReleaseEntrainment	2

@qltysh one-click actions:

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

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/in1Data/getInput.py Outdated Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

PaulaSp3 removed request for awirb and fso42

November 28, 2025 09:38

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

PaulaSp3 force-pushed the PS_hydr_timestep0 branch from c2af198 to f5d064f Compare

December 11, 2025 10:45

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

PaulaSp3 mentioned this pull request

Rename hydrograph to time dependent release OpenNHM/DebrisFrame#38

Open

PaulaSp3 changed the title ~~[com1]: hydrograph (general release option) for timestep 0~~ [com1]: time dependet release option (hydrograph) for timestep 0

PaulaSp3 changed the title ~~[com1]: time dependet release option (hydrograph) for timestep 0~~ [com1]: time dependent release option (hydrograph) for timestep 0

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

PaulaSp3 force-pushed the PS_hydr_timestep0 branch from 25f2d85 to c2af198 Compare

December 11, 2025 17:29

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/com1DFA.py Outdated Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

PaulaSp3 and others added 15 commits

December 22, 2025 14:44


          hydrograph for timestep 0, without release area

hydrograph with only one timestep works

checks if hydrograph values are correct

small bug fixes

fix bug, when no releaseScenario is assigned

small mod


          initial velocity for timestep

05bcb8a

fix bugs


          add hydrograph test setup

fix bugs


          delte dublicates

c8f44a2


          still error!

d004ffc


          fix bugs for hydrograph without REL area

67267a4


          delete comment

4947c8c


          little corrections

82c6d4b


          delte unused import

c56e9ee


          adapt tests

4240cd1


          rename hydrograph to timeDependentRelease; move the csv table and pol…

2830f4a

…ygon to REL folder


          delete comment

8c6fcf9


          adapt tests

18b68a0


          adapt tests

e6e7a73


          adapt test

7e3553c

PaulaSp3 force-pushed the PS_hydr_timestep0 branch from 4d8a466 to 7e3553c Compare

December 22, 2025 13:44

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved


          additional column for initialized mass

c59143b

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved


          add mass source plot

383a0bf

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

avaframe/out3Plot/outCom1DFA.py Show resolved Hide resolved


          adapt test

62fe202

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

avaframe/out3Plot/outCom1DFA.py Show resolved Hide resolved


          write time dependent values into configurationFiles folder

80685ba

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py Show resolved Hide resolved

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

avaframe/out3Plot/outCom1DFA.py Show resolved Hide resolved

qltysh bot reviewed

View reviewed changes

avaframe/tests/test_DFAfunctionsCython.py

    
                      assert np.isclose(particlesTest[key], particlesVelocity[key], atol=1e-3)

              def test_updateInitialVelocity():

Contributor

qltysh bot Dec 23, 2025

Redefinition of unused test_updateInitialVelocity from line 1008 [ruff:F811]

avaframe/com1DFA/debrisFunctions.py Show resolved Hide resolved

avaframe/out3Plot/outCom1DFA.py Show resolved Hide resolved


          add test case for time dependent release

55c9989

qltysh bot reviewed

View reviewed changes

avaframe/com1DFA/debrisFunctions.py

    
                                  "If release is time dependent, a thickness needs to be provided for  time step 0 s in %s"

                                  % (timeDepRelCsv)

                          )

                          log.error(message)

Contributor

qltysh bot Dec 23, 2025

Function with high complexity (count = 10): checkTimeDepRelease [qlty:function-complexity]

avaframe/out3Plot/outCom1DFA.py

    
                  massEntrained = infoDict["massEntrained"]

                  massInitialized = infoDict["massInitialized"]

                  massTotal = infoDict["massTotal"]

                  pfvTimeMax = infoDict["pfvTimeMax"]

Contributor

qltysh bot Dec 23, 2025

Local variable pfvTimeMax is assigned to but never used [ruff:F841]

Suggested change

      
                pfvTimeMax = infoDict["pfvTimeMax"]
          
                infoDict["pfvTimeMax"]

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

Labels