Renaming of FromShp to FromFiles in the ini files

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

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

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 = {

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

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

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]

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

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

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

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

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

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

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

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

avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_07be8871e8_C_L_null_dfa.ini

@@ -20,21 +20,21 @@ additionallyFixedFactor = 0.275
 ftOptionIni = False
 rho = 200
 rhoEnt = 100
-relThFromShp = False
+relThFromFile = False
 relThPercentVariation = 
 relThRangeVariation = 
 relThRangeFromCiVariation = 
 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 = 

avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_64efc0ac09_C_M_null_dfa.ini

@@ -20,21 +20,21 @@ additionallyFixedFactor = 0.275
 ftOptionIni = False
 rho = 200
 rhoEnt = 100
-relThFromShp = False
+relThFromFile = False
 relThPercentVariation = 
 relThRangeVariation = 
 relThRangeFromCiVariation = 
 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 = 

avaframe/tests/data/avaProbTest/Outputs/com1DFA/configurationFiles/relAlr_9b5718b494_C_M_null_dfa.ini

@@ -20,21 +20,21 @@ additionallyFixedFactor = 0.275
 ftOptionIni = False
 rho = 200
 rhoEnt = 100
-relThFromShp = False
+relThFromFile = False
 relThPercentVariation = 
 relThRangeVariation = 
 relThRangeFromCiVariation = 
 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 = 

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