Skip to content

[com1]: time dependent release: allow multiple release features and update standardtests #1267

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

Open
PaulaSp3 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[com1]: time dependent release: allow multiple release features and update standardtests #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
882c9e0
allow more release features with time dependent release
PaulaSp3 Apr 29, 2026
c0bcd8a
update benchmarks with friction model for total initialized mass
PaulaSp3 May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions avaframe/com1DFA/com1DFA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,9 @@ def prepareReleaseEntrainment(cfg, rel, inputSimLines):
if cfg["GENERAL"].getboolean("timeDependentRelease"):
# when release is time dependent: release thickness is used from csv file
# then thickness is already in releaseLine dictionary
inputSimLines["releaseLine"]["thicknessSource"] = ["csv file"]
inputSimLines["releaseLine"]["thicknessSource"] = ["csv file"] * len(
inputSimLines["releaseLine"]["Name"]
)
elif cfg["INPUT"]["relThFile"] == "":
# otherwise release thickness is read from ini or shape file
releaseLine = setThickness(cfg, inputSimLines["releaseLine"], "relTh")
Expand Down Expand Up @@ -639,8 +641,10 @@ def prepareInputData(inputSimFiles, cfg):
if cfg["GENERAL"].getboolean("timeDependentRelease"):
releaseLine["type"] = "time dependent Release"
timeDepRelValues, _ = gI.getTimeDepRelCsv(inputSimFiles["timeDepRelCsv"])
releaseLine["thickness"] = [timeDepRelValues["thickness"][timeDepRelValues["timeStep"] == 0].item()]
releaseLine["thicknessSource"] = ["csv file"]
releaseLine["thickness"] = [
Comment thread
PaulaSp3 marked this conversation as resolved.
timeDepRelValues["thickness"][timeDepRelValues["timeStep"] == 0].item()
] * len(releaseLine["Name"])
releaseLine["thicknessSource"] = ["csv file"] * len(releaseLine["Name"])
releaseLine["velocity"] = timeDepRelValues["velocity"][timeDepRelValues["timeStep"] == 0]
releaseLine["timeDepRelValues"] = timeDepRelValues

Expand Down Expand Up @@ -3720,7 +3724,7 @@ def initializeRelVol(cfg, demVol, releaseFile, radius, releaseType="primary", ti
if releaseType == "timeDepRel":
timeDepRelValues, _ = gI.getTimeDepRelCsv(timeDepRelFile)
# for time dependent release use the release volume summed up over all timesteps
releaseLine["thickness"] = [np.sum(timeDepRelValues["thickness"])]
releaseLine["thickness"] = [np.sum(timeDepRelValues["thickness"])] * len(releaseLine["Name"])
# check if release features overlap between features
thresholdPointInPoly = cfg["GENERAL"].getfloat("thresholdPointInPoly")
geoTrans.prepareArea(releaseLine, demVol, thresholdPointInPoly, combine=True, checkOverlap=True)
Expand Down
2 changes: 1 addition & 1 deletion avaframe/com1DFA/debrisFunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def addReleaseParticles(cfg, particles, inputSimLines, thickness, velocityMag, d
relLine,
dem,
np.sqrt(2),
thList=[thickness],
thList=[thickness] * len(relLine["Name"]),
combine=True,
checkOverlap=False,
)
Expand Down
22 changes: 12 additions & 10 deletions benchmarks/avaParabolaTimeDepRelNullTest/avaParabolaTimeDepNullTest_desDict.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"2DPeak"
],
"FILES": [
"release1PF_a89ab7a9b9_com1_C_S_null_dfa_pft",
"release1PF_a89ab7a9b9_com1_C_S_null_dfa_ppr",
"release1PF_a89ab7a9b9_com1_C_S_null_dfa_pfv",
"mass_release1PF_a89ab7a9b9_com1_C_S_null_dfa"
"release1PF_89eb8e22c9_com1_C_M_null_dfa_pft",
"release1PF_89eb8e22c9_com1_C_M_null_dfa_ppr",
"release1PF_89eb8e22c9_com1_C_M_null_dfa_pfv",
"mass_release1PF_89eb8e22c9_com1_C_M_null_dfa"
],
"AVANAME": "avaParabolaTimeDep",
"AVADIR": "data/avaParabolaTimeDep",
"simNameRef": "release1PF_a89ab7a9b9_com1_C_S_null_dfa",
"simNameRef": "release1PF_89eb8e22c9_com1_C_M_null_dfa",
"NAME": "avaParabolaTimeDepRelNullTest",
"Test Info": {
"type": "text",
Expand All @@ -26,7 +26,7 @@
"simType": "null",
"simName": {
"type": "simName",
"name": "release1PF_a89ab7a9b9_com1_C_S_null_dfa"
"name": "release1PF_89eb8e22c9_com1_C_M_null_dfa"
},
"Simulation Parameters": {
"type": "list",
Expand All @@ -37,13 +37,15 @@
"Resistance": "No",
"Secondary release area": "No",
"Density [kgm-3]": "200",
"Friction model": "samosATsmall",
"Friction model": "samosATMedium",
"Initial mass [kg]": "1710541.37",
"Final mass [kg]": "8511880.38",
"Entrained mass [kg]": "0.00",
"Entrained volume [m3]": "0.00",
"Stop criterion": "1.00 percent of PKE",
"Avalanche run time [s]": "365.00",
"Computation time [s]": "153.3"
"Detrained mass [kg]": "0.00",
"Total initialized mass [kg]": "8511880.38",
"Stop criterion": "< 1.00 percent of PKE",
"Process run time [s]": "378.10",
"Computation time [s]": "99.60"
}
}
133 changes: 132 additions & 1 deletion ...lease1PF_a89ab7a9b9_com1_C_S_null_dfa.txt → ...lease1PF_89eb8e22c9_com1_C_M_null_dfa.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3649,4 +3649,135 @@ time, current, entrained, detrained, detrainedTotal, stopped, initialized
364.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
364.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
364.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -1946690.825117, 0.000000
365.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
365.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
366.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
367.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
368.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
369.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
370.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
371.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
372.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
373.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
374.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
375.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
376.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.20, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.30, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.40, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.50, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.60, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.70, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.80, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
377.90, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
378.00, 8511880.382706, 0.000000, 0.000000, 0.000000, -0.000000, 0.000000
378.10, 8511880.382706, 0.000000, 0.000000, 0.000000, -2069991.113286, 0.000000
Loading
Loading