Skip to content

Renaming of FromShp to FromFiles in the ini files 2 #1198

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
Oct 16, 2025
Merged

Renaming of FromShp to FromFiles in the ini files 2 #1198

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
8 changes: 4 additions & 4 deletions avaframe/com3Hybrid/com3HybridCfg.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ tSteps = 0:5

#+++++Release thickness++++
# True if release thickness should be read from shapefile file; if False - relTh read from ini file
relThFromShp = False
# release thickness (only considered if relThFromShp=False)
relThFromFile = False
# release thickness (only considered if relThFromFile=False)
relTh = 1
#+++++Entrainment thickness++++
# True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file
entThFromShp = True
# entrainment thickness (only considered if entThFromShp=False)
entThFromFile = True
# entrainment thickness (only considered if entThFromFile=False)
entTh =

#++++++++++++Time stepping parameters
Expand Down
4 changes: 2 additions & 2 deletions avaframe/com6RockAvalanche/com6RockAvalancheCfg.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ rho = 2500

#+++++Release thickness++++
# True if release thickness should be read from shapefile file; if False - relTh read from ini file
relThFromShp = False
# read release thickness directly from file (relThFromShp needs to be False)
relThFromFile = False
# read release thickness directly from file (relThFromFile needs to be False)
relThFromFile = True

#+++++++++++++SPH parameters
Expand Down
2 changes: 1 addition & 1 deletion avaframe/in3Utils/cfgHandling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def filterCom1DFAThicknessValues(key, value, simDF):
notIn = True

# create required parameters for searching
thFlag = key + "FromShp"
thFlag = key + "FromFile"
thId = key + "Id"
thThickness = key + "Thickness"
thPercentVariation = key + "PercentVariation"
Expand Down
4 changes: 2 additions & 2 deletions avaframe/tests/test_com5SnowSlide.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ def test_snowSlide(tmp_path):
snowSlideCfg['com1DFA_com1DFA_override']['dt'] = '1'
snowSlideCfg['com1DFA_com1DFA_override']['meshCellSize'] = '5'
snowSlideCfg['com1DFA_com1DFA_override']['tEnd'] = '5'
snowSlideCfg['com1DFA_com1DFA_override']['entThFromShp'] = 'False'
snowSlideCfg['com1DFA_com1DFA_override']['entThFromFile'] = 'False'
snowSlideCfg['com1DFA_com1DFA_override']['entTh'] = '0.3'

# call function to be tested
_, _, _, simDF = com5SnowSlide.com5SnowSlideMain(cfgMain, snowSlideCfg)

# print('simDF', simDF.to_string())
assert simDF['tEnd'].iloc[0] == 5
assert simDF['relThFromShp'].iloc[0] == 'True'
assert simDF['relThFromFile'].iloc[0] == 'True'
assert simDF['snowSlide'].iloc[0] == 1
86 changes: 43 additions & 43 deletions avaframe/tests/test_probAna.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ def test_createComModConfig(tmp_path):
assert cfgMu["GENERAL"]["relTh"] == ""
assert cfgRelTh["GENERAL"]["musamosat"] == "0.155"
assert cfgRelTh["GENERAL"]["relTh"] == ""
assert cfgRelTh["GENERAL"]["relThFromShp"] == "True"
assert cfgRelTh["GENERAL"]["relThFromFile"] == "True"
assert cfgRelTh["GENERAL"]["relThPercentVariation"] == "50$3"
assert cfgRelTh["GENERAL"]["relThFromShp"] == "True"
assert cfgMu["GENERAL"]["relThFromShp"] == "True"
assert cfgRelTh["GENERAL"]["relThFromFile"] == "True"
assert cfgMu["GENERAL"]["relThFromFile"] == "True"
assert cfgRelTh.has_option("GENERAL", "addStandardConfig") is False

