From cf3bca16bf23fcb6f94fe287866e408c6e0f0308 Mon Sep 17 00:00:00 2001 From: zantDelta Date: Thu, 26 Oct 2023 16:00:20 +0200 Subject: [PATCH] #154 Also set factors to default in template and bm1-1 for combinations that are not available in GUI. --- .../dsheetpiling/templates/input.shi.j2 | 34 +++++++++---------- .../dsheetpiling/benchmarks/bm1-1.shi | 34 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/geolib/models/dsheetpiling/templates/input.shi.j2 b/geolib/models/dsheetpiling/templates/input.shi.j2 index db805eb7..3cc4e688 100644 --- a/geolib/models/dsheetpiling/templates/input.shi.j2 +++ b/geolib/models/dsheetpiling/templates/input.shi.j2 @@ -537,7 +537,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.350 @@ -555,7 +555,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.000 OverallStabilityFactorTgPhi=1.000 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.000 [END OF PARTIAL FACTORS EUROCODE DA1 SET1] [PARTIAL FACTORS EUROCODE DA1 SET2] @@ -564,7 +564,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.300 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -582,7 +582,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.250 OverallStabilityFactorTgPhi=1.250 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.300 [END OF PARTIAL FACTORS EUROCODE DA1 SET2] [PARTIAL FACTORS EUROCODE DA2] @@ -591,7 +591,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.350 @@ -609,7 +609,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.000 OverallStabilityFactorTgPhi=1.000 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.100 [END OF PARTIAL FACTORS EUROCODE DA2] [PARTIAL FACTORS EUROCODE DA3] @@ -636,7 +636,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.250 OverallStabilityFactorTgPhi=1.250 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.000 [END OF PARTIAL FACTORS EUROCODE DA3] [PARTIAL FACTORS EC7 NL 0] @@ -753,7 +753,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.350 @@ -771,7 +771,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.000 OverallStabilityFactorTgPhi=1.000 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.000 [END OF PARTIAL FACTORS EC7 BE SET1] [PARTIAL FACTORS EC7 BE SET2] @@ -780,7 +780,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.100 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -798,7 +798,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.250 OverallStabilityFactorTgPhi=1.250 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.300 [END OF PARTIAL FACTORS EC7 BE SET2] [PARTIAL FACTORS CUR I] @@ -807,7 +807,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -825,7 +825,7 @@ OverallStabilityFactorDrivingMoment=0.900 OverallStabilityFactorCohesion=1.500 OverallStabilityFactorTgPhi=1.200 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.200 [END OF PARTIAL FACTORS CUR I] [PARTIAL FACTORS CUR II] @@ -834,7 +834,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -852,7 +852,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.500 OverallStabilityFactorTgPhi=1.200 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.200 [END OF PARTIAL FACTORS CUR II] [PARTIAL FACTORS CUR III] @@ -861,7 +861,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.250 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -879,7 +879,7 @@ OverallStabilityFactorDrivingMoment=1.100 OverallStabilityFactorCohesion=1.500 OverallStabilityFactorTgPhi=1.200 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.200 [END OF PARTIAL FACTORS CUR III] [END OF CALCULATION OPTIONS] diff --git a/tests/test_data/dsheetpiling/benchmarks/bm1-1.shi b/tests/test_data/dsheetpiling/benchmarks/bm1-1.shi index cb5cc124..6cf95fdb 100644 --- a/tests/test_data/dsheetpiling/benchmarks/bm1-1.shi +++ b/tests/test_data/dsheetpiling/benchmarks/bm1-1.shi @@ -316,7 +316,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.350 @@ -334,7 +334,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.000 OverallStabilityFactorTgPhi=1.000 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.000 [END OF PARTIAL FACTORS EUROCODE DA1 SET1] [PARTIAL FACTORS EUROCODE DA1 SET2] @@ -343,7 +343,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.300 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -361,7 +361,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.250 OverallStabilityFactorTgPhi=1.250 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.300 [END OF PARTIAL FACTORS EUROCODE DA1 SET2] [PARTIAL FACTORS EUROCODE DA2] @@ -370,7 +370,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.350 @@ -388,7 +388,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.000 OverallStabilityFactorTgPhi=1.000 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.100 [END OF PARTIAL FACTORS EUROCODE DA2] [PARTIAL FACTORS EUROCODE DA3] @@ -415,7 +415,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.250 OverallStabilityFactorTgPhi=1.250 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.000 [END OF PARTIAL FACTORS EUROCODE DA3] [PARTIAL FACTORS EC7 NL 0] @@ -532,7 +532,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.350 @@ -550,7 +550,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.000 OverallStabilityFactorTgPhi=1.000 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.000 [END OF PARTIAL FACTORS EC7 BE SET1] [PARTIAL FACTORS EC7 BE SET2] @@ -559,7 +559,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.100 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -577,7 +577,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.250 OverallStabilityFactorTgPhi=1.250 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.300 [END OF PARTIAL FACTORS EC7 BE SET2] [PARTIAL FACTORS CUR I] @@ -586,7 +586,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -604,7 +604,7 @@ OverallStabilityFactorDrivingMoment=0.900 OverallStabilityFactorCohesion=1.500 OverallStabilityFactorTgPhi=1.200 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.200 [END OF PARTIAL FACTORS CUR I] [PARTIAL FACTORS CUR II] @@ -613,7 +613,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.000 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -631,7 +631,7 @@ OverallStabilityFactorDrivingMoment=1.000 OverallStabilityFactorCohesion=1.500 OverallStabilityFactorTgPhi=1.200 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.200 [END OF PARTIAL FACTORS CUR II] [PARTIAL FACTORS CUR III] @@ -640,7 +640,7 @@ LoadFactorPermFav=1.000 LoadFactorVarUnfav=1.250 LoadFactorVarFav=0.000 ConstructLoadFactorPermFav=1.000 -ConstructLoadFactorVarFav=0.000 +ConstructLoadFactorVarFav=1.000 ConstructLoadFactorPermUnfavCalc=1.000 ConstructLoadFactorVarUnfavCalc=1.000 EffectFactor=1.000 @@ -658,7 +658,7 @@ OverallStabilityFactorDrivingMoment=1.100 OverallStabilityFactorCohesion=1.500 OverallStabilityFactorTgPhi=1.200 OverallStabilityFactorUnitWeight=1.000 -FactorRepValuesMDPmax=0.000 +FactorRepValuesMDPmax=1.000 VerticalBalanceGammaMb=1.200 [END OF PARTIAL FACTORS CUR III] [END OF CALCULATION OPTIONS]