Skip to content

[com1]: Modify simhash with modifying time dependent release values #1239

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

Merged
fso42 merged 1 commit into from
Feb 18, 2026
Merged

[com1]: Modify simhash with modifying time dependent release values #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions avaframe/com1DFA/com1DFA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3278,6 +3278,13 @@ def prepareVarSimDict(standardCfg, inputSimFiles, variationDict, simNameExisting
cfgSim["INPUT"]["secondaryRelThFile"] = pathToSecRel
inputSimFiles["entResInfo"]["secondaryRelRemeshed"] = remeshedSecRel

if cfgSim["GENERAL"]["timeDependentRelease"] == "True":
cfgSim["INPUT"]["timeDepRelCsv"] = inputSimFiles["timeDepRelCsv"]
timeDepRelValues, _ = gI.getTimeDepRelCsv(inputSimFiles["timeDepRelCsv"])
cfgSim["INPUT"]["timeDepRelTimeStep"] = str(timeDepRelValues["timeStep"])
cfgSim["INPUT"]["timeDepRelThickness"] = str(timeDepRelValues["thickness"])
cfgSim["INPUT"]["timeDepRelVelocity"] = str(timeDepRelValues["velocity"])

if modName in ["com1DFA", "com5SnowSlide", "com6RockAvalanche"]:
# check if spatialVoellmy is chosen that friction fields have correct extent
if cfgSim["GENERAL"]["frictModel"].lower() == "spatialvoellmy":
Expand Down
14 changes: 10 additions & 4 deletions avaframe/in1Data/getInput.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,9 @@ def fetchReleaseFile(inputSimFiles, releaseScenario, cfgSim, releaseList):
cfgSim["INPUT"]["relThFile"] = str(
releaseScenarioPath.parts[-2] + "/" + releaseScenarioPath.parts[-1]
)
elif cfgSim["GENERAL"]["relThFromFile"] == "True" and cfgSim["GENERAL"]["timeDependentRelease"] == "False":
elif (
cfgSim["GENERAL"]["relThFromFile"] == "True" and cfgSim["GENERAL"]["timeDependentRelease"] == "False"
):
# shapefile with thickness attributes - handle thickness/id/ci95 values
for scenario in releaseList:
if scenario == releaseScenario:
Expand Down Expand Up @@ -1159,6 +1161,10 @@ def getTimeDepRelCsv(timeDepRelCsv):
timeDepRelDF: dataframe
contains time dependent release values: timestep, thickness, velocity
"""
if timeDepRelCsv is None:
message = "No csv file containing time dependent release values is provided"
log.error(message)
raise FileNotFoundError(message)
timeDepRelDF = pd.read_csv(timeDepRelCsv, index_col=False)
timeDepRelDF = timeDepRelDF.fillna(0.0)
# delete empty spaces and write column names in low case
Expand All @@ -1167,8 +1173,8 @@ def getTimeDepRelCsv(timeDepRelCsv):
# sort the columns according to the first column (timestep)
timeDepRelDF = timeDepRelDF.sort_values(by="timestep")
timeDepRelValues = {
"timeStep": timeDepRelDF["timestep"].to_numpy(),
"thickness": timeDepRelDF["thickness"].to_numpy(),
"velocity": timeDepRelDF["velocity"].to_numpy(),
"timeStep": timeDepRelDF["timestep"].to_numpy(dtype=np.float64),
"thickness": timeDepRelDF["thickness"].to_numpy(dtype=np.float64),
"velocity": timeDepRelDF["velocity"].to_numpy(dtype=np.float64),
}
return timeDepRelValues, timeDepRelDF
155 changes: 155 additions & 0 deletions avaframe/tests/test_com1DFA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ def test_prepareInputData(tmp_path):
inputSimFiles["xiFile"] = None
inputSimFiles["kFile"] = None
inputSimFiles["tauCFile"] = None
inputSimFiles["timeDepRelCsv"] = None

cfg = configparser.ConfigParser()
cfg["GENERAL"] = {
"secRelArea": "False",
Expand Down Expand Up @@ -121,6 +123,7 @@ def test_prepareInputData(tmp_path):
inputSimFiles["xiFile"] = None
inputSimFiles["kFile"] = None
inputSimFiles["tauCFile"] = None
inputSimFiles["timeDepRelCsv"] = None
cfg["GENERAL"]["simTypeActual"] = "res"
cfg["GENERAL"]["relThFromFile"] = "False"
cfg["INPUT"]["relThFile"] = ""
Expand Down Expand Up @@ -151,6 +154,7 @@ def test_prepareInputData(tmp_path):
inputSimFiles["xiFile"] = None
inputSimFiles["kFile"] = None
inputSimFiles["tauCFile"] = None
inputSimFiles["timeDepRelCsv"] = None
cfg["GENERAL"]["simTypeActual"] = "res"
cfg["GENERAL"]["relThFromFile"] = "True"
cfg["INPUT"]["relThFile"] = str(dirName / "data" / "relThFieldTestFile.asc")
Expand Down Expand Up @@ -188,6 +192,7 @@ def test_prepareInputData(tmp_path):
inputSimFiles["xiFile"] = None
inputSimFiles["kFile"] = None
inputSimFiles["tauCFile"] = None
inputSimFiles["timeDepRelCsv"] = None
testField = np.zeros((10, 10))
testFile = pathlib.Path(tmp_path, "testFile2")

Expand Down Expand Up @@ -231,6 +236,7 @@ def test_prepareInputData(tmp_path):
inputSimFiles["xiFile"] = None
inputSimFiles["kFile"] = None
inputSimFiles["tauCFile"] = None
inputSimFiles["timeDepRelCsv"] = None
cfg = configparser.ConfigParser()
cfg["GENERAL"] = {
"secRelArea": "False",
Expand Down Expand Up @@ -279,6 +285,7 @@ def test_prepareInputData(tmp_path):
inputSimFiles["xiFile"] = None
inputSimFiles["kFile"] = None
inputSimFiles["tauCFile"] = None
inputSimFiles["timeDepRelCsv"] = None
cfg = configparser.ConfigParser()
cfg["GENERAL"] = {
"secRelArea": "True",
Expand Down Expand Up @@ -330,6 +337,7 @@ def test_prepareInputData(tmp_path):
inputSimFiles["xiFile"] = None
inputSimFiles["kFile"] = None
inputSimFiles["tauCFile"] = None
inputSimFiles["timeDepRelCsv"] = None
cfg = configparser.ConfigParser()
cfg["GENERAL"] = {
"secRelArea": "False",
Expand Down Expand Up @@ -2186,6 +2194,7 @@ def test_prepareVarSimDict(tmp_path, caplog):
"damFile": None,
"entFile": pathlib.Path(avaDir, "Inputs", "ENT", "entAlr.shp"),
"resFile": pathlib.Path(avaDir, "Inputs", "ENT", "entAlr.shp"),
"timeDepRelCsv": None,
}
variationDict = {"rho": np.asarray([200.0, 150.0]), "releaseScenario": ["relAlr"]}

Expand Down Expand Up @@ -2277,6 +2286,7 @@ def test_prepareVarSimDict(tmp_path, caplog):
"damFile": relPath,
"entFile": pathlib.Path(avaDir, "Inputs", "ENT", "entAlr.shp"),
"resFile": pathlib.Path(avaDir, "Inputs", "RES", "entAlr.shp"),
"timeDepRelCsv": None,
}
variationDict = {
"rho": np.asarray([200.0, 150.0]),
Expand All @@ -2300,6 +2310,7 @@ def test_prepareVarSimDict(tmp_path, caplog):
"damFile": relPath,
"entFile": pathlib.Path(avaDir, "Inputs", "ENT", "entAlr.shp"),
"resFile": pathlib.Path(avaDir, "Inputs", "ENT", "entAlr.shp"),
"timeDepRelCsv": None,
}
testCfg2 = configparser.ConfigParser()
testCfg2.optionxform = str
Expand Down Expand Up @@ -2378,6 +2389,150 @@ def test_prepareVarSimDict(tmp_path, caplog):
assert ("Simulation %s already exists, not repeating it" % simName2) in caplog.text
assert simName2 not in simDict2

# test for time dependent release
# setup required input
standardCfg = configparser.ConfigParser()
standardCfg.optionxform = str
standardCfg["GENERAL"] = {
"simTypeList": "null",
"modelType": "dfa",
"simTypeActual": "null",
"secRelArea": "False",
"relThFromFile": "True",
"entThFromFile": "True",
"entThPercentVariation": "",
"relThPercentVariation": "",
"entThRangeVariation": "",
"relThRangeVariation": "",
"entThDistVariation": "",
"relThDistVariation": "",
"entThRangeFromCiVariation": "",
"relThRangeFromCiVariation": "",
"meshCellSize": "5.",
"meshCellSizeThreshold": "0.001",
"sphKernelRadius": "meshCellSize",
"frictModel": "samosAT",
"musamosat": "0.155",
"tau0samosat": "0",
"Rs0samosat": "0.222",
"kappasamosat": "0.43",
"Rsamosat": "0.05",
"Bsamosat": "4.13",
"muvoellmy": "4000.",
"xsivoellmy": "4000.",
"dam": "False",
"rho": "200.0",
"explicitFriction": 0,
"timeDependentRelease": "True",
}
standardCfg["INPUT"] = {
"entThThickness": "1.",
"entThId": "0",
"entThCi95": "None",
"releaseScenario": "",
"relThFile": "",
}

testDir = pathlib.Path(__file__).parents[0]
inputDir = testDir / ".." / "data" / "avaParabolaTimeDep" / "Inputs"
avaDirInputs = pathlib.Path(tmp_path, "avaTestNew2", "Inputs")
avaDir = pathlib.Path(tmp_path, "avaTestNew2")
shutil.copytree(inputDir, avaDirInputs)
avaDEM = avaDir / "Inputs" / "DEM_PF_Topo.asc"

standardCfg["INPUT"]["DEM"] = "DEM_PF_Topo.asc"
standardCfg["GENERAL"]["avalancheDir"] = str(avaDir)
relPath = pathlib.Path(avaDir, "Inputs", "REL", "release1PF.shp")
inputSimFiles = {
"relFiles": [relPath],
"entResInfo": {
"flagEnt": "No",
"flagRes": "No",
"entThFileType": None,
"relThFileType": ".csv",
"resFileType": None,
"secondaryRelThFileType": None,
},
"demFile": avaDEM,
"damFile": None,
"entFile": None,
"resFile": None,
"timeDepRelCsv": pathlib.Path(avaDir, "Inputs", "REL", "release1PF.csv"),
}
variationDict = {"releaseScenario": ["release1PF"]}

# call function to be tested
simDict = com1DFA.prepareVarSimDict(standardCfg, inputSimFiles, variationDict)

testCfg = configparser.ConfigParser()
testCfg.optionxform = str
testCfg["GENERAL"] = {
"simTypeList": "null",
"modelType": "dfa",
"simTypeActual": "null",
"secRelArea": "False",
"relThFromFile": "True",
"entThFromFile": "True",
"entThPercentVariation": "",
"relThPercentVariation": "",
"rho": "200.0",
"entThRangeVariation": "",
"relThRangeVariation": "",
"entThDistVariation": "",
"relThDistVariation": "",
"entThRangeFromCiVariation": "",
"relThRangeFromCiVariation": "",
"meshCellSize": "5.",
"meshCellSizeThreshold": "0.001",
"sphKernelRadius": "5.",
"frictModel": "samosAT",
"musamosat": "0.155",
"tau0samosat": "0",
"Rs0samosat": "0.222",
"kappasamosat": "0.43",
"Rsamosat": "0.05",
"Bsamosat": "4.13",
"muvoellmy": "4000.",
"xsivoellmy": "4000.",
"dam": "False",
"explicitFriction": 0,
"timeDependentRelease": "True",
}

testCfg["INPUT"] = {
"releaseScenario": "release1PF",
}
testCfg["INPUT"]["DEM"] = "DEM_PF_Topo.asc"
testCfg["INPUT"]["relThFile"] = ""
testCfg["INPUT"]["timeDepRelCsv"] = str(pathlib.Path(avaDir, "Inputs", "REL", "release1PF.csv"))
testCfg["INPUT"]["timeDepRelTimeStep"] = str(np.array([0., 30., 60.]))
testCfg["INPUT"]["timeDepRelThickness"] = str(np.array([0.5, 1., 1.]))
testCfg["INPUT"]["timeDepRelVelocity"] = str(np.array([5., 3., 0.]))
testCfg["GENERAL"]["avalancheDir"] = str(avaDir)

simHash = cfgUtils.cfgHash(testCfg)
simName1 = "release1PF_" + simHash + "_com1_C_L_null_dfa"
testDict = {
simName1: {
"simHash": simHash,
"releaseScenario": "release1PF",
"simType": "null",
"relFile": relPath,
"cfgSim": testCfg,
}
}

for key in testDict[simName1]:
# print(simDict)
# print(simDict[simName1][key])
assert simDict[simName1][key] == testDict[simName1][key]

for section in testCfg.sections():
for key in testCfg[section]:
assert simDict[simName1]["cfgSim"][section][key] == testCfg[section][key]




def test_initializeSimulation(tmp_path):
"""test initializing a simulation"""
Expand Down
Loading