Skip to content

Commit

Permalink
#154 Also set factors to default in template and bm1-1 for combinatio…
Browse files Browse the repository at this point in the history 
…ns that are not available in GUI.
  • Loading branch information
@zantDelta
zantDelta committed Oct 26, 2023
1 parent 5226229 commit cf3bca1
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
34 changes: 17 additions & 17 deletions geolib/models/dsheetpiling/templates/input.shi.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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]
Expand Down Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand Down
34 changes: 17 additions & 17 deletions tests/test_data/dsheetpiling/benchmarks/bm1-1.shi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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]
Expand Down Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand Down

0 comments on commit cf3bca1

Please sign in to comment.