Index: DamFailureMechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStability.exe =================================================================== diff -u -r878 -r1048 Binary files differ Index: DamFailureMechanisms/damMacroStability/trunk/src/Tests/Files/ReadFolder/TestBishop.std =================================================================== diff -u -r878 -r1048 --- DamFailureMechanisms/damMacroStability/trunk/src/Tests/Files/ReadFolder/TestBishop.std (.../TestBishop.std) (revision 878) +++ DamFailureMechanisms/damMacroStability/trunk/src/Tests/Files/ReadFolder/TestBishop.std (.../TestBishop.std) (revision 1048) @@ -1,20 +1,20 @@ Dump file for D-Geo Stability : Stability of earth slopes. ============================================================================== -COMPANY : +COMPANY : Stichting Deltares -DATE : 11-09-2017 -TIME : 18:30:28 -FILENAME : D:\src\dam\dam failuremechanisms\damMacroStability\trunk\src\Tests\Files\ReadFolder\Test1.std -CREATED BY : D-Geo Stability version 17.1.1.1 +DATE : 29-01-2018 +TIME : 17:33:11 +FILENAME : D:\src\dam\DamFailureMechanisms\damMacroStability\trunk\src\Tests\Files\ReadFolder\TestBishop.std +CREATED BY : D-Geo Stability version 18.1.1.3 ========================== BEGINNING OF DATA ========================== [Input Data] [VERSION] Soil=1003 Geometry=1000 StressCurve=1000 BondStressDiagram=1000 -YieldStress=1000 -D-Geo Stability=1007 +YieldStress=1001 +D-Geo Stability=1008 [END OF VERSION] [SOIL COLLECTION] @@ -528,6 +528,7 @@ dijkvak Ophemert, Hm 63 - 64 profiel aan de norm +[END OF RUN IDENTIFICATION TITLES] [MODEL] 1 : Bishop 1 : C phi @@ -542,46 +543,56 @@ Use potential file 0 : Do not use water net of MSeep file 0 : Do not make negative pressures 0 +[END OF MSEEPNET] [FORBIDDEN LINES] 1 - Forbidden lines 1 8.50 17.30 - X1 Y1 19.50 12.30 - X2 Y2 +[END OF FORBIDDEN LINES] [UNIT WEIGHT WATER] 9.81 : Unit weight water +[END OF UNIT WEIGHT WATER] [DEGREE OF CONSOLIDATION] 3 Number of layers 3 100 2 100 100 1 100 100 100 0 capillary water not included -[degree Temporary loads] +[END OF DEGREE OF CONSOLIDATION] +[DEGREE TEMPORARY LOADS] 100 0 0 0 capillary water not included -[degree Free water(Cu)] +[END OF DEGREE TEMPORARY LOADS] +[DEGREE EARTH QUAKE] 100 100 100 -[degree earth quake] - 100 100 100 +[END OF DEGREE EARTH QUAKE] [CIRCLES] 21.556 32.691 11 X-direction 15.092 28.850 11 Y-direction 11.064 5.064 7 Tangent lines 0.000 0.000 0 no fixed point used +[END OF CIRCLES] [SPENCER SLIP DATA] 0 Number of points +[END OF SPENCER SLIP DATA] [SPENCER SLIP DATA 2] 0 Number of points +[END OF SPENCER SLIP DATA 2] [SPENCER SLIP INTERVAL] 2 : Slip spencer interval +[END OF SPENCER SLIP INTERVAL] [LINE LOADS] 0 = number of items -[UNIFORM LOADS ] +[END OF LINE LOADS] +[UNIFORM LOADS] 1 = number of items verkeer 13.00 = magnitude 6.00 8.50 = xstart and xend 0.00 = distribution angle 1 = permanent load +[END OF UNIFORM LOADS] [TREE ON SLOPE] 0.00 = WindForce 0.00 = XCoordinate @@ -593,6 +604,7 @@ 0.000 = horizontal acceleration 0.000 = vertical acceleration 0.000 = free water moment factor +[END OF EARTH QUAKE] [SIGMA-TAU CURVES] 0 = number of items [END OF SIGMA-TAU CURVES] @@ -606,14 +618,16 @@ [END OF MEASURED YIELD STRESSES] [MINIMAL REQUIRED CIRCLE DEPTH] 5.00 [m] -[Slip Circle Selection] +[END OF MINIMAL REQUIRED CIRCLE DEPTH] +[SLIP CIRCLE SELECTION] IsMinXEntryUsed=0 IsMaxXEntryUsed=0 XEntryMin=0.00 XEntryMax=0.00 -[End of Slip Circle Selection] +[END OF SLIP CIRCLE SELECTION] [START VALUE SAFETY FACTOR] 1.000 [-] +[END OF START VALUE SAFETY FACTOR] [REFERENCE LEVEL SU] 16.000 Excavation gamma above freatic level 18.000 Excavation gamma below freatic level @@ -642,6 +656,7 @@ 12.840 16.288 3 Y-direction Right 7.900 7.900 1 Y-direction tangent lines 0 Automatic grid calculation (1) +[END OF LIFT SLIP DATA] [EXTERNAL WATER LEVELS] 0 = No water data used 0.00 = Design level @@ -656,6 +671,7 @@ 3 3 = Pl-top and pl-bottom 2 3 = Pl-top and pl-bottom 99 2 = Pl-top and pl-bottom +[END OF EXTERNAL WATER LEVELS] [MODEL FACTOR] 1.00 = Limit value stability factor 0.08 = Standard deviation for limit value stability factor @@ -664,6 +680,7 @@ 0 = Use contribution of end section 0.00 = Lateral stress ratio 0.25 = Coefficient of variation contribution edge of section +[END OF MODEL FACTOR] [CALCULATION OPTIONS] MoveCalculationGrid=1 ProbCalculationType=2 @@ -731,6 +748,7 @@ 0.50 = Remolding reduction factor 0.80 = Schematization reduction factor 1 Overtopping condition less or equal 0.1 l/m/s +[END OF NEWZONE PLOT DATA] [HORIZONTAL BALANCE] HorizontalBalanceXLeft=0.000 HorizontalBalanceXRight=0.000 @@ -740,10 +758,13 @@ [END OF HORIZONTAL BALANCE] [REQUESTED CIRCLE SLICES] 30 = number of slices +[END OF REQUESTED CIRCLE SLICES] [REQUESTED LIFT SLICES] 50 = number of slices +[END OF REQUESTED LIFT SLICES] [REQUESTED SPENCER SLICES] 50 = number of slices +[END OF REQUESTED SPENCER SLICES] [SOIL RESISTANCE] SoilResistanceDowelAction=1 SoilResistancePullOut=1 @@ -1221,7 +1242,7 @@ Dump name [End of Column Indication] [Data] - 1.276 34 18.216 21.971 12.907 6.183 26.091 Design level +1.276059 34 18.216 21.971 12.907 6.183 26.091 Design level [End of Data] [End Of Dump Header] [SliceGeometry] Index: DamFailureMechanisms/damMacroStability/trunk/src/Tests/Files/ReadFolder/TestUpliftVan.std =================================================================== diff -u -r878 -r1048 --- DamFailureMechanisms/damMacroStability/trunk/src/Tests/Files/ReadFolder/TestUpliftVan.std (.../TestUpliftVan.std) (revision 878) +++ DamFailureMechanisms/damMacroStability/trunk/src/Tests/Files/ReadFolder/TestUpliftVan.std (.../TestUpliftVan.std) (revision 1048) @@ -1,20 +1,20 @@ Dump file for D-Geo Stability : Stability of earth slopes. ============================================================================== -COMPANY : +COMPANY : Stichting Deltares -DATE : 11-09-2017 -TIME : 18:35:16 -FILENAME : D:\src\dam\dam failuremechanisms\damMacroStability\trunk\src\Tests\Files\ReadFolder\Test2.std -CREATED BY : D-Geo Stability version 17.1.1.1 +DATE : 29-01-2018 +TIME : 17:33:15 +FILENAME : D:\src\dam\DamFailureMechanisms\damMacroStability\trunk\src\Tests\Files\ReadFolder\TestUpliftVan.std +CREATED BY : D-Geo Stability version 18.1.1.3 ========================== BEGINNING OF DATA ========================== [Input Data] [VERSION] Soil=1003 Geometry=1000 StressCurve=1000 BondStressDiagram=1000 -YieldStress=1000 -D-Geo Stability=1007 +YieldStress=1001 +D-Geo Stability=1008 [END OF VERSION] [SOIL COLLECTION] @@ -528,6 +528,7 @@ dijkvak Ophemert, Hm 63 - 64 profiel aan de norm +[END OF RUN IDENTIFICATION TITLES] [MODEL] 4 : Uplift Van 1 : C phi @@ -542,46 +543,56 @@ Use potential file 0 : Do not use water net of MSeep file 0 : Do not make negative pressures 0 +[END OF MSEEPNET] [FORBIDDEN LINES] 1 - Forbidden lines 1 8.50 17.30 - X1 Y1 19.50 12.30 - X2 Y2 +[END OF FORBIDDEN LINES] [UNIT WEIGHT WATER] 9.81 : Unit weight water +[END OF UNIT WEIGHT WATER] [DEGREE OF CONSOLIDATION] 3 Number of layers 3 100 2 100 100 1 100 100 100 0 capillary water not included -[degree Temporary loads] +[END OF DEGREE OF CONSOLIDATION] +[DEGREE TEMPORARY LOADS] 100 0 0 0 capillary water not included -[degree Free water(Cu)] +[END OF DEGREE TEMPORARY LOADS] +[DEGREE EARTH QUAKE] 100 100 100 -[degree earth quake] - 100 100 100 +[END OF DEGREE EARTH QUAKE] [CIRCLES] 21.556 32.691 11 X-direction 15.092 28.850 11 Y-direction 11.064 5.064 7 Tangent lines 0.000 0.000 0 no fixed point used +[END OF CIRCLES] [SPENCER SLIP DATA] 0 Number of points +[END OF SPENCER SLIP DATA] [SPENCER SLIP DATA 2] 0 Number of points +[END OF SPENCER SLIP DATA 2] [SPENCER SLIP INTERVAL] 2 : Slip spencer interval +[END OF SPENCER SLIP INTERVAL] [LINE LOADS] 0 = number of items -[UNIFORM LOADS ] +[END OF LINE LOADS] +[UNIFORM LOADS] 1 = number of items verkeer 13.00 = magnitude 6.00 8.50 = xstart and xend 0.00 = distribution angle 1 = permanent load +[END OF UNIFORM LOADS] [TREE ON SLOPE] 0.00 = WindForce 0.00 = XCoordinate @@ -593,6 +604,7 @@ 0.000 = horizontal acceleration 0.000 = vertical acceleration 0.000 = free water moment factor +[END OF EARTH QUAKE] [SIGMA-TAU CURVES] 0 = number of items [END OF SIGMA-TAU CURVES] @@ -606,14 +618,16 @@ [END OF MEASURED YIELD STRESSES] [MINIMAL REQUIRED CIRCLE DEPTH] 5.00 [m] -[Slip Circle Selection] +[END OF MINIMAL REQUIRED CIRCLE DEPTH] +[SLIP CIRCLE SELECTION] IsMinXEntryUsed=0 IsMaxXEntryUsed=0 XEntryMin=0.00 XEntryMax=0.00 -[End of Slip Circle Selection] +[END OF SLIP CIRCLE SELECTION] [START VALUE SAFETY FACTOR] 1.000 [-] +[END OF START VALUE SAFETY FACTOR] [REFERENCE LEVEL SU] 16.000 Excavation gamma above freatic level 18.000 Excavation gamma below freatic level @@ -649,6 +663,8 @@ 7.000 8.000 9.000 +[END OF MULTIPLE LIFT TANGENTS] +[END OF LIFT SLIP DATA] [EXTERNAL WATER LEVELS] 0 = No water data used 0.00 = Design level @@ -663,6 +679,7 @@ 3 3 = Pl-top and pl-bottom 2 3 = Pl-top and pl-bottom 99 2 = Pl-top and pl-bottom +[END OF EXTERNAL WATER LEVELS] [MODEL FACTOR] 1.00 = Limit value stability factor 0.08 = Standard deviation for limit value stability factor @@ -671,6 +688,7 @@ 0 = Use contribution of end section 0.00 = Lateral stress ratio 0.25 = Coefficient of variation contribution edge of section +[END OF MODEL FACTOR] [CALCULATION OPTIONS] MoveCalculationGrid=1 ProbCalculationType=2 @@ -738,6 +756,7 @@ 0.50 = Remolding reduction factor 0.80 = Schematization reduction factor 1 Overtopping condition less or equal 0.1 l/m/s +[END OF NEWZONE PLOT DATA] [HORIZONTAL BALANCE] HorizontalBalanceXLeft=0.000 HorizontalBalanceXRight=0.000 @@ -747,10 +766,13 @@ [END OF HORIZONTAL BALANCE] [REQUESTED CIRCLE SLICES] 30 = number of slices +[END OF REQUESTED CIRCLE SLICES] [REQUESTED LIFT SLICES] 50 = number of slices +[END OF REQUESTED LIFT SLICES] [REQUESTED SPENCER SLICES] 50 = number of slices +[END OF REQUESTED SPENCER SLICES] [SOIL RESISTANCE] SoilResistanceDowelAction=1 SoilResistancePullOut=1 @@ -1113,7 +1135,7 @@ Dump name [End of Column Indication] [Data] - 1.287 55 17.500 21.250 12.250 17.500 15.625 6.625 5.904 23.046 Design level +1.287372 55 17.500 21.250 12.250 17.500 15.625 6.625 5.904 23.046 Design level [End of Data] [End Of Dump Header] [SliceGeometry] @@ -1400,7 +1422,7 @@ [End of Dump] [CALCULATION TIME] -00:00:03 +00:00:05 [END OF CALCULATION TIME] [End of Dump File] Index: DamFailureMechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs =================================================================== diff -u -r890 -r1048 --- DamFailureMechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs (.../DGeoStabilityExeRunnerTests.cs) (revision 890) +++ DamFailureMechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs (.../DGeoStabilityExeRunnerTests.cs) (revision 1048) @@ -32,6 +32,7 @@ private const string NormalTestFile = @"zuivering Gendt.sti"; private const string NormalTestFile2 = @"zuivering Gendt 2.sti"; private const string TestFolder = @"..\..\Tests\Files"; + private const string TestReadFolder = @"..\..\Tests\Files\ReadFolder"; private const string RunFolder = @"..\..\Tests\Files\RunFolder"; private DGeoStabilityExeRunner runner; @@ -172,7 +173,7 @@ [Test] public void TestDoesNotThrowExceptionFolderExists() { - runner.RunDGeoStabilityProject(TestFolder); + runner.RunDGeoStabilityProject(TestReadFolder); } [Test]