From 9a29f9de0528c623f3cf1a2483bcf3636373a1ab Mon Sep 17 00:00:00 2001 From: Felix Oesterle <6945681+fso42@users.noreply.github.com> Date: Thu, 16 Oct 2025 23:07:08 +0200 Subject: [PATCH] Renaming of FromShp to FromFiles in the ini files --- avaframe/ana1Tests/energyLineTestCfg.ini | 4 ++-- avaframe/ana1Tests/rotationTestCfg.ini | 4 ++-- avaframe/ana1Tests/simiSolTest.py | 7 ++++--- .../avaDamBreak/Inputs/damBreak_com1DFACfg.ini | 2 +- .../avaFPtest/Inputs/FlatPlane_com1DFACfg.ini | 2 +- .../Inputs/simiSol_com1DFACfg.ini | 3 +-- .../relGar_1022880a70_null_dfa.ini | 6 +++--- .../relGar_6f35cbd808_null_dfa.ini | 6 +++--- .../relGar_789ce37489_ent_dfa.ini | 6 +++--- .../relGar_9b75355a9a_ent_dfa.ini | 6 +++--- .../relGar_b9b17dd019_ent_dfa.ini | 6 +++--- .../relGar_c4337e50ac_null_dfa.ini | 6 +++--- .../relGar_d5a270b689_ent_dfa.ini | 6 +++--- .../relGar_ec8ddafd62_null_dfa.ini | 6 +++--- .../relAlr_07be8871e8_C_L_null_dfa.ini | 6 +++--- .../relAlr_64efc0ac09_C_M_null_dfa.ini | 6 +++--- .../relAlr_9b5718b494_C_M_null_dfa.ini | 6 +++--- .../tests/data/com1DFAConfigs/0_com1DFACfg.ini | 18 +++++++++--------- .../tests/data/com1DFAConfigs/1_com1DFACfg.ini | 18 +++++++++--------- .../tests/data/com1DFAConfigs/2_com1DFACfg.ini | 18 +++++++++--------- .../tests/data/com1DFAConfigs/3_com1DFACfg.ini | 18 +++++++++--------- .../data/testCom1DFA/getIniP_com1DFACfg.ini | 2 +- .../tests/data/testCom1DFA/test_com1DFACfg.ini | 12 ++++++------ .../data/testDamBreak/damBreak_com1DFACfg.ini | 2 +- .../data/testEnergyLine/energyLineTestCfg.ini | 4 ++-- avaframe/tests/data/testGetStats_1000000.ini | 2 +- avaframe/tests/data/testGetStats_2000000.ini | 2 +- .../relKot_00b94a5f64_C_S_null_dfa.ini | 6 +++--- .../relKot_43475422e2_C_S_null_dfa.ini | 6 +++--- .../relKot_5b1d833322_C_S_null_dfa.ini | 6 +++--- .../relKot_75696a6497_C_M_null_dfa.ini | 6 +++--- .../relKot_7aa27ecfe2_C_M_null_dfa.ini | 6 +++--- .../relKot_97de9921c1_C_M_null_dfa.ini | 6 +++--- .../relKot_99c96349a9_C_S_null_dfa.ini | 6 +++--- .../relKot_abdc3c20af_C_S_null_dfa.ini | 6 +++--- .../relKot_bd0086942d_C_S_null_dfa.ini | 6 +++--- .../relKot_d8c3f1168f_C_M_null_dfa.ini | 6 +++--- .../relKot_f0ffa6b026_C_S_null_dfa.ini | 6 +++--- .../data/testSimiSol/simiSol_com1DFACfg.ini | 3 +-- .../avaFlatPlaneVarPar_com1DFACfg.ini | 2 +- .../avaHelixChannel_com1DFACfg.ini | 2 +- .../avaHelixChannelVarPar_com1DFACfg.ini | 4 ++-- .../avaHelixChannelVarPar_com1DFACfg.ini | 2 +- .../configurationFiles/allConfigurations.csv | 2 +- .../release1HS_0dcd58fc86_ent_dfa.ini | 6 +++--- .../release2HS_3d519adab0_ent_dfa.ini | 6 +++--- ...guration_release1HS_18_08_2022_08_58_40.ini | 6 +++--- ...guration_release2HS_18_08_2022_09_01_17.ini | 6 +++--- .../Outputs/com1DFA/release1HS_com1DFACfg.ini | 6 +++--- .../Outputs/com1DFA/release2HS_com1DFACfg.ini | 6 +++--- .../avaHockeyChannelProbAna_com1DFACfg.ini | 8 ++++---- .../avaHockeyChannelProbAna_probAnaCfg.ini | 8 ++++---- .../avaHockeyChannelStats_com1DFACfg.ini | 12 ++++++------ .../configurationFiles/allConfigurations.csv | 2 +- .../release1PF_50041bb354_null_dfa.ini | 6 +++--- .../release1PF_c4f3a000c3_null_dfa.ini | 6 +++--- .../release1PF_e4d351eb71_null_dfa.ini | 6 +++--- ...guration_release1PF_10_01_2022_14_55_30.ini | 6 +++--- .../avaParabolaProbAna_com1DFACfg.ini | 2 +- .../avaParabolaVarPar_com1DFACfg.ini | 2 +- 60 files changed, 179 insertions(+), 180 deletions(-) diff --git a/avaframe/ana1Tests/energyLineTestCfg.ini b/avaframe/ana1Tests/energyLineTestCfg.ini index ef32ee78f..dbeba5463 100644 --- a/avaframe/ana1Tests/energyLineTestCfg.ini +++ b/avaframe/ana1Tests/energyLineTestCfg.ini @@ -40,8 +40,8 @@ tSteps = 0:2 #+++++++++SNOW properties #+++++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 #++++++++++++Time stepping parameters diff --git a/avaframe/ana1Tests/rotationTestCfg.ini b/avaframe/ana1Tests/rotationTestCfg.ini index 9ff602766..d9943c820 100644 --- a/avaframe/ana1Tests/rotationTestCfg.ini +++ b/avaframe/ana1Tests/rotationTestCfg.ini @@ -44,8 +44,8 @@ tSteps = 0:2 #+++++++++SNOW properties #+++++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 #++++++++++++Time stepping parameters diff --git a/avaframe/ana1Tests/simiSolTest.py b/avaframe/ana1Tests/simiSolTest.py index d770d5f4c..c0ab7a3c7 100644 --- a/avaframe/ana1Tests/simiSolTest.py +++ b/avaframe/ana1Tests/simiSolTest.py @@ -943,7 +943,7 @@ def getReleaseThickness(avaDir, cfg, demFile): X1 = X / cos Y1 = Y relTh = Hini * (1 - X1 * X1 / (L_x * L_x) - Y * Y / (L_y * L_y)) - # relTh = np.where(relTh < 0, 0, relTh) + relTh = np.where(relTh < 0, 0, relTh) relDict = { "relTh": relTh, @@ -959,11 +959,12 @@ def getReleaseThickness(avaDir, cfg, demFile): polyline = {} polyline["x"] = L_x * np.cos(alpha) * cos polyline["y"] = L_x * np.sin(alpha) - relFileName = demFile.parent / "REL" / "rel1.shp" + fU.makeADir(demFile.parent / "RELShp") + relFileName = demFile.parent / "RELShp" / "rel1.shp" shpConv.writeLine2SHPfile(polyline, "rel1", str(relFileName)) # write relTh to file - relThPath = demFile.parent / "RELTH" + relThPath = demFile.parent / "REL" fU.makeADir(relThPath) relThFileName = relThPath / "releaseThickness.asc" headerRelTh = { diff --git a/avaframe/data/avaDamBreak/Inputs/damBreak_com1DFACfg.ini b/avaframe/data/avaDamBreak/Inputs/damBreak_com1DFACfg.ini index 3c5736676..6b676896d 100644 --- a/avaframe/data/avaDamBreak/Inputs/damBreak_com1DFACfg.ini +++ b/avaframe/data/avaDamBreak/Inputs/damBreak_com1DFACfg.ini @@ -28,7 +28,7 @@ fdOptionIni = False #+++++++++SNOW properties # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = False +relThFromFile = False relTh = 1 #++++++++++++Time stepping parameters diff --git a/avaframe/data/avaFPtest/Inputs/FlatPlane_com1DFACfg.ini b/avaframe/data/avaFPtest/Inputs/FlatPlane_com1DFACfg.ini index 3610ed171..f5f0bce3f 100644 --- a/avaframe/data/avaFPtest/Inputs/FlatPlane_com1DFACfg.ini +++ b/avaframe/data/avaFPtest/Inputs/FlatPlane_com1DFACfg.ini @@ -17,7 +17,7 @@ resType = FT|particles tSteps = 0:5 -relThFromShp = False +relThFromFile = False relTh = relThFromFile = True #++++++++++++Time stepping parameters diff --git a/avaframe/data/avaSimilaritySol/Inputs/simiSol_com1DFACfg.ini b/avaframe/data/avaSimilaritySol/Inputs/simiSol_com1DFACfg.ini index d8261fd38..e3e16cea2 100644 --- a/avaframe/data/avaSimilaritySol/Inputs/simiSol_com1DFACfg.ini +++ b/avaframe/data/avaSimilaritySol/Inputs/simiSol_com1DFACfg.ini @@ -19,8 +19,7 @@ initPartDistType = random #+++++++++SNOW properties # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = False -relThFromFile = True +relThFromFile = False #++++++++++++Time stepping parameters # End time [s] diff --git a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_1022880a70_null_dfa.ini b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_1022880a70_null_dfa.ini index 3530d4eec..6e50ad054 100644 --- a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_1022880a70_null_dfa.ini +++ b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_1022880a70_null_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = +50$1 relTh = secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_6f35cbd808_null_dfa.ini b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_6f35cbd808_null_dfa.ini index a0c68c066..233562ff3 100644 --- a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_6f35cbd808_null_dfa.ini +++ b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_6f35cbd808_null_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = +50.0$1 relTh = secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_789ce37489_ent_dfa.ini b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_789ce37489_ent_dfa.ini index 6be3d61b6..f35b33104 100644 --- a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_789ce37489_ent_dfa.ini +++ b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_789ce37489_ent_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = +50.0$1 relTh = secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_9b75355a9a_ent_dfa.ini b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_9b75355a9a_ent_dfa.ini index 6597740c3..cef890905 100644 --- a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_9b75355a9a_ent_dfa.ini +++ b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_9b75355a9a_ent_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = relTh = secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_b9b17dd019_ent_dfa.ini b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_b9b17dd019_ent_dfa.ini index 05ced32c5..38048665b 100644 --- a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_b9b17dd019_ent_dfa.ini +++ b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_b9b17dd019_ent_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = -50$1 relTh = 1. secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_c4337e50ac_null_dfa.ini b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_c4337e50ac_null_dfa.ini index d78e8051b..8a899fe97 100644 --- a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_c4337e50ac_null_dfa.ini +++ b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_c4337e50ac_null_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = relTh = 1.5 secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_d5a270b689_ent_dfa.ini b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_d5a270b689_ent_dfa.ini index f44b51f0c..6806be17f 100644 --- a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_d5a270b689_ent_dfa.ini +++ b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_d5a270b689_ent_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = -50.0$1 relTh = secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_ec8ddafd62_null_dfa.ini b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_ec8ddafd62_null_dfa.ini index 31e67b38c..057f04a3a 100644 --- a/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_ec8ddafd62_null_dfa.ini +++ b/avaframe/tests/data/avaFilterTest/com1DFA/configurationFiles/relGar_ec8ddafd62_null_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = -50.0$1 relTh = secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_07be8871e8_C_L_null_dfa.ini b/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_07be8871e8_C_L_null_dfa.ini index 338fe410a..f54e92bb6 100644 --- a/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_07be8871e8_C_L_null_dfa.ini +++ b/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_07be8871e8_C_L_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = 2.0 relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_64efc0ac09_C_M_null_dfa.ini b/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_64efc0ac09_C_M_null_dfa.ini index 0359f83bb..0c946459c 100644 --- a/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_64efc0ac09_C_M_null_dfa.ini +++ b/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_64efc0ac09_C_M_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = 1.0 relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_9b5718b494_C_M_null_dfa.ini b/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_9b5718b494_C_M_null_dfa.ini index 0f6022b23..eaef6002b 100644 --- a/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_9b5718b494_C_M_null_dfa.ini +++ b/avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_9b5718b494_C_M_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = 1 relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/com1DFAConfigs/0_com1DFACfg.ini b/avaframe/tests/data/com1DFAConfigs/0_com1DFACfg.ini index ce839f9c0..e886e1ca6 100644 --- a/avaframe/tests/data/com1DFAConfigs/0_com1DFACfg.ini +++ b/avaframe/tests/data/com1DFAConfigs/0_com1DFACfg.ini @@ -65,7 +65,7 @@ rho = 200 rhoEnt = 100 #+++++Release thickness++++ # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = True +relThFromFile = True # if a variation on relTh shall be performed add here +- percent and number of steps separated by $ # for example relThPercentVariation=50$10 relThPercentVariation = @@ -75,19 +75,19 @@ relThRangeVariation = # if variation on relTh shall be performed using a normal distribution in number of steps, # value of buildType (ci95 value), min and max of dist in percent, buildType (ci95 only allowed), # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 -# if relThFromShp=True ci95 is read from shp file too +# if relThFromFile=True ci95 is read from shp file too relThDistVariation = # add standard values (ONLY available for options rangeVariation and percentVariation) addStandardConfig = False -# release thickness (only considered if relThFromShp=False) +# release thickness (only considered if relThFromFile=False) relTh = -# read release thickness directly from file (relThFromShp needs to be False) +# read release thickness directly from file (relThFromFile needs to be False) relThFromFile = False #+++++Secondary release thickness+++++ # if secRelArea is True - add secondary release area secRelArea = True # True if release thickness should be read from shapefile file; if False - secondaryRelTh read from ini file -secondaryRelThFromShp = True +secondaryRelThFromFile = True # if a variation on secondaryRelTh shall be performed add here +- percent and number of steps separated by $ # for example secondaryRelThPercentVariation=50$10 secondaryRelThPercentVariation = @@ -97,13 +97,13 @@ secondaryRelThRangeVariation = # if variation on secondaryRelTh shall be performed using a normal distribution in number of steps, # value of buildType (ci95 value), min and max of dist in percent, buildType (ci95 only allowed), # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 -# if secondaryRelThFromShp=True ci95 is read from shp file too +# if secondaryRelThFromFile=True ci95 is read from shp file too secondaryRelThDistVariation = -# secondary area release thickness (only considered if secondaryRelThFromShp=False) +# secondary area release thickness (only considered if secondaryRelThFromFile=False) secondaryRelTh = #+++++Entrainment thickness++++ # True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file -entThFromShp = False +entThFromFile = False # if a variation on entTh shall be performed add here +- percent and number of steps separated by $ # for example entThPercentVariation=50$10 entThPercentVariation = @@ -115,7 +115,7 @@ entThRangeVariation = # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 # if entFromShp=True ci95 is read from shp file too entThDistVariation = -# entrainment thickness (only considered if entThFromShp=False) +# entrainment thickness (only considered if entThFromFile=False) entTh = 0.3 #++++++++++++Time stepping parameters diff --git a/avaframe/tests/data/com1DFAConfigs/1_com1DFACfg.ini b/avaframe/tests/data/com1DFAConfigs/1_com1DFACfg.ini index 0a2d00c49..53a640030 100644 --- a/avaframe/tests/data/com1DFAConfigs/1_com1DFACfg.ini +++ b/avaframe/tests/data/com1DFAConfigs/1_com1DFACfg.ini @@ -65,7 +65,7 @@ rho = 200 rhoEnt = 100 #+++++Release thickness++++ # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = False +relThFromFile = False # if a variation on relTh shall be performed add here +- percent and number of steps separated by $ # for example relThPercentVariation=50$10 relThPercentVariation = @@ -75,19 +75,19 @@ relThRangeVariation = # if variation on relTh shall be performed using a normal distribution in number of steps, # value of buildType (ci95 value), min and max of dist in percent, buildType (ci95 only allowed), # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 -# if relThFromShp=True ci95 is read from shp file too +# if relThFromFile=True ci95 is read from shp file too relThDistVariation = # add standard values (ONLY available for options rangeVariation and percentVariation) addStandardConfig = False -# release thickness (only considered if relThFromShp=False) +# release thickness (only considered if relThFromFile=False) relTh =2. -# read release thickness directly from file (relThFromShp needs to be False) +# read release thickness directly from file (relThFromFile needs to be False) relThFromFile = False #+++++Secondary release thickness+++++ # if secRelArea is True - add secondary release area secRelArea = True # True if release thickness should be read from shapefile file; if False - secondaryRelTh read from ini file -secondaryRelThFromShp = True +secondaryRelThFromFile = True # if a variation on secondaryRelTh shall be performed add here +- percent and number of steps separated by $ # for example secondaryRelThPercentVariation=50$10 secondaryRelThPercentVariation = @@ -97,13 +97,13 @@ secondaryRelThRangeVariation = # if variation on secondaryRelTh shall be performed using a normal distribution in number of steps, # value of buildType (ci95 value), min and max of dist in percent, buildType (ci95 only allowed), # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 -# if secondaryRelThFromShp=True ci95 is read from shp file too +# if secondaryRelThFromFile=True ci95 is read from shp file too secondaryRelThDistVariation = -# secondary area release thickness (only considered if secondaryRelThFromShp=False) +# secondary area release thickness (only considered if secondaryRelThFromFile=False) secondaryRelTh = #+++++Entrainment thickness++++ # True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file -entThFromShp = True +entThFromFile = True # if a variation on entTh shall be performed add here +- percent and number of steps separated by $ # for example entThPercentVariation=50$10 entThPercentVariation = @@ -115,7 +115,7 @@ entThRangeVariation = # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 # if entFromShp=True ci95 is read from shp file too entThDistVariation = -# entrainment thickness (only considered if entThFromShp=False) +# entrainment thickness (only considered if entThFromFile=False) entTh = #++++++++++++Time stepping parameters diff --git a/avaframe/tests/data/com1DFAConfigs/2_com1DFACfg.ini b/avaframe/tests/data/com1DFAConfigs/2_com1DFACfg.ini index b5de910f2..94c83acc9 100644 --- a/avaframe/tests/data/com1DFAConfigs/2_com1DFACfg.ini +++ b/avaframe/tests/data/com1DFAConfigs/2_com1DFACfg.ini @@ -65,7 +65,7 @@ rho = 200 rhoEnt = 100 #+++++Release thickness++++ # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = True +relThFromFile = True # if a variation on relTh shall be performed add here +- percent and number of steps separated by $ # for example relThPercentVariation=50$10 relThPercentVariation = @@ -75,19 +75,19 @@ relThRangeVariation = # if variation on relTh shall be performed using a normal distribution in number of steps, # value of buildType (ci95 value), min and max of dist in percent, buildType (ci95 only allowed), # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 -# if relThFromShp=True ci95 is read from shp file too +# if relThFromFile=True ci95 is read from shp file too relThDistVariation = # add standard values (ONLY available for options rangeVariation and percentVariation) addStandardConfig = False -# release thickness (only considered if relThFromShp=False) +# release thickness (only considered if relThFromFile=False) relTh = -# read release thickness directly from file (relThFromShp needs to be False) +# read release thickness directly from file (relThFromFile needs to be False) relThFromFile = False #+++++Secondary release thickness+++++ # if secRelArea is True - add secondary release area secRelArea = True # True if release thickness should be read from shapefile file; if False - secondaryRelTh read from ini file -secondaryRelThFromShp = True +secondaryRelThFromFile = True # if a variation on secondaryRelTh shall be performed add here +- percent and number of steps separated by $ # for example secondaryRelThPercentVariation=50$10 secondaryRelThPercentVariation = @@ -97,13 +97,13 @@ secondaryRelThRangeVariation = # if variation on secondaryRelTh shall be performed using a normal distribution in number of steps, # value of buildType (ci95 value), min and max of dist in percent, buildType (ci95 only allowed), # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 -# if secondaryRelThFromShp=True ci95 is read from shp file too +# if secondaryRelThFromFile=True ci95 is read from shp file too secondaryRelThDistVariation = -# secondary area release thickness (only considered if secondaryRelThFromShp=False) +# secondary area release thickness (only considered if secondaryRelThFromFile=False) secondaryRelTh = #+++++Entrainment thickness++++ # True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file -entThFromShp = True +entThFromFile = True # if a variation on entTh shall be performed add here +- percent and number of steps separated by $ # for example entThPercentVariation=50$10 entThPercentVariation = @@ -115,7 +115,7 @@ entThRangeVariation = # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 # if entFromShp=True ci95 is read from shp file too entThDistVariation = -# entrainment thickness (only considered if entThFromShp=False) +# entrainment thickness (only considered if entThFromFile=False) entTh = #++++++++++++Time stepping parameters diff --git a/avaframe/tests/data/com1DFAConfigs/3_com1DFACfg.ini b/avaframe/tests/data/com1DFAConfigs/3_com1DFACfg.ini index 789f41f6c..f32fa4e82 100644 --- a/avaframe/tests/data/com1DFAConfigs/3_com1DFACfg.ini +++ b/avaframe/tests/data/com1DFAConfigs/3_com1DFACfg.ini @@ -65,7 +65,7 @@ rho = 200 rhoEnt = 100 #+++++Release thickness++++ # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = True +relThFromFile = True # if a variation on relTh shall be performed add here +- percent and number of steps separated by $ # for example relThPercentVariation=50$10 relThPercentVariation = @@ -75,19 +75,19 @@ relThRangeVariation = # if variation on relTh shall be performed using a normal distribution in number of steps, # value of buildType (ci95 value), min and max of dist in percent, buildType (ci95 only allowed), # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 -# if relThFromShp=True ci95 is read from shp file too +# if relThFromFile=True ci95 is read from shp file too relThDistVariation = # add standard values (ONLY available for options rangeVariation and percentVariation) addStandardConfig = False -# release thickness (only considered if relThFromShp=False) +# release thickness (only considered if relThFromFile=False) relTh = -# read release thickness directly from file (relThFromShp needs to be False) +# read release thickness directly from file (relThFromFile needs to be False) relThFromFile = False #+++++Secondary release thickness+++++ # if secRelArea is True - add secondary release area secRelArea = True # True if release thickness should be read from shapefile file; if False - secondaryRelTh read from ini file -secondaryRelThFromShp = True +secondaryRelThFromFile = True # if a variation on secondaryRelTh shall be performed add here +- percent and number of steps separated by $ # for example secondaryRelThPercentVariation=50$10 secondaryRelThPercentVariation = @@ -97,13 +97,13 @@ secondaryRelThRangeVariation = # if variation on secondaryRelTh shall be performed using a normal distribution in number of steps, # value of buildType (ci95 value), min and max of dist in percent, buildType (ci95 only allowed), # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 -# if secondaryRelThFromShp=True ci95 is read from shp file too +# if secondaryRelThFromFile=True ci95 is read from shp file too secondaryRelThDistVariation = -# secondary area release thickness (only considered if secondaryRelThFromShp=False) +# secondary area release thickness (only considered if secondaryRelThFromFile=False) secondaryRelTh = #+++++Entrainment thickness++++ # True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file -entThFromShp = False +entThFromFile = False # if a variation on entTh shall be performed add here +- percent and number of steps separated by $ # for example entThPercentVariation=50$10 entThPercentVariation = +50$3 @@ -115,7 +115,7 @@ entThRangeVariation = # support (e.g. 10000) all separated by $: e.g. normaldistribution$numberOfSteps$0.3$95$ci95$10000 # if entFromShp=True ci95 is read from shp file too entThDistVariation = -# entrainment thickness (only considered if entThFromShp=False) +# entrainment thickness (only considered if entThFromFile=False) entTh = 0.5 #++++++++++++Time stepping parameters diff --git a/avaframe/tests/data/testCom1DFA/getIniP_com1DFACfg.ini b/avaframe/tests/data/testCom1DFA/getIniP_com1DFACfg.ini index c2cd380e8..b35cf8dfc 100644 --- a/avaframe/tests/data/testCom1DFA/getIniP_com1DFACfg.ini +++ b/avaframe/tests/data/testCom1DFA/getIniP_com1DFACfg.ini @@ -27,7 +27,7 @@ bufferZoneFactor = 4 sphKernelRadius = 5 #+++++++++SNOW properties -relThFromShp = False +relThFromFile = False # release thickness relTh = 2. diff --git a/avaframe/tests/data/testCom1DFA/test_com1DFACfg.ini b/avaframe/tests/data/testCom1DFA/test_com1DFACfg.ini index 1b37e0e48..d2e13ff20 100644 --- a/avaframe/tests/data/testCom1DFA/test_com1DFACfg.ini +++ b/avaframe/tests/data/testCom1DFA/test_com1DFACfg.ini @@ -21,26 +21,26 @@ tSteps = 0:10 #+++++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. #+++++Secondary release thickness+++++ # if secRelArea is True - add secondary release area secRelArea = True # True if release thickness should be read from shapefile file; if False - secondaryRelTh read from ini file -secondaryRelThFromShp = False +secondaryRelThFromFile = False # if a variation on secondaryRelTh shall be performed add here +- percent and number of steps separated by $ # for example secondaryRelThPercentVariation=50$10 secondaryRelThPercentVariation = -# secondary area release thickness (only considered if secondaryRelThFromShp=False) +# secondary area release thickness (only considered if secondaryRelThFromFile=False) secondaryRelTh = 0.5 #+++++Entrainment thickness++++ # True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file -entThFromShp = False +entThFromFile = False # if a variation on entTh shall be performed add here +- percent and number of steps separated by $ # for example entThPercentVariation=50$10 entThPercentVariation = -# entrainment thickness (only considered if entThFromShp=False) +# entrainment thickness (only considered if entThFromFile=False) entTh = 0.3 diff --git a/avaframe/tests/data/testDamBreak/damBreak_com1DFACfg.ini b/avaframe/tests/data/testDamBreak/damBreak_com1DFACfg.ini index ee457f65d..d166a8531 100644 --- a/avaframe/tests/data/testDamBreak/damBreak_com1DFACfg.ini +++ b/avaframe/tests/data/testDamBreak/damBreak_com1DFACfg.ini @@ -22,7 +22,7 @@ ftOptionIni = False #+++++++++SNOW properties # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = False +relThFromFile = False relTh = 1 #++++++++++++Time stepping parameters diff --git a/avaframe/tests/data/testEnergyLine/energyLineTestCfg.ini b/avaframe/tests/data/testEnergyLine/energyLineTestCfg.ini index c4148da9c..f8ad4d17d 100644 --- a/avaframe/tests/data/testEnergyLine/energyLineTestCfg.ini +++ b/avaframe/tests/data/testEnergyLine/energyLineTestCfg.ini @@ -37,8 +37,8 @@ tSteps = 0:1 #+++++++++SNOW properties #+++++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 #++++++++++++Time stepping parameters diff --git a/avaframe/tests/data/testGetStats_1000000.ini b/avaframe/tests/data/testGetStats_1000000.ini index e189e4f9c..b1d9ebba1 100644 --- a/avaframe/tests/data/testGetStats_1000000.ini +++ b/avaframe/tests/data/testGetStats_1000000.ini @@ -1,5 +1,5 @@ [GENERAL] -relThFromShp = False +relThFromFile = False relThPercentVariation = relTh = 1.0 diff --git a/avaframe/tests/data/testGetStats_2000000.ini b/avaframe/tests/data/testGetStats_2000000.ini index 837e5fa5c..10b3202c1 100644 --- a/avaframe/tests/data/testGetStats_2000000.ini +++ b/avaframe/tests/data/testGetStats_2000000.ini @@ -1,5 +1,5 @@ [GENERAL] -relThFromShp = True +relThFromFile = True relThPercentVariation = relTh = relTh0 = 2.0 diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_00b94a5f64_C_S_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_00b94a5f64_C_S_null_dfa.ini index 04cad49f9..24b878d3e 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_00b94a5f64_C_S_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_00b94a5f64_C_S_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = -9.999999999999998$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_43475422e2_C_S_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_43475422e2_C_S_null_dfa.ini index f1befe260..c0e81cb14 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_43475422e2_C_S_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_43475422e2_C_S_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = -50.0$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_5b1d833322_C_S_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_5b1d833322_C_S_null_dfa.ini index bc9b8b6f3..68cb5dfbd 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_5b1d833322_C_S_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_5b1d833322_C_S_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = +10.000000000000009$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_75696a6497_C_M_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_75696a6497_C_M_null_dfa.ini index f3fe758f9..690398951 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_75696a6497_C_M_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_75696a6497_C_M_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = +30.000000000000004$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_7aa27ecfe2_C_M_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_7aa27ecfe2_C_M_null_dfa.ini index 07d43744e..1f0300df1 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_7aa27ecfe2_C_M_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_7aa27ecfe2_C_M_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = +20.000000000000018$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_97de9921c1_C_M_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_97de9921c1_C_M_null_dfa.ini index d156667c8..b13d915b9 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_97de9921c1_C_M_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_97de9921c1_C_M_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = +50.0$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_99c96349a9_C_S_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_99c96349a9_C_S_null_dfa.ini index 11bb12bd9..ca915f23c 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_99c96349a9_C_S_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_99c96349a9_C_S_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = -30.000000000000004$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_abdc3c20af_C_S_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_abdc3c20af_C_S_null_dfa.ini index 1b801d9dd..c481e04bd 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_abdc3c20af_C_S_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_abdc3c20af_C_S_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = -19.999999999999996$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_bd0086942d_C_S_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_bd0086942d_C_S_null_dfa.ini index 550d4fa7b..1c24f8f3d 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_bd0086942d_C_S_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_bd0086942d_C_S_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = -40.0$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_d8c3f1168f_C_M_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_d8c3f1168f_C_M_null_dfa.ini index 2a67205d5..5a2a5c17d 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_d8c3f1168f_C_M_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_d8c3f1168f_C_M_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = +39.99999999999999$1 relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_f0ffa6b026_C_S_null_dfa.ini b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_f0ffa6b026_C_S_null_dfa.ini index c709ad209..fcaae2b60 100644 --- a/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_f0ffa6b026_C_S_null_dfa.ini +++ b/avaframe/tests/data/testReadConfig/Outputs/com1DFA/configurationFiles/relKot_f0ffa6b026_C_S_null_dfa.ini @@ -20,7 +20,7 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = relThRangeVariation = relThRangeFromCiVariation = @@ -28,13 +28,13 @@ relThDistVariation = relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelThRangeFromCiVariation = secondaryRelThDistVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThIfMissingInShp = 0.3 entThPercentVariation = entThRangeVariation = diff --git a/avaframe/tests/data/testSimiSol/simiSol_com1DFACfg.ini b/avaframe/tests/data/testSimiSol/simiSol_com1DFACfg.ini index fd1e4986e..d83c27c21 100644 --- a/avaframe/tests/data/testSimiSol/simiSol_com1DFACfg.ini +++ b/avaframe/tests/data/testSimiSol/simiSol_com1DFACfg.ini @@ -10,8 +10,7 @@ tSteps = 0:1 #+++++++++SNOW properties # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromFile = True -relThFromShp = False +relThFromFile = False #++++++++++++Time stepping parameters tEnd = 5 diff --git a/benchmarks/avaFlatPlaneVarParTest/avaFlatPlaneVarPar_com1DFACfg.ini b/benchmarks/avaFlatPlaneVarParTest/avaFlatPlaneVarPar_com1DFACfg.ini index 51eca946f..3c56cd613 100644 --- a/benchmarks/avaFlatPlaneVarParTest/avaFlatPlaneVarPar_com1DFACfg.ini +++ b/benchmarks/avaFlatPlaneVarParTest/avaFlatPlaneVarPar_com1DFACfg.ini @@ -11,4 +11,4 @@ simTypeList = null #+++++++++SNOW properties # release thickness relTh = 2. -relThFromShp = False +relThFromFile = False diff --git a/benchmarks/avaHelixChannelEnt1mTest/avaHelixChannel_com1DFACfg.ini b/benchmarks/avaHelixChannelEnt1mTest/avaHelixChannel_com1DFACfg.ini index 80f0491bc..299b02e9e 100644 --- a/benchmarks/avaHelixChannelEnt1mTest/avaHelixChannel_com1DFACfg.ini +++ b/benchmarks/avaHelixChannelEnt1mTest/avaHelixChannel_com1DFACfg.ini @@ -12,7 +12,7 @@ particleFile = ../benchmarks/avaHelixChannelEnt1mTest #++++++++++++++++ simulation type # list of simulations that shall be performed (null, ent, res, entres) simTypeList = ent -entThFromShp = False +entThFromFile = False entTh = 1 [INPUT] diff --git a/benchmarks/avaHelixChannelEnt1mVarParTest/avaHelixChannelVarPar_com1DFACfg.ini b/benchmarks/avaHelixChannelEnt1mVarParTest/avaHelixChannelVarPar_com1DFACfg.ini index cb9e901a2..dbccbe16e 100644 --- a/benchmarks/avaHelixChannelEnt1mVarParTest/avaHelixChannelVarPar_com1DFACfg.ini +++ b/benchmarks/avaHelixChannelEnt1mVarParTest/avaHelixChannelVarPar_com1DFACfg.ini @@ -10,9 +10,9 @@ simTypeList = ent #+++++++++SNOW properties # release thickness -relThFromShp = False +relThFromFile = False relTh = 0.5 #++++++++++++ Entrainment Erosion Energy entTh = 1.0 -entThFromShp = False +entThFromFile = False diff --git a/benchmarks/avaHelixChannelVarParTest/avaHelixChannelVarPar_com1DFACfg.ini b/benchmarks/avaHelixChannelVarParTest/avaHelixChannelVarPar_com1DFACfg.ini index 8cffca69a..bc031bbe3 100644 --- a/benchmarks/avaHelixChannelVarParTest/avaHelixChannelVarPar_com1DFACfg.ini +++ b/benchmarks/avaHelixChannelVarParTest/avaHelixChannelVarPar_com1DFACfg.ini @@ -12,5 +12,5 @@ simTypeList = ent # tan of bed friction angle used for: samosAT, Coulomb, Voellmy mu = 0.05500 -entThFromShp = False +entThFromFile = False entTh = 0.3 diff --git a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/allConfigurations.csv b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/allConfigurations.csv index 8cfda109a..46a3e1a63 100644 --- a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/allConfigurations.csv +++ b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/allConfigurations.csv @@ -1,3 +1,3 @@ -,simTypeList,modelType,resType,tSteps,initPartDistType,initialiseParticlesFromFile,particleFile,seed,iniStep,saveParticlesIni,subgridMixingFactorIni,dtIni,sphOptionIni,stopCritIni,stopCritIniSmall,maxIterations,bufferZoneFactor,additionallyFixedFactor,ftOptionIni,rho,rhoEnt,relThFromShp,relThPercentVariation,relThRangeVariation,addStandardConfig,relTh,relThFromFile,secRelArea,secondaryRelThFromShp,secondaryRelThPercentVariation,secondaryRelThRangeVariation,secondaryRelTh,entThFromShp,entThPercentVariation,entThRangeVariation,entTh,dt,tEnd,sphKernelRadiusTimeStepping,cMax,stopCritType,uFlowingThreshold,stopCrit,sphOption,minRKern,sphKernelRadius,viscOption,massPerParticleDeterminationMethod,massPerPart,deltaTh,sphKR0,nPPK0,aPPK,splitOption,thresholdMassSplit,distSplitPart,nSplit,cMinNPPK,cMaxNPPK,cMinMass,cMaxnMass,interpOption,hmin,meshCellSize,meshCellSizeThreshold,cleanDEMremeshed,methodMeshNormal,distReproj,reprojectionIterations,thresholdProjection,subgridMixingFactor,gravAcc,velMagMin,depMin,curvAcceleration,explicitFriction,frictModel,mu,tau0,Rs0,kappa,R,B,xsi,hRes,cw,dRes,sres,entEroEnergy,entShearResistance,entDefResistance,thresholdPointInPoly,avalancheDir,simTypeActual,relTh0,relTh1,entTh0,releaseScenario,DEM,relThId,relThThickness,entThId,entThThickness,entrainmentScenario,simName,nPart,timeLoop,timeForce,timeForceSPH,timePos,timeNeigh,timeField,nSave,nIter +,simTypeList,modelType,resType,tSteps,initPartDistType,initialiseParticlesFromFile,particleFile,seed,iniStep,saveParticlesIni,subgridMixingFactorIni,dtIni,sphOptionIni,stopCritIni,stopCritIniSmall,maxIterations,bufferZoneFactor,additionallyFixedFactor,ftOptionIni,rho,rhoEnt,relThFromFile,relThPercentVariation,relThRangeVariation,addStandardConfig,relTh,relThFromFile,secRelArea,secondaryRelThFromFile,secondaryRelThPercentVariation,secondaryRelThRangeVariation,secondaryRelTh,entThFromFile,entThPercentVariation,entThRangeVariation,entTh,dt,tEnd,sphKernelRadiusTimeStepping,cMax,stopCritType,uFlowingThreshold,stopCrit,sphOption,minRKern,sphKernelRadius,viscOption,massPerParticleDeterminationMethod,massPerPart,deltaTh,sphKR0,nPPK0,aPPK,splitOption,thresholdMassSplit,distSplitPart,nSplit,cMinNPPK,cMaxNPPK,cMinMass,cMaxnMass,interpOption,hmin,meshCellSize,meshCellSizeThreshold,cleanDEMremeshed,methodMeshNormal,distReproj,reprojectionIterations,thresholdProjection,subgridMixingFactor,gravAcc,velMagMin,depMin,curvAcceleration,explicitFriction,frictModel,mu,tau0,Rs0,kappa,R,B,xsi,hRes,cw,dRes,sres,entEroEnergy,entShearResistance,entDefResistance,thresholdPointInPoly,avalancheDir,simTypeActual,relTh0,relTh1,entTh0,releaseScenario,DEM,relThId,relThThickness,entThId,entThThickness,entrainmentScenario,simName,nPart,timeLoop,timeForce,timeForceSPH,timePos,timeNeigh,timeField,nSave,nIter 3d519adab0,ent,dfa,ppr|pft|pfv,1,random,True,,12345,False,False,10.0,0.1,2,0.1,1.001,100,4,0.275,False,200,100,True,,,False,,False,False,True,,,,True,,,,0.1,400,False,0.02,kinEnergy,0.01,0.01,1,0.001,5,1,MPPDH,1250,0.25,5,15,-1.5,0,1.5,0.41,2,0.25,2.5,0.25,5,2,0.05,5,0.001,True,1,0,5,0.001,100.0,9.81,1.0e-6,1.0e-6,1,0,samosAT,0.155,0,0.222,0.43,0.05,4.13,4000.0,10,0.5,0.3,5,5000,0,0,0.001,data/avaHockeyChannel,ent,1.0,1.0,0.3,release2HS,DEM_HS_Topo.asc,0|1,1.0|1.0,0,0.3,entrainment1HS,release2HS_3d519adab0_ent_dfa,19612,155.03456139564514,32.37144923210144,18.5411593914032,25.223523139953613,14.236824750900269,63.41783571243286,1,4001 0dcd58fc86,ent,dfa,ppr|pft|pfv,1,random,True,,12345,False,False,10.0,0.1,2,0.1,1.001,100,4,0.275,False,200,100,True,,,False,,False,False,True,,,,True,,,,0.1,400,False,0.02,kinEnergy,0.01,0.01,1,0.001,5,1,MPPDH,1250,0.25,5,15,-1.5,0,1.5,0.41,2,0.25,2.5,0.25,5,2,0.05,5,0.001,True,1,0,5,0.001,100.0,9.81,1e-06,1e-06,1,0,samosAT,0.155,0,0.222,0.43,0.05,4.13,4000.0,10,0.5,0.3,5,5000,0,0,0.001,data/avaHockeyChannel,ent,1.0,,0.3,release1HS,DEM_HS_Topo.asc,0,1.0,0,0.3,entrainment1HS,release1HS_0dcd58fc86_ent_dfa,15877,145.86187648773193,18.60938024520874,50.177650928497314,16.1723210811615,10.682985067367554,49.1968560218811,1,3017 diff --git a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/release1HS_0dcd58fc86_ent_dfa.ini b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/release1HS_0dcd58fc86_ent_dfa.ini index 4f136237e..efc940b55 100644 --- a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/release1HS_0dcd58fc86_ent_dfa.ini +++ b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/release1HS_0dcd58fc86_ent_dfa.ini @@ -20,18 +20,18 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = relThRangeVariation = addStandardConfig = False relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entThRangeVariation = entTh = diff --git a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/release2HS_3d519adab0_ent_dfa.ini b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/release2HS_3d519adab0_ent_dfa.ini index 17488db14..c6691f987 100644 --- a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/release2HS_3d519adab0_ent_dfa.ini +++ b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/release2HS_3d519adab0_ent_dfa.ini @@ -20,18 +20,18 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = relThRangeVariation = addStandardConfig = False relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entThRangeVariation = entTh = diff --git a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release1HS_18_08_2022_08_58_40.ini b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release1HS_18_08_2022_08_58_40.ini index 445cb456e..91d757e05 100644 --- a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release1HS_18_08_2022_08_58_40.ini +++ b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release1HS_18_08_2022_08_58_40.ini @@ -20,18 +20,18 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = relThRangeVariation = addStandardConfig = False relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entThRangeVariation = entTh = diff --git a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release2HS_18_08_2022_09_01_17.ini b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release2HS_18_08_2022_09_01_17.ini index beee45a35..ee1bf2fff 100644 --- a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release2HS_18_08_2022_09_01_17.ini +++ b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release2HS_18_08_2022_09_01_17.ini @@ -20,18 +20,18 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = relThRangeVariation = addStandardConfig = False relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entThRangeVariation = entTh = diff --git a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/release1HS_com1DFACfg.ini b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/release1HS_com1DFACfg.ini index 2c87d6902..1dd226d19 100644 --- a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/release1HS_com1DFACfg.ini +++ b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/release1HS_com1DFACfg.ini @@ -20,18 +20,18 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = relThRangeVariation = addStandardConfig = False relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entThRangeVariation = entTh = diff --git a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/release2HS_com1DFACfg.ini b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/release2HS_com1DFACfg.ini index ffdaddabe..c402531b9 100644 --- a/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/release2HS_com1DFACfg.ini +++ b/benchmarks/avaHockeyChannelPytest/Outputs/com1DFA/release2HS_com1DFACfg.ini @@ -20,18 +20,18 @@ additionallyFixedFactor = 0.275 ftOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = True +relThFromFile = True relThPercentVariation = relThRangeVariation = addStandardConfig = False relTh = relThFromFile = False secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelThRangeVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entThRangeVariation = entTh = diff --git a/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelProbAna_com1DFACfg.ini b/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelProbAna_com1DFACfg.ini index 20ee5f790..e39c456e8 100644 --- a/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelProbAna_com1DFACfg.ini +++ b/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelProbAna_com1DFACfg.ini @@ -16,19 +16,19 @@ simTypeList = ent #+++++Release thickness++++ # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = False +relThFromFile = False # if a variation on relTh shall be performed add here +- percent and number of steps separated by $ # for example relThPercentVariation=50$10 relThPercentVariation = -# release thickness (only considered if relThFromShp=False) +# release thickness (only considered if relThFromFile=False) relTh = 1.25 #+++++Entrainment thickness++++ # True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file -entThFromShp = False +entThFromFile = False # if a variation on entTh shall be performed add here +- percent and number of steps separated by $ # for example entThPercentVariation=50$10 entThPercentVariation = -# entrainment thickness (only considered if entThFromShp=False) +# entrainment thickness (only considered if entThFromFile=False) entTh = 0.3 diff --git a/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelProbAna_probAnaCfg.ini b/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelProbAna_probAnaCfg.ini index 85c04effa..c59623b72 100644 --- a/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelProbAna_probAnaCfg.ini +++ b/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelProbAna_probAnaCfg.ini @@ -65,19 +65,19 @@ simTypeList = ent #+++++Release thickness++++ # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = False +relThFromFile = False # if a variation on relTh shall be performed add here +- percent and number of steps separated by $ # for example relThPercentVariation=50$10 relThPercentVariation = -# release thickness (only considered if relThFromShp=False) +# release thickness (only considered if relThFromFile=False) relTh = 1.25 #+++++Entrainment thickness++++ # True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file -entThFromShp = False +entThFromFile = False # if a variation on entTh shall be performed add here +- percent and number of steps separated by $ # for example entThPercentVariation=50$10 entThPercentVariation = -# entrainment thickness (only considered if entThFromShp=False) +# entrainment thickness (only considered if entThFromFile=False) entTh = 0.3 releaseScenario = release1HS diff --git a/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelStats_com1DFACfg.ini b/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelStats_com1DFACfg.ini index 75bf138f2..11cf25d1a 100644 --- a/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelStats_com1DFACfg.ini +++ b/benchmarks/avaHockeyChannelStatsTest/avaHockeyChannelStats_com1DFACfg.ini @@ -10,30 +10,30 @@ simTypeList = ent #+++++Release thickness++++ # True if release thickness should be read from shapefile file; if False - relTh read from ini file -relThFromShp = True +relThFromFile = True # if a variation on relTh shall be performed add here +- percent and number of steps separated by $ # for example relThPercentVariation=50$10 relThPercentVariation = 40$10 -# release thickness (only considered if relThFromShp=False) +# release thickness (only considered if relThFromFile=False) relTh = #0.75000|0.80000|0.85000|0.90000|0.95000|1.00000|1.05000|1.10000|1.15000|1.20000|1.25000|1.30000|1.35000|1.40000|1.45000|1.50000|1.55000|1.60000|1.65000|1.70000|1.75000 #+++++Secondary release thickness+++++ # if secRelArea is True - add secondary release area secRelArea = False # True if release thickness should be read from shapefile file; if False - secondaryRelTh read from ini file -secondaryRelThFromShp = True +secondaryRelThFromFile = True # if a variation on secondaryRelTh shall be performed add here +- percent and number of steps separated by $ # for example secondaryRelThPercentVariation=50$10 secondaryRelThPercentVariation = -# secondary area release thickness (only considered if secondaryRelThFromShp=False) +# secondary area release thickness (only considered if secondaryRelThFromFile=False) secondaryRelTh = #+++++Entrainment thickness++++ # True if entrainment thickness should be read from shapefile file; if False - entTh read from ini file -entThFromShp = False +entThFromFile = False # if a variation on entTh shall be performed add here +- percent and number of steps separated by $ # for example entThPercentVariation=50$10 entThPercentVariation = -# entrainment thickness (only considered if entThFromShp=False) +# entrainment thickness (only considered if entThFromFile=False) entTh = 0.3 [INPUT] diff --git a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/allConfigurations.csv b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/allConfigurations.csv index c929adec6..21c31d511 100644 --- a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/allConfigurations.csv +++ b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/allConfigurations.csv @@ -1,4 +1,4 @@ -,simTypeList,modelType,resType,tSteps,initPartDistType,initialiseParticlesFromFile,particleFile,seed,iniStep,subgridMixingFactorIni,dtIni,sphOptionIni,stopCritIni,stopCritIniSmall,maxIterations,bufferZoneFactor,additionallyFixedFactor,fdOptionIni,rho,rhoEnt,relThFromShp,relThPercentVariation,relTh,secRelArea,secondaryRelThFromShp,secondaryRelThPercentVariation,secondaryRelTh,entThFromShp,entThPercentVariation,entTh,dt,tEnd,cflTimeStepping,cMax,cflIterConstant,constrainCFL,maxdT,mindT,stopCritType,uFlowingThreshold,stopCrit,sphOption,minRKern,sphKernelRadius,viscOption,massPerParticleDeterminationMethod,massPerPart,deltaTh,nPPK,splitOption,thresholdMassSplit,distSplitPart,nSplit,cMinNPPK,cMaxNPPK,cMinMass,cMaxnMass,interpOption,hmin,meshCellSize,meshCellSizeThreshold,methodMeshNormal,distReproj,reprojectionIterations,thresholdProjection,subgridMixingFactor,gravAcc,velMagMin,depMin,curvAcceleration,explicitFriction,frictModel,mu,Rs0,kappa,R,B,xsi,hRes,cw,dRes,sres,entEroEnergy,entShearResistance,entDefResistance,thresholdPointInPoly,avalancheDir,simTypeActual,releaseScenario,DEM,simName,timeLoop,timeForce,timeForceSPH,timePos,timeNeigh,timeField,nSave,nIter +,simTypeList,modelType,resType,tSteps,initPartDistType,initialiseParticlesFromFile,particleFile,seed,iniStep,subgridMixingFactorIni,dtIni,sphOptionIni,stopCritIni,stopCritIniSmall,maxIterations,bufferZoneFactor,additionallyFixedFactor,fdOptionIni,rho,rhoEnt,relThFromFile,relThPercentVariation,relTh,secRelArea,secondaryRelThFromFile,secondaryRelThPercentVariation,secondaryRelTh,entThFromFile,entThPercentVariation,entTh,dt,tEnd,cflTimeStepping,cMax,cflIterConstant,constrainCFL,maxdT,mindT,stopCritType,uFlowingThreshold,stopCrit,sphOption,minRKern,sphKernelRadius,viscOption,massPerParticleDeterminationMethod,massPerPart,deltaTh,nPPK,splitOption,thresholdMassSplit,distSplitPart,nSplit,cMinNPPK,cMaxNPPK,cMinMass,cMaxnMass,interpOption,hmin,meshCellSize,meshCellSizeThreshold,methodMeshNormal,distReproj,reprojectionIterations,thresholdProjection,subgridMixingFactor,gravAcc,velMagMin,depMin,curvAcceleration,explicitFriction,frictModel,mu,Rs0,kappa,R,B,xsi,hRes,cw,dRes,sres,entEroEnergy,entShearResistance,entDefResistance,thresholdPointInPoly,avalancheDir,simTypeActual,releaseScenario,DEM,simName,timeLoop,timeForce,timeForceSPH,timePos,timeNeigh,timeField,nSave,nIter c4f3a000c3,null,dfa,ppr|pft|pfv,1,random,False,,12345,False,10.0,0.1,2,0.1,1.001,100,4,0.275,False,200,100,False,,0.5,False,True,,,True,,,0.1,400,False,0.5,5,False,0.5,0.01,kinEnergy,0.01,0.01,1,0.001,5,1,MPPDH,1250,0.25,15,0,1.5,0.41,2,0.25,2.5,0.25,5,2,0.05,5,0.001,1,0,5,0.001,100.0,9.81,1.0e-6,1.0e-6,1,0,samosAT,0.155,0.222,0.43,0.05,4.13,4000.0,10,0.5,0.3,5,5000,0,0,0.001,data/avaParabola,null,release1PF,DEM_PF_Topo,release1PF_c4f3a000c3_null_dfa,62.63506054878235,7.457179069519043,7.648268222808838,5.335877418518066,6.066819429397583,35.604883909225464,1,2193 e4d351eb71,null,dfa,ppr|pft|pfv,1,random,False,,12345,False,10.0,0.1,2,0.1,1.001,100,4,0.275,False,200,100,False,,0.75,False,True,,,True,,,0.1,400,False,0.5,5,False,0.5,0.01,kinEnergy,0.01,0.01,1,0.001,5,1,MPPDH,1250,0.25,15,0,1.5,0.41,2,0.25,2.5,0.25,5,2,0.05,5,0.001,1,0,5,0.001,100.0,9.81,1.0e-6,1.0e-6,1,0,samosAT,0.155,0.222,0.43,0.05,4.13,4000.0,10,0.5,0.3,5,5000,0,0,0.001,data/avaParabola,null,release1PF,DEM_PF_Topo,release1PF_e4d351eb71_null_dfa,62.611611127853394,8.575473308563232,10.750654935836792,5.99947452545166,5.267404317855835,31.578212022781372,1,1841 50041bb354,null,dfa,ppr|pft|pfv,1,random,False,,12345,False,10.0,0.1,2,0.1,1.001,100,4,0.275,False,200,100,False,,1.25,False,True,,,True,,,0.1,400,False,0.5,5,False,0.5,0.01,kinEnergy,0.01,0.01,1,0.001,5,1,MPPDH,1250,0.25,15,0,1.5,0.41,2,0.25,2.5,0.25,5,2,0.05,5,0.001,1,0,5,0.001,100.0,9.81,1.0e-6,1.0e-6,1,0,samosAT,0.155,0.222,0.43,0.05,4.13,4000.0,10,0.5,0.3,5,5000,0,0,0.001,data/avaParabola,null,release1PF,DEM_PF_Topo,release1PF_50041bb354_null_dfa,58.81793284416199,10.340409517288208,16.709107160568237,7.100708961486816,4.181110620498657,20.100829124450684,1,1357 diff --git a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_50041bb354_null_dfa.ini b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_50041bb354_null_dfa.ini index f9829dc6f..2c5fed25b 100644 --- a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_50041bb354_null_dfa.ini +++ b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_50041bb354_null_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 fdOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = relTh = 1.25 secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_c4f3a000c3_null_dfa.ini b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_c4f3a000c3_null_dfa.ini index 7bfffd8c7..e94521de9 100644 --- a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_c4f3a000c3_null_dfa.ini +++ b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_c4f3a000c3_null_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 fdOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = relTh = 0.5 secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_e4d351eb71_null_dfa.ini b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_e4d351eb71_null_dfa.ini index fe839d7aa..7a00eed65 100644 --- a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_e4d351eb71_null_dfa.ini +++ b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/release1PF_e4d351eb71_null_dfa.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 fdOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = relTh = 0.75 secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release1PF_10_01_2022_14_55_30.ini b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release1PF_10_01_2022_14_55_30.ini index a8b8d0150..de0b45e86 100644 --- a/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release1PF_10_01_2022_14_55_30.ini +++ b/benchmarks/avaParabolaStatsTest/Outputs/com1DFA/configurationFiles/sourceConfiguration_release1PF_10_01_2022_14_55_30.ini @@ -19,14 +19,14 @@ additionallyFixedFactor = 0.275 fdOptionIni = False rho = 200 rhoEnt = 100 -relThFromShp = False +relThFromFile = False relThPercentVariation = relTh = 0.50000|0.75000|1.25000 secRelArea = False -secondaryRelThFromShp = True +secondaryRelThFromFile = True secondaryRelThPercentVariation = secondaryRelTh = -entThFromShp = True +entThFromFile = True entThPercentVariation = entTh = dt = 0.1 diff --git a/benchmarks/avaParabolaStatsTest/avaParabolaProbAna_com1DFACfg.ini b/benchmarks/avaParabolaStatsTest/avaParabolaProbAna_com1DFACfg.ini index 09f9b0004..4adaa4a86 100644 --- a/benchmarks/avaParabolaStatsTest/avaParabolaProbAna_com1DFACfg.ini +++ b/benchmarks/avaParabolaStatsTest/avaParabolaProbAna_com1DFACfg.ini @@ -8,7 +8,7 @@ # list of simulations that shall be performed (null, ent, res, entres, available (use all available input data)) simTypeList = null -relThFromShp = False +relThFromFile = False # release thickness relTh = 0.50000|0.75000|1.25000 diff --git a/benchmarks/avaParabolaVarParTest/avaParabolaVarPar_com1DFACfg.ini b/benchmarks/avaParabolaVarParTest/avaParabolaVarPar_com1DFACfg.ini index e709062f5..dd8ac6df5 100644 --- a/benchmarks/avaParabolaVarParTest/avaParabolaVarPar_com1DFACfg.ini +++ b/benchmarks/avaParabolaVarParTest/avaParabolaVarPar_com1DFACfg.ini @@ -10,5 +10,5 @@ simTypeList = res #+++++++++SNOW properties # release thickness -relThFromShp = False +relThFromFile = False relTh = 0.5