cfgProb["com1DFA_com1DFA_override"] = {
"defaultConfig": "True",
"relThFromShp": False,
"relThFromFile": False,
"relTh": 2.0,
"musamosat": 0.155,
"frictModel": "samosAT",
Expand All @@ -188,10 +188,10 @@ def test_createComModConfig(tmp_path):
assert np.isclose(cfgMu["GENERAL"].getfloat("relTh"), 2.0)
assert cfgRelTh["GENERAL"]["musamosat"] == "0.155"
assert np.isclose(cfgRelTh["GENERAL"].getfloat("relTh"), 2.0)
assert cfgRelTh["GENERAL"]["relThFromShp"] == "False"
assert cfgRelTh["GENERAL"]["relThFromFile"] == "False"
assert cfgRelTh["GENERAL"]["relThPercentVariation"] == "50$3"
assert cfgRelTh["GENERAL"]["relThFromShp"] == "False"
assert cfgMu["GENERAL"]["relThFromShp"] == "False"
assert cfgRelTh["GENERAL"]["relThFromFile"] == "False"
assert cfgMu["GENERAL"]["relThFromFile"] == "False"

cfgProb = configparser.ConfigParser()
cfgProb.optionxform = str
Expand All @@ -209,7 +209,7 @@ def test_createComModConfig(tmp_path):
}
cfgProb["com1DFA_com1DFA_override"] = {
"defaultConfig": "True",
"relThFromShp": False,
"relThFromFile": False,
"relTh": 2.0,
"musamosat": 0.155,
"frictModel": "samosAT",
Expand All @@ -223,10 +223,10 @@ def test_createComModConfig(tmp_path):
for cfgF in cfgFiles:
cfgTest = configparser.ConfigParser()
cfgTest.read(cfgF)
# print('cfgTest', cfgTest['GENERAL']['relThFromShp'], cfgTest['GENERAL']['relTh'],
# print('cfgTest', cfgTest['GENERAL']['relThFromFile'], cfgTest['GENERAL']['relTh'],
# cfgTest['GENERAL']['relThPercentVariation'], cfgTest['GENERAL']['musamosat'])

assert cfgTest["GENERAL"]["relThFromShp"] == "False"
assert cfgTest["GENERAL"]["relThFromFile"] == "False"
assert cfgTest["GENERAL"].getfloat("relTh") <= 3.0
assert cfgTest["GENERAL"].getfloat("relTh") >= 1.0
assert cfgTest["GENERAL"].getfloat("musamosat") <= 0.248
Expand Down Expand Up @@ -265,16 +265,16 @@ def test_createComModConfig(tmp_path):
cfgTest2.read(cfgFiles2[0])
cfgTest21 = configparser.ConfigParser()
cfgTest21.read(cfgFiles2[40])
# print('cfgTest', cfgTest['GENERAL']['relThFromShp'], cfgTest['GENERAL']['relTh'],
# print('cfgTest', cfgTest['GENERAL']['relThFromFile'], cfgTest['GENERAL']['relTh'],
# cfgTest['GENERAL']['relThPercentVariation'], cfgTest['GENERAL']['musamosat'])

assert cfgTest2["GENERAL"]["relThFromShp"] == "True"
assert cfgTest2["GENERAL"]["relThFromFile"] == "True"
assert cfgTest2["GENERAL"]["relTh"] == ""
assert cfgTest2["GENERAL"]["relThPercentVariation"] == ""
assert cfgTest2["INPUT"]["releaseScenario"] == "relParabola"
assert cfgTest2.has_option("GENERAL", "relTh0")
assert len(cfgFiles2) == 80
assert cfgTest21["GENERAL"]["relThFromShp"] == "True"
assert cfgTest21["GENERAL"]["relThFromFile"] == "True"
assert cfgTest21["GENERAL"]["relTh"] == ""
assert cfgTest21["GENERAL"]["relThPercentVariation"] == ""
assert cfgTest21["GENERAL"]["musamosat"] == cfgTest2["GENERAL"]["musamosat"]
Expand Down Expand Up @@ -305,7 +305,7 @@ def test_createComModConfig(tmp_path):
cfgTest3 = configparser.ConfigParser()
cfgTest3.read(cfgFiles3[1])

assert cfgTest3["GENERAL"]["relThFromShp"] == "True"
assert cfgTest3["GENERAL"]["relThFromFile"] == "True"
assert cfgTest3["GENERAL"]["relTh"] == ""
assert cfgTest3["GENERAL"]["relThRangeVariation"] == "1.2$3"
assert len(cfgFiles3) == 2
Expand Down Expand Up @@ -335,10 +335,10 @@ def test_createComModConfig(tmp_path):

cfgTest4 = configparser.ConfigParser()
cfgTest4.read(cfgFiles4[0])
# print('cfgTest', cfgTest4['GENERAL']['relThFromShp'], cfgTest4['GENERAL']['relTh'],
# print('cfgTest', cfgTest4['GENERAL']['relThFromFile'], cfgTest4['GENERAL']['relTh'],
# cfgTest4['GENERAL']['relThPercentVariation'], cfgTest4['GENERAL']['musamosat'])

assert cfgTest4["GENERAL"]["relThFromShp"] == "True"
assert cfgTest4["GENERAL"]["relThFromFile"] == "True"
assert cfgTest4["GENERAL"]["relTh"] == ""
assert cfgTest4["GENERAL"]["relThRangeVariation"] == ""
assert cfgTest4["GENERAL"]["relTh0"] != ""
Expand Down Expand Up @@ -372,7 +372,7 @@ def test_updateCfgRange():

assert cfgNew["GENERAL"]["musamosat"] == "0.155$60$2"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThPercentVariation"] == ""

com1DFACfg = cfgUtils.getDefaultModuleConfig(com1DFA)
Expand All @@ -383,7 +383,7 @@ def test_updateCfgRange():

assert cfgNew["GENERAL"]["musamosat"] == "0.155"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThPercentVariation"] == "50$2"

com1DFACfg = cfgUtils.getDefaultModuleConfig(com1DFA)
Expand All @@ -396,7 +396,7 @@ def test_updateCfgRange():

assert cfgNew["GENERAL"]["musamosat"] == "0.155$60$2"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThPercentVariation"] == ""

com1DFACfg = cfgUtils.getDefaultModuleConfig(com1DFA)
Expand All @@ -407,7 +407,7 @@ def test_updateCfgRange():

assert cfgNew["GENERAL"]["musamosat"] == "0.155"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThPercentVariation"] == "50$2"

# setup inputs
Expand All @@ -433,7 +433,7 @@ def test_updateCfgRange():
assert np.isclose(float(cfgNew["GENERAL"]["musamosat"].split(":")[1]), 0.255, rtol=1.0e-5)
assert cfgNew["GENERAL"]["musamosat"].split(":")[2] == "5"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThPercentVariation"] == ""

com1DFACfg = cfgUtils.getDefaultModuleConfig(com1DFA)
Expand All @@ -443,7 +443,7 @@ def test_updateCfgRange():

assert cfgNew["GENERAL"]["musamosat"] == "0.155"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThRangeVariation"] == "0.5$12"

# setup inputs
Expand Down Expand Up @@ -475,7 +475,7 @@ def test_updateCfgRange():
assert np.isclose(float(cfgNew["GENERAL"]["musamosat"].split("|")[1]), 0.155, rtol=1.0e-3)
assert np.isclose(float(cfgNew["GENERAL"]["musamosat"].split("|")[2]), 0.255, rtol=1.0e-3)
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThDistVariation"] == ""

com1DFACfg = cfgUtils.getDefaultModuleConfig(com1DFA)
Expand All @@ -489,7 +489,7 @@ def test_updateCfgRange():

assert cfgNew["GENERAL"]["musamosat"] == "0.155"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThDistVariation"] == "normaldistribution$12$0.3$95$ci95$10000"

# setup inputs
Expand All @@ -513,7 +513,7 @@ def test_updateCfgRange():

assert cfgNew["GENERAL"]["musamosat"] == "0.155"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThPercentVariation"] == ""
assert cfgNew["GENERAL"]["relThRangeFromCiVariation"] == "ci95$2"

Expand All @@ -540,7 +540,7 @@ def test_updateCfgRange():

assert cfgNew["GENERAL"]["musamosat"] == "0.155"
assert cfgNew["GENERAL"]["relTh"] == ""
assert cfgNew["GENERAL"]["relThFromShp"] == "True"
assert cfgNew["GENERAL"]["relThFromFile"] == "True"
assert cfgNew["GENERAL"]["relThPercentVariation"] == ""
assert cfgNew["GENERAL"]["relThRangeVariation"] == "0.25$8"

Expand Down Expand Up @@ -608,7 +608,7 @@ def test_createSampleWithVariationStandardParameters():

# read initial configuration
cfgStart = cfgUtils.getDefaultModuleConfig(com1DFA, toPrint=False)
cfgStart["GENERAL"]["relThFromShp"] = "False"
cfgStart["GENERAL"]["relThFromFile"] = "False"
cfgStart["GENERAL"]["relTh"] = "1.5"
cfgStart["GENERAL"]["entTh"] = "0.4"
paramValuesD = pA.createSampleWithVariationStandardParameters(
Expand Down Expand Up @@ -736,7 +736,7 @@ def test_createSampleWithVariationForThParameters(tmp_path):
# read initial configuration
cfgStart = cfgUtils.getDefaultModuleConfig(com1DFA, toPrint=False)
cfgStart["GENERAL"]["entTh"] = "0.5"
cfgStart["GENERAL"]["entThFromShp"] = "False"
cfgStart["GENERAL"]["entThFromFile"] = "False"
thReadFromShp = ["relTh"]

paramValuesDList = pA.createSampleWithVariationForThParameters(
Expand Down Expand Up @@ -915,7 +915,7 @@ def test_cfgFilesGlobalApproach(tmp_path):
}
cfgProb["com1DFA_com1DFA_override"] = {
"defaultConfig": "True",
"relThFromShp": False,
"relThFromFile": False,
"relTh": 2.0,
"musamosat": 0.155,
"frictModel": "samosAT",
Expand All @@ -928,10 +928,10 @@ def test_cfgFilesGlobalApproach(tmp_path):

cfgTest = configparser.ConfigParser()
cfgTest.read(cfgFiles[0])
# print('cfgTest', cfgTest['GENERAL']['relThFromShp'], cfgTest['GENERAL']['relTh'],
# print('cfgTest', cfgTest['GENERAL']['relThFromFile'], cfgTest['GENERAL']['relTh'],
# cfgTest['GENERAL']['relThPercentVariation'], cfgTest['GENERAL']['musamosat'])

assert cfgTest["GENERAL"]["relThFromShp"] == "False"
assert cfgTest["GENERAL"]["relThFromFile"] == "False"
assert cfgTest["GENERAL"]["relTh"] == "2.2719559079879"
assert len(cfgFiles) == 40

Expand All @@ -958,10 +958,10 @@ def test_cfgFilesGlobalApproach(tmp_path):

cfgTest1 = configparser.ConfigParser()
cfgTest1.read(cfgFiles2[0])
# print('cfgTest', cfgTest1['GENERAL']['relThFromShp'], cfgTest1['GENERAL']['relTh'],
# print('cfgTest', cfgTest1['GENERAL']['relThFromFile'], cfgTest1['GENERAL']['relTh'],
# cfgTest1['GENERAL']['relThPercentVariation'], cfgTest1['GENERAL']['musamosat'])

assert cfgTest1["GENERAL"]["relThFromShp"] == "True"
assert cfgTest1["GENERAL"]["relThFromFile"] == "True"
assert cfgTest1["GENERAL"]["relTh"] == ""
assert cfgTest1["GENERAL"]["relTh0"] != ""
assert cfgTest1["INPUT"]["releaseScenario"] == "relParabola"
Expand Down Expand Up @@ -1015,10 +1015,10 @@ def test_cfgFilesLocalApproach(tmp_path):
assert cfgMu["GENERAL"]["relTh"] == ""
assert cfgRelTh["GENERAL"]["musamosat"] == "0.155"
assert cfgRelTh["GENERAL"]["relTh"] == ""
assert cfgRelTh["GENERAL"]["relThFromShp"] == "True"
assert cfgRelTh["GENERAL"]["relThFromFile"] == "True"
assert cfgRelTh["GENERAL"]["relThPercentVariation"] == "50$3"
assert cfgRelTh["GENERAL"]["relThFromShp"] == "True"
assert cfgMu["GENERAL"]["relThFromShp"] == "True"
assert cfgRelTh["GENERAL"]["relThFromFile"] == "True"
assert cfgMu["GENERAL"]["relThFromFile"] == "True"

cfgProb = configparser.ConfigParser()
cfgProb.optionxform = str
Expand All @@ -1033,7 +1033,7 @@ def test_cfgFilesLocalApproach(tmp_path):
cfgProb["sampling_override"] = {"defaultConfig": "True"}
cfgProb["com1DFA_com1DFA_override"] = {
"defaultConfig": "True",
"relThFromShp": False,
"relThFromFile": False,
"relTh": 2.0,
"musamosat": 0.155,
"frictModel": "samosAT",
Expand Down Expand Up @@ -1061,10 +1061,10 @@ def test_cfgFilesLocalApproach(tmp_path):
assert np.isclose(cfgMu["GENERAL"].getfloat("relTh"), 2.0)
assert cfgRelTh["GENERAL"]["musamosat"] == "0.155"
assert np.isclose(cfgRelTh["GENERAL"].getfloat("relTh"), 2.0)
assert cfgRelTh["GENERAL"]["relThFromShp"] == "False"
assert cfgRelTh["GENERAL"]["relThFromFile"] == "False"
assert cfgRelTh["GENERAL"]["relThRangeVariation"] == "0.5$3"
assert cfgRelTh["GENERAL"]["relThFromShp"] == "False"
assert cfgMu["GENERAL"]["relThFromShp"] == "False"
assert cfgRelTh["GENERAL"]["relThFromFile"] == "False"
assert cfgMu["GENERAL"]["relThFromFile"] == "False"


def test_checkParameterSettings():
Expand All @@ -1075,7 +1075,7 @@ def test_checkParameterSettings():
cfg["GENERAL"] = {
"relTh": "",
"musamosat": "0.155",
"relThFromShp": "True",
"relThFromFile": "True",
"relThPercentVariation": "",
"relThRangeVariation": "",
"relThRangeFromCiVariation": "",
Expand All @@ -1101,7 +1101,7 @@ def test_checkParameterSettings():
cfg["GENERAL"] = {
"relTh": "",
"musamosat": "0.155",
"relThFromShp": "True",
"relThFromFile": "True",
"relThPercentVariation": "",
"relThRangeVariation": "5$4",
"relThRangeFromCiVariation": "",
Expand All @@ -1122,7 +1122,7 @@ def test_checkForNumberOfReferenceValues():
cfg["GENERAL"] = {
"relTh": "",
"musamosat": "0.155",
"relThFromShp": "True",
"relThFromFile": "True",
"relThPercentVariation": "",
"relThRangeVariation": "",
"relThRangeFromCiVariation": "",
Expand Down
Loading