Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt.sti =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt.sti (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt.sti (revision 407) @@ -0,0 +1,768 @@ +Input file for D-Geo Stability : Stability of earth slopes. +============================================================================== +COMPANY : Stichting Deltares +LICENSE : Unknown +DATE : 16-Jul-14 +TIME : 18:12:21 +FILENAME : C:\src\delftgeosystems\branches\DAM 14.1\data\Dam\MStabFiles\zuivering Gendt.sti +CREATED BY : D-Geo Stability version 14.1.1.3 +========================== BEGINNING OF DATA ========================== +[VERSION] +Soil=1001 +Geometry=1000 +StressCurve=1000 +BondStressDiagram=1000 +D-Geo Stability=1004 +[END OF VERSION] + +[SOIL COLLECTION] + 3 = number of items +[SOIL] +zand +SoilColor=9764853 +SoilSoilType=2 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=19.50 +SoilGamWet=19.50 +SoilRestSlope=0 +SoilCohesion=0.00 +SoilPhi=30.00 +SoilDilatancy=30.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName= +SoilBondStressTableName= +SoilMatStrengthType=0 +SoilProbInputValues=0 +SoilRatioCuPc=0.22 +SoilPc=0.00E+00 +StrengthIncreaseExponent=0.70 +SoilPOP=10.00 +SoilRheologicalCoefficient=0.00 +xCoorSoilPc=-100.000 +yCoorSoilPc=-100.000 +IsPopCalculated=0 +IsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=0 +SoilStdCohesion=0.00 +SoilStdPhi=3.57 +SoilStdRatioCuPc=0.06 +SoilStdRatioCuPcPassive=0.06 +SoilStdRatioCuPcActive=0.06 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=1.50 +SoilDistCohesion=3 +SoilDistPhi=3 +SoilDistStressTable=3 +SoilDistRatioCuPc=3 +SoilDistRatioCuPcPassive=3 +SoilDistRatioCuPcActive=3 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +SoilDistPn=3 +SoilCorrelationCPhi=0.00 +SoilRatioCuPcPassive=0.22 +SoilRatioCuPcActive=0.22 +SoilCuPassiveTop=0.00 +SoilCuPassiveBottom=0.00 +SoilCuActiveTop=0.00 +SoilCuActiveBottom=0.00 +SoilUniformRatioCuPc=1 +SoilUniformCu=1 +SoilDesignPartialCohesion=1.25 +SoilDesignStdCohesion=-1.65 +SoilDesignPartialPhi=1.10 +SoilDesignStdPhi=-1.65 +SoilDesignPartialStressTable=1.15 +SoilDesignStdStressTable=-1.65 +SoilDesignPartialRatioCuPc=1.15 +SoilDesignStdRatioCuPc=-1.65 +SoilDesignPartialCu=1.15 +SoilDesignStdCu=-1.65 +SoilDesignPartialPOP=1.10 +SoilDesignStdPOP=-1.65 +SoilDesignPartialRRatio=1.00 +SoilDesignStdRRatio=0.00 +SoilSoilGroup=0 +SoilStdPOP=1.00 +SoilDistPOP=3 +SoilHorFluctScaleCoh=50.00 +SoilVertFluctScaleCoh=0.25 +SoilNumberOfTestsCoh=1 +SoilVarianceRatioCoh=0.75 +SoilHorFluctScalePhi=50.00 +SoilVertFluctScalePhi=0.25 +SoilNumberOfTestsPhi=1 +SoilVarianceRatioPhi=0.75 +SoilRRatio=1.0000000 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +[END OF SOIL] +[SOIL] +klei +SoilColor=5953498 +SoilSoilType=2 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=14.50 +SoilGamWet=14.50 +SoilRestSlope=0 +SoilCohesion=2.00 +SoilPhi=18.00 +SoilDilatancy=21.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName= +SoilBondStressTableName= +SoilMatStrengthType=0 +SoilProbInputValues=0 +SoilRatioCuPc=0.22 +SoilPc=0.00E+00 +StrengthIncreaseExponent=0.70 +SoilPOP=10.00 +SoilRheologicalCoefficient=0.00 +xCoorSoilPc=-100.000 +yCoorSoilPc=-100.000 +IsPopCalculated=0 +IsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=0 +SoilStdCohesion=1.00 +SoilStdPhi=2.67 +SoilStdRatioCuPc=0.06 +SoilStdRatioCuPcPassive=0.06 +SoilStdRatioCuPcActive=0.06 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=2.50 +SoilDistCohesion=3 +SoilDistPhi=3 +SoilDistStressTable=3 +SoilDistRatioCuPc=3 +SoilDistRatioCuPcPassive=3 +SoilDistRatioCuPcActive=3 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +SoilDistPn=3 +SoilCorrelationCPhi=0.00 +SoilRatioCuPcPassive=0.22 +SoilRatioCuPcActive=0.22 +SoilCuPassiveTop=0.00 +SoilCuPassiveBottom=0.00 +SoilCuActiveTop=0.00 +SoilCuActiveBottom=0.00 +SoilUniformRatioCuPc=1 +SoilUniformCu=1 +SoilDesignPartialCohesion=1.25 +SoilDesignStdCohesion=-1.65 +SoilDesignPartialPhi=1.10 +SoilDesignStdPhi=-1.65 +SoilDesignPartialStressTable=1.15 +SoilDesignStdStressTable=-1.65 +SoilDesignPartialRatioCuPc=1.15 +SoilDesignStdRatioCuPc=-1.65 +SoilDesignPartialCu=1.15 +SoilDesignStdCu=-1.65 +SoilDesignPartialPOP=1.10 +SoilDesignStdPOP=-1.65 +SoilDesignPartialRRatio=1.00 +SoilDesignStdRRatio=0.00 +SoilSoilGroup=0 +SoilStdPOP=1.00 +SoilDistPOP=3 +SoilHorFluctScaleCoh=50.00 +SoilVertFluctScaleCoh=0.25 +SoilNumberOfTestsCoh=1 +SoilVarianceRatioCoh=0.75 +SoilHorFluctScalePhi=50.00 +SoilVertFluctScalePhi=0.25 +SoilNumberOfTestsPhi=1 +SoilVarianceRatioPhi=0.75 +SoilRRatio=1.0000000 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +[END OF SOIL] +[SOIL] +nw dijks +SoilColor=9094655 +SoilSoilType=2 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=16.50 +SoilGamWet=16.50 +SoilRestSlope=0 +SoilCohesion=0.00 +SoilPhi=22.50 +SoilDilatancy=27.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName= +SoilBondStressTableName= +SoilMatStrengthType=0 +SoilProbInputValues=0 +SoilRatioCuPc=0.22 +SoilPc=0.00E+00 +StrengthIncreaseExponent=0.70 +SoilPOP=10.00 +SoilRheologicalCoefficient=0.00 +xCoorSoilPc=-100.000 +yCoorSoilPc=-100.000 +IsPopCalculated=0 +IsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=0 +SoilStdCohesion=0.00 +SoilStdPhi=4.00 +SoilStdRatioCuPc=0.06 +SoilStdRatioCuPcPassive=0.06 +SoilStdRatioCuPcActive=0.06 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=1.50 +SoilDistCohesion=3 +SoilDistPhi=3 +SoilDistStressTable=3 +SoilDistRatioCuPc=3 +SoilDistRatioCuPcPassive=3 +SoilDistRatioCuPcActive=3 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +SoilDistPn=3 +SoilCorrelationCPhi=0.00 +SoilRatioCuPcPassive=0.22 +SoilRatioCuPcActive=0.22 +SoilCuPassiveTop=0.00 +SoilCuPassiveBottom=0.00 +SoilCuActiveTop=0.00 +SoilCuActiveBottom=0.00 +SoilUniformRatioCuPc=1 +SoilUniformCu=1 +SoilDesignPartialCohesion=1.25 +SoilDesignStdCohesion=-1.65 +SoilDesignPartialPhi=1.10 +SoilDesignStdPhi=-1.65 +SoilDesignPartialStressTable=1.15 +SoilDesignStdStressTable=-1.65 +SoilDesignPartialRatioCuPc=1.15 +SoilDesignStdRatioCuPc=-1.65 +SoilDesignPartialCu=1.15 +SoilDesignStdCu=-1.65 +SoilDesignPartialPOP=1.10 +SoilDesignStdPOP=-1.65 +SoilDesignPartialRRatio=1.00 +SoilDesignStdRRatio=0.00 +SoilSoilGroup=0 +SoilStdPOP=1.00 +SoilDistPOP=3 +SoilHorFluctScaleCoh=50.00 +SoilVertFluctScaleCoh=0.25 +SoilNumberOfTestsCoh=1 +SoilVarianceRatioCoh=0.75 +SoilHorFluctScalePhi=50.00 +SoilVertFluctScalePhi=0.25 +SoilNumberOfTestsPhi=1 +SoilVarianceRatioPhi=0.75 +SoilRRatio=1.0000000 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +[END OF SOIL] +[END OF SOIL COLLECTION] + +[GEOMETRY DATA] +[ACCURACY] + 0.0010 +[END OF ACCURACY] + +[POINTS] + 33 - Number of geometry points - + 1 -150.000 8.700 0.000 + 2 -88.668 8.700 0.000 + 3 -30.272 9.500 0.000 + 4 -25.000 10.450 0.000 + 5 -14.000 12.000 0.000 + 6 2.000 17.300 0.000 + 7 8.500 17.300 0.000 + 8 19.500 12.300 0.000 + 9 29.000 11.500 0.000 + 10 33.800 11.300 0.000 + 11 37.000 9.700 0.000 + 12 40.000 9.700 0.000 + 13 42.600 11.000 0.000 + 14 53.258 10.750 0.000 + 15 70.000 10.750 0.000 + 16 -14.187 10.000 0.000 + 17 4.000 11.000 0.000 + 18 8.500 11.000 0.000 + 19 -150.000 5.900 0.000 + 20 70.000 5.900 0.000 + 21 -150.000 -10.000 0.000 + 22 70.000 -10.000 0.000 + 23 -150.000 6.500 0.000 + 24 -14.000 6.500 0.000 + 25 2.000 14.000 0.000 + 26 10.500 14.000 0.000 + 27 19.500 11.300 0.000 + 28 34.000 10.000 0.000 + 29 70.000 10.000 0.000 + 30 -30.293 6.500 0.000 + 31 20.000 7.600 0.000 + 32 37.000 8.300 0.000 + 33 70.000 8.300 0.000 +[END OF POINTS] + +[CURVES] + 30 - Number of curves - + 1 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 1 2 + 2 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 2 3 + 3 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 3 4 + 4 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 4 5 + 5 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 5 6 + 6 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 6 7 + 7 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 7 8 + 8 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 8 9 + 9 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 9 10 + 10 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 10 11 + 11 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 11 12 + 12 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 12 13 + 13 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 13 14 + 14 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 14 15 + 15 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 3 16 + 16 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 16 17 + 17 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 17 18 + 18 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 18 8 + 19 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 19 20 + 20 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 21 22 + 21 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 23 24 + 22 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 24 25 + 23 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 25 26 + 24 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 26 27 + 25 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 27 28 + 26 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 28 29 + 27 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 23 30 + 28 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 30 31 + 29 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 31 32 + 30 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 32 33 +[END OF CURVES] + +[BOUNDARIES] + 4 - Number of boundaries - + 0 - Boundary number + 1 - number of curves on boundary, next line(s) are curvenumbers + 20 + 1 - Boundary number + 1 - number of curves on boundary, next line(s) are curvenumbers + 19 + 2 - Boundary number + 13 - number of curves on boundary, next line(s) are curvenumbers + 1 2 15 16 17 18 8 9 10 11 + 12 13 14 + 3 - Boundary number + 14 - number of curves on boundary, next line(s) are curvenumbers + 1 2 3 4 5 6 7 8 9 10 + 11 12 13 14 +[END OF BOUNDARIES] + +[USE PROBABILISTIC DEFAULTS BOUNDARIES] + 4 - Number of boundaries - + 1 + 1 + 1 + 1 +[END OF USE PROBABILISTIC DEFAULTS BOUNDARIES] + +[STDV BOUNDARIES] + 4 - Number of boundaries - + 0.00000000000000E+0000 + 0.00000000000000E+0000 + 0.00000000000000E+0000 + 0.00000000000000E+0000 +[END OF STDV BOUNDARIES] + +[DISTRIBUTION BOUNDARIES] + 4 - Number of boundaries - + 0 + 0 + 0 + 0 +[END OF DISTRIBUTION BOUNDARIES] + +[PIEZO LINES] + 2 - Number of piezometric level lines - + 1 - PlLine number + 6 - number of curves on PlLine, next line(s) are curvenumbers + 21 22 23 24 25 26 + 2 - PlLine number + 4 - number of curves on PlLine, next line(s) are curvenumbers + 27 28 29 30 +[END OF PIEZO LINES] + +[PHREATIC LINE] + 1 - Number of the piezometric level line acting as phreatic line - +[END OF PHREATIC LINE] + +[WORLD CO-ORDINATES] + 0.000 - X world 1 - + 0.000 - Y world 1 - + 0.000 - X world 2 - + 0.000 - Y world 2 - +[END OF WORLD CO-ORDINATES] + +[LAYERS] + 3 - Number of layers - + 1 - Layer number, next line is material of layer + zand + 2 - Piezometric level line at top of layer + 2 - Piezometric level line at bottom of layer + 1 - Boundarynumber at top of layer + 0 - Boundarynumber at bottom of layer + 2 - Layer number, next line is material of layer + klei + 99 - Piezometric level line at top of layer + 99 - Piezometric level line at bottom of layer + 2 - Boundarynumber at top of layer + 1 - Boundarynumber at bottom of layer + 3 - Layer number, next line is material of layer + nw dijks + 1 - Piezometric level line at top of layer + 99 - Piezometric level line at bottom of layer + 3 - Boundarynumber at top of layer + 2 - Boundarynumber at bottom of layer +[END OF LAYERS] + +[LAYERLOADS] + - Layers which are loads - + +[END OF LAYERLOADS] + +[END OF GEOMETRY DATA] +[RUN IDENTIFICATION TITLES] +dijkvak Ophemert, Hm 63 - 64 +profiel aan de norm + +[MODEL] + 1 : Bishop + 1 : C phi + 0 : Probabilistic off + 1 : Mean + 1 : Geotextiles on + 1 : Nails on + 0 : Zone plot off + 0 : Local measurements +[END OF MODEL] +[MSEEPNET] + Use potential file + 0 : Do not use water net of MSeep file + 0 : Do not make negative pressures 0 +[FORBIDDEN LINES] + 1 - Forbidden lines + 1 + 8.50 17.30 - X1 Y1 + 19.50 12.30 - X2 Y2 +[UNIT WEIGHT WATER] + 9.81 : 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] + 100 0 0 + 0 capillary water not included +[degree Free water(Cu)] + 100 100 100 +[degree earth quake] + 100 100 100 +[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 +[SPENCER SLIP DATA] + 0 Number of points +[SPENCER SLIP DATA 2] + 0 Number of points +[SPENCER SLIP INTERVAL] + 2 : Slip spencer interval +[LINE LOADS] + 0 = number of items +[UNIFORM LOADS ] + 1 = number of items +verkeer + 13.00 = magnitude + 6.00 8.50 = xstart and xend + 0.00 = distribution angle + 1 = permanent load +[TREE ON SLOPE] +0.00 = WindForce +0.00 = XCoordinate +0.00 = YCoordinate +10.00 = width of root zone +0.0 = AngleOfDistribution +[END OF TREE ON SLOPE] +[EARTH QUAKE] + 0.000 = horizontal acceleration + 0.000 = vertical acceleration + 0.000 = free water moment factor +[SIGMA-TAU CURVES] + 0 = number of items +[END OF SIGMA-TAU CURVES] +[BOND STRESS DIAGRAMS] + 0 = number of items +[END OF BOND STRESS DIAGRAMS] +[MINIMAL REQUIRED CIRCLE DEPTH] + 5.00 [m] +[Slip Circle Selection] +IsMinXEntryUsed=0 +IsMaxXEntryUsed=0 +XEntryMin=0.00 +XEntryMax=0.00 +[End of Slip Circle Selection] +[START VALUE SAFETY FACTOR] + 1.000 [-] +[REFERENCE LEVEL CU] + 6 +[LIFT SLIP DATA] + 23.196 33.196 6 X-direction Left + 16.802 26.802 6 Y-direction Left + 47.043 51.227 3 X-direction Right + 12.840 16.288 3 Y-direction Right + 7.900 7.900 1 Y-direction tangent lines + 0 Automatic grid calculation (1) +[EXTERNAL WATER LEVELS] + 0 = No water data used + 0.00 = Design level + 0.30 = Decimate height + 1 norm = 1/10000 + 1 = number of items +Water data (1) + 1 = Phreatic line + 0.00 = Level + Piezo lines + 3 - Number of layers + 3 3 = Pl-top and pl-bottom + 2 3 = Pl-top and pl-bottom + 99 2 = Pl-top and pl-bottom +[MODEL FACTOR] + 1.00 = Limit value stability factor + 0.08 = Standard deviation for limit value stability factor + 0.00 = Reference standard deviation for degree of consolidation + 100.00 = Length of the section + 0 = Use contribution of end section + 0.00 = Lateral stress ratio + 0.25 = Coefficient of variation contribution edge of section +[CALCULATION OPTIONS] +MoveCalculationGrid=1 +ProbCalculationType=2 +SearchMethod=0 +[END OF CALCULATION OPTIONS] +[PROBABILISTIC DEFAULTS] +CohesionVariationTotal=0.25 +CohesionDesignPartial=1.25 +CohesionDesignStdDev=-1.65 +CohesionDistribution=3 +PhiVariationTotal=0.15 +PhiDesignPartial=1.10 +PhiDesignStdDev=-1.65 +PhiDistribution=3 +StressTableVariationTotal=0.20 +StressTableDesignPartial=1.15 +StressTableDesignStdDev=-1.65 +StressTableDistribution=3 +RatioCuPcVariationTotal=0.25 +RatioCuPcDesignPartial=1.15 +RatioCuPcDesignStdDev=-1.65 +RatioCuPcDistribution=3 +CuVariationTotal=0.25 +CuDesignPartial=1.15 +CuDesignStdDev=-1.65 +CuDistribution=3 +POPVariationTotal=0.10 +POPDesignPartial=1.10 +POPDesignStdDev=-1.65 +POPDistribution=3 +CompressionRatioVariationTotal=0.25 +CompressionRatioDesignPartial=1.00 +CompressionRatioDesignStdDev=0.00 +CompressionRatioDistribution=3 +ConsolidationCoefTotalStdDev=0.20 +ConsolidationCoefDesignPartial=1.00 +ConsolidationCoefDesignStdDev=1.65 +ConsolidationCoefDistribution=2 +HydraulicPressureTotalStdDev=0.50 +HydraulicPressureDesignPartial=1.00 +HydraulicPressureDesignStdDev=1.65 +HydraulicPressureDistribution=3 +LimitValueBishopMean=1.00 +LimitValueBishopStdDev=0.08 +LimitValueBishopDistribution=3 +LimitValueVanMean=0.95 +LimitValueVanStdDev=0.08 +LimitValueVanDistribution=3 +[END OF PROBABILISTIC DEFAULTS] +[NEWZONE PLOT DATA] + 0.00 = Diketable Height [m] + 3.00 = Width top rest profile [m] + 0.00 = X co-ordinate indicating start of zone [m] + 0.00 = Boundary of M.H.W influence at X [m] + 0.00 = Boundary of M.H.W influence at Y [m] + 1.19 = Required safety in zone 1a + 1.11 = Required safety in zone 1b + 1.00 = Required safety in zone 2a + 1.00 = Required safety in zone 2b + 0.00 = Left side minimum road [m] + 0.00 = Right side minimum road [m] + 0.90 = Required safety in zone 3a + 0.90 = Required safety in zone 3b + 1 Stability calculation at right side + 0.50 = Remolding reduction factor + 0.80 = Schematization reduction factor + 1 Overtopping condition less or equal 0.1 l/m/s +[HORIZONTAL BALANCE] +HorizontalBalanceXLeft=0.000 +HorizontalBalanceXRight=0.000 +HorizontalBalanceYTop=0.00 +HorizontalBalanceYBottom=0.00 +HorizontalBalanceNYInterval=1 +[END OF HORIZONTAL BALANCE] +[REQUESTED CIRCLE SLICES] + 30 = number of slices +[REQUESTED LIFT SLICES] + 50 = number of slices +[REQUESTED SPENCER SLICES] + 50 = number of slices +[SOIL RESISTANCE] +SoilResistanceDowelAction=1 +SoilResistancePullOut=1 +[END OF SOIL RESISTANCE] +[GENETIC ALGORITHM OPTIONS BISHOP] +PopulationCount=30 +GenerationCount=30 +EliteCount=2 +MutationRate=0.200 +CrossOverScatterFraction=1.000 +CrossOverSinglePointFraction=0.000 +CrossOverDoublePointFraction=0.000 +MutationJumpFraction=1.000 +MutationCreepFraction=0.000 +MutationInverseFraction=0.000 +MutationCreepReduction=0.050 +[END OF GENETIC ALGORITHM OPTIONS BISHOP] +[GENETIC ALGORITHM OPTIONS LIFTVAN] +PopulationCount=30 +GenerationCount=60 +EliteCount=2 +MutationRate=0.200 +CrossOverScatterFraction=1.000 +CrossOverSinglePointFraction=0.000 +CrossOverDoublePointFraction=0.000 +MutationJumpFraction=1.000 +MutationCreepFraction=0.000 +MutationInverseFraction=0.000 +MutationCreepReduction=0.050 +[END OF GENETIC ALGORITHM OPTIONS LIFTVAN] +[GENETIC ALGORITHM OPTIONS SPENCER] +PopulationCount=50 +GenerationCount=50 +EliteCount=2 +MutationRate=0.300 +CrossOverScatterFraction=0.000 +CrossOverSinglePointFraction=0.700 +CrossOverDoublePointFraction=0.300 +MutationJumpFraction=0.000 +MutationCreepFraction=0.900 +MutationInverseFraction=0.100 +MutationCreepReduction=0.050 +[END OF GENETIC ALGORITHM OPTIONS SPENCER] +[MODEL SPECIAL] +IsAlternativeStrength=0 +IsAdditionalPorePressure=0 +[END OF MODEL SPECIAL] +[NAIL TYPE DEFAULTS] +NailTypeLengthNail=0.00 +NailTypeDiameterNail=0.00 +NailTypeDiameterGrout=0.00 +NailTypeYieldForceNail=0.00 +NailTypePlasticMomentNail=0.00 +NailTypeBendingStiffnessNail=0.00E+00 +NailTypeUseFacingOrBearingPlate=0 +[END OF NAIL TYPE DEFAULTS] +[END OF INPUT FILE] Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunner.cs =================================================================== diff -u -r393 -r407 --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunner.cs (.../DGeoStabilityExeRunner.cs) (revision 393) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunner.cs (.../DGeoStabilityExeRunner.cs) (revision 407) @@ -1,11 +1,8 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; +using Deltares.DamMacroStability.Calculator.Properties; namespace Deltares.DamMacroStability.Calculator { @@ -27,23 +24,36 @@ /// name of the input file or folder public void RunDGeoStabilityProject(string project) { - // ThrowHelper.ThrowIfStringArgumentNullOrEmpty(projectFilePath, StringResourceNames.ProjectFileNameNullOrEmpty); - // ThrowHelper.ThrowIfFileNotExist(projectFilePath, StringResourceNames.ProjectFileNotExist); - // ThrowHelper.ThrowIfFileNotExist(MStabExePath, StringResourceNames.MStabExecutableFileNameNotFound); + if (string.IsNullOrEmpty(project) || project.Trim() == "") + { + throw new ArgumentException(string.Format( + Resources.DGeoStabilityExeRunner_RunDGeoStabilityProject_ProjectNameNullOrEmpty, project)); + } - // try - // { - // Compute the project files - ProcessRun(project); - // } - // catch (ArgumentNullException argumentNullException) - // { - // throw new StabilityServiceAgentException(argumentNullException.Message, argumentNullException); - // } - // catch (FileNotFoundException outputFileNotFoundException) - // { - // throw new StabilityServiceAgentException(outputFileNotFoundException.Message, outputFileNotFoundException); - // } + if (!File.Exists(project) && (!Directory.Exists(project))) + { + throw new FileNotFoundException(string.Format( + Resources.DGeoStabilityExeRunner_RunDGeoStabilityProject_ProjectNotExist, project)); + } + + if (!File.Exists(DGeoStabilityExePath)) + { + throw new FileNotFoundException(string.Format( + Resources.DGeoStabilityExeRunner_RunDGeoStabilityProject_ExecutableNotFound, DGeoStabilityExePath)); + } + + try + { + ProcessRun(project); + } + catch (ArgumentNullException argumentNullException) + { + throw new DGeoStabilityExeRunnerException(argumentNullException.Message, argumentNullException); + } + catch (FileNotFoundException fileNotFoundException) + { + throw new DGeoStabilityExeRunnerException(fileNotFoundException.Message, fileNotFoundException); + } } /// @@ -54,11 +64,10 @@ /// if a foldername is specified, all the stability files in the folder will be calculated. private void ProcessRun(string folderOrFileName) { - string mStabIniFilename = ""; - mStabIniFilename = CreateDGeoStabilityIniFile(folderOrFileName); + var mStabIniFilename = CreateDGeoStabilityIniFile(folderOrFileName); var argument = ""; - argument = string.Format("/b \"{0}\"", mStabIniFilename); + argument = string.Format("/b {0}", mStabIniFilename); var programpath = ""; programpath = DGeoStabilityExePath; @@ -72,7 +81,6 @@ } }; - // Parallel.KillOnAbort(process); process.Start(); try @@ -92,7 +100,7 @@ } } - private string CreateDGeoStabilityIniFile(string inputName) + internal string CreateDGeoStabilityIniFile(string inputName) { string filename = Path.GetTempFileName(); filename = Path.ChangeExtension(filename, "ini"); @@ -101,20 +109,20 @@ var isDirectoryBatchCalculation = Directory.Exists(inputName); if (isDirectoryBatchCalculation) { - newIniContent += System.Environment.NewLine + "Path=" + inputName; - newIniContent += System.Environment.NewLine + "Filespec=*.sti"; + newIniContent += Environment.NewLine + "Path=" + inputName; + newIniContent += Environment.NewLine + "Filespec=*.sti"; } else { - newIniContent += System.Environment.NewLine + "InputFileName=" + inputName; + newIniContent += Environment.NewLine + "InputFileName=" + inputName; } - newIniContent += System.Environment.NewLine + "Plot Critical Circle=1"; - newIniContent += System.Environment.NewLine + "PlotWMF=1"; - newIniContent += System.Environment.NewLine + "PlotJPeg=1"; + newIniContent += Environment.NewLine + "Plot Critical Circle=1"; + newIniContent += Environment.NewLine + "PlotWMF=1"; + newIniContent += Environment.NewLine + "PlotJPeg=1"; if (File.Exists(defaultIniFilename)) { string iniContent = File.ReadAllText(defaultIniFilename); - newIniContent += System.Environment.NewLine + System.Environment.NewLine + iniContent; + newIniContent += Environment.NewLine + Environment.NewLine + iniContent; }; File.WriteAllText(filename, newIniContent); return filename; Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt 2.sti =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt 2.sti (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/zuivering Gendt 2.sti (revision 407) @@ -0,0 +1,768 @@ +Input file for D-Geo Stability : Stability of earth slopes. +============================================================================== +COMPANY : Stichting Deltares +LICENSE : Unknown +DATE : 16-Jul-14 +TIME : 18:12:21 +FILENAME : C:\src\delftgeosystems\branches\DAM 14.1\data\Dam\MStabFiles\zuivering Gendt.sti +CREATED BY : D-Geo Stability version 14.1.1.3 +========================== BEGINNING OF DATA ========================== +[VERSION] +Soil=1001 +Geometry=1000 +StressCurve=1000 +BondStressDiagram=1000 +D-Geo Stability=1004 +[END OF VERSION] + +[SOIL COLLECTION] + 3 = number of items +[SOIL] +zand +SoilColor=9764853 +SoilSoilType=2 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=19.50 +SoilGamWet=19.50 +SoilRestSlope=0 +SoilCohesion=0.00 +SoilPhi=30.00 +SoilDilatancy=30.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName= +SoilBondStressTableName= +SoilMatStrengthType=0 +SoilProbInputValues=0 +SoilRatioCuPc=0.22 +SoilPc=0.00E+00 +StrengthIncreaseExponent=0.70 +SoilPOP=10.00 +SoilRheologicalCoefficient=0.00 +xCoorSoilPc=-100.000 +yCoorSoilPc=-100.000 +IsPopCalculated=0 +IsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=0 +SoilStdCohesion=0.00 +SoilStdPhi=3.57 +SoilStdRatioCuPc=0.06 +SoilStdRatioCuPcPassive=0.06 +SoilStdRatioCuPcActive=0.06 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=1.50 +SoilDistCohesion=3 +SoilDistPhi=3 +SoilDistStressTable=3 +SoilDistRatioCuPc=3 +SoilDistRatioCuPcPassive=3 +SoilDistRatioCuPcActive=3 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +SoilDistPn=3 +SoilCorrelationCPhi=0.00 +SoilRatioCuPcPassive=0.22 +SoilRatioCuPcActive=0.22 +SoilCuPassiveTop=0.00 +SoilCuPassiveBottom=0.00 +SoilCuActiveTop=0.00 +SoilCuActiveBottom=0.00 +SoilUniformRatioCuPc=1 +SoilUniformCu=1 +SoilDesignPartialCohesion=1.25 +SoilDesignStdCohesion=-1.65 +SoilDesignPartialPhi=1.10 +SoilDesignStdPhi=-1.65 +SoilDesignPartialStressTable=1.15 +SoilDesignStdStressTable=-1.65 +SoilDesignPartialRatioCuPc=1.15 +SoilDesignStdRatioCuPc=-1.65 +SoilDesignPartialCu=1.15 +SoilDesignStdCu=-1.65 +SoilDesignPartialPOP=1.10 +SoilDesignStdPOP=-1.65 +SoilDesignPartialRRatio=1.00 +SoilDesignStdRRatio=0.00 +SoilSoilGroup=0 +SoilStdPOP=1.00 +SoilDistPOP=3 +SoilHorFluctScaleCoh=50.00 +SoilVertFluctScaleCoh=0.25 +SoilNumberOfTestsCoh=1 +SoilVarianceRatioCoh=0.75 +SoilHorFluctScalePhi=50.00 +SoilVertFluctScalePhi=0.25 +SoilNumberOfTestsPhi=1 +SoilVarianceRatioPhi=0.75 +SoilRRatio=1.0000000 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +[END OF SOIL] +[SOIL] +klei +SoilColor=5953498 +SoilSoilType=2 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=14.50 +SoilGamWet=14.50 +SoilRestSlope=0 +SoilCohesion=2.00 +SoilPhi=18.00 +SoilDilatancy=21.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName= +SoilBondStressTableName= +SoilMatStrengthType=0 +SoilProbInputValues=0 +SoilRatioCuPc=0.22 +SoilPc=0.00E+00 +StrengthIncreaseExponent=0.70 +SoilPOP=10.00 +SoilRheologicalCoefficient=0.00 +xCoorSoilPc=-100.000 +yCoorSoilPc=-100.000 +IsPopCalculated=0 +IsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=0 +SoilStdCohesion=1.00 +SoilStdPhi=2.67 +SoilStdRatioCuPc=0.06 +SoilStdRatioCuPcPassive=0.06 +SoilStdRatioCuPcActive=0.06 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=2.50 +SoilDistCohesion=3 +SoilDistPhi=3 +SoilDistStressTable=3 +SoilDistRatioCuPc=3 +SoilDistRatioCuPcPassive=3 +SoilDistRatioCuPcActive=3 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +SoilDistPn=3 +SoilCorrelationCPhi=0.00 +SoilRatioCuPcPassive=0.22 +SoilRatioCuPcActive=0.22 +SoilCuPassiveTop=0.00 +SoilCuPassiveBottom=0.00 +SoilCuActiveTop=0.00 +SoilCuActiveBottom=0.00 +SoilUniformRatioCuPc=1 +SoilUniformCu=1 +SoilDesignPartialCohesion=1.25 +SoilDesignStdCohesion=-1.65 +SoilDesignPartialPhi=1.10 +SoilDesignStdPhi=-1.65 +SoilDesignPartialStressTable=1.15 +SoilDesignStdStressTable=-1.65 +SoilDesignPartialRatioCuPc=1.15 +SoilDesignStdRatioCuPc=-1.65 +SoilDesignPartialCu=1.15 +SoilDesignStdCu=-1.65 +SoilDesignPartialPOP=1.10 +SoilDesignStdPOP=-1.65 +SoilDesignPartialRRatio=1.00 +SoilDesignStdRRatio=0.00 +SoilSoilGroup=0 +SoilStdPOP=1.00 +SoilDistPOP=3 +SoilHorFluctScaleCoh=50.00 +SoilVertFluctScaleCoh=0.25 +SoilNumberOfTestsCoh=1 +SoilVarianceRatioCoh=0.75 +SoilHorFluctScalePhi=50.00 +SoilVertFluctScalePhi=0.25 +SoilNumberOfTestsPhi=1 +SoilVarianceRatioPhi=0.75 +SoilRRatio=1.0000000 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +[END OF SOIL] +[SOIL] +nw dijks +SoilColor=9094655 +SoilSoilType=2 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=16.50 +SoilGamWet=16.50 +SoilRestSlope=0 +SoilCohesion=0.00 +SoilPhi=22.50 +SoilDilatancy=27.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName= +SoilBondStressTableName= +SoilMatStrengthType=0 +SoilProbInputValues=0 +SoilRatioCuPc=0.22 +SoilPc=0.00E+00 +StrengthIncreaseExponent=0.70 +SoilPOP=10.00 +SoilRheologicalCoefficient=0.00 +xCoorSoilPc=-100.000 +yCoorSoilPc=-100.000 +IsPopCalculated=0 +IsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=0 +SoilStdCohesion=0.00 +SoilStdPhi=4.00 +SoilStdRatioCuPc=0.06 +SoilStdRatioCuPcPassive=0.06 +SoilStdRatioCuPcActive=0.06 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=1.50 +SoilDistCohesion=3 +SoilDistPhi=3 +SoilDistStressTable=3 +SoilDistRatioCuPc=3 +SoilDistRatioCuPcPassive=3 +SoilDistRatioCuPcActive=3 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +SoilDistPn=3 +SoilCorrelationCPhi=0.00 +SoilRatioCuPcPassive=0.22 +SoilRatioCuPcActive=0.22 +SoilCuPassiveTop=0.00 +SoilCuPassiveBottom=0.00 +SoilCuActiveTop=0.00 +SoilCuActiveBottom=0.00 +SoilUniformRatioCuPc=1 +SoilUniformCu=1 +SoilDesignPartialCohesion=1.25 +SoilDesignStdCohesion=-1.65 +SoilDesignPartialPhi=1.10 +SoilDesignStdPhi=-1.65 +SoilDesignPartialStressTable=1.15 +SoilDesignStdStressTable=-1.65 +SoilDesignPartialRatioCuPc=1.15 +SoilDesignStdRatioCuPc=-1.65 +SoilDesignPartialCu=1.15 +SoilDesignStdCu=-1.65 +SoilDesignPartialPOP=1.10 +SoilDesignStdPOP=-1.65 +SoilDesignPartialRRatio=1.00 +SoilDesignStdRRatio=0.00 +SoilSoilGroup=0 +SoilStdPOP=1.00 +SoilDistPOP=3 +SoilHorFluctScaleCoh=50.00 +SoilVertFluctScaleCoh=0.25 +SoilNumberOfTestsCoh=1 +SoilVarianceRatioCoh=0.75 +SoilHorFluctScalePhi=50.00 +SoilVertFluctScalePhi=0.25 +SoilNumberOfTestsPhi=1 +SoilVarianceRatioPhi=0.75 +SoilRRatio=1.0000000 +SoilDistCu=3 +SoilDistCuTop=3 +SoilDistCuGradient=3 +[END OF SOIL] +[END OF SOIL COLLECTION] + +[GEOMETRY DATA] +[ACCURACY] + 0.0010 +[END OF ACCURACY] + +[POINTS] + 33 - Number of geometry points - + 1 -150.000 8.700 0.000 + 2 -88.668 8.700 0.000 + 3 -30.272 9.500 0.000 + 4 -25.000 10.450 0.000 + 5 -14.000 12.000 0.000 + 6 2.000 17.300 0.000 + 7 8.500 17.300 0.000 + 8 19.500 12.300 0.000 + 9 29.000 11.500 0.000 + 10 33.800 11.300 0.000 + 11 37.000 9.700 0.000 + 12 40.000 9.700 0.000 + 13 42.600 11.000 0.000 + 14 53.258 10.750 0.000 + 15 70.000 10.750 0.000 + 16 -14.187 10.000 0.000 + 17 4.000 11.000 0.000 + 18 8.500 11.000 0.000 + 19 -150.000 5.900 0.000 + 20 70.000 5.900 0.000 + 21 -150.000 -10.000 0.000 + 22 70.000 -10.000 0.000 + 23 -150.000 6.500 0.000 + 24 -14.000 6.500 0.000 + 25 2.000 14.000 0.000 + 26 10.500 14.000 0.000 + 27 19.500 11.300 0.000 + 28 34.000 10.000 0.000 + 29 70.000 10.000 0.000 + 30 -30.293 6.500 0.000 + 31 20.000 7.600 0.000 + 32 37.000 8.300 0.000 + 33 70.000 8.300 0.000 +[END OF POINTS] + +[CURVES] + 30 - Number of curves - + 1 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 1 2 + 2 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 2 3 + 3 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 3 4 + 4 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 4 5 + 5 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 5 6 + 6 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 6 7 + 7 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 7 8 + 8 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 8 9 + 9 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 9 10 + 10 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 10 11 + 11 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 11 12 + 12 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 12 13 + 13 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 13 14 + 14 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 14 15 + 15 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 3 16 + 16 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 16 17 + 17 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 17 18 + 18 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 18 8 + 19 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 19 20 + 20 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 21 22 + 21 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 23 24 + 22 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 24 25 + 23 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 25 26 + 24 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 26 27 + 25 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 27 28 + 26 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 28 29 + 27 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 23 30 + 28 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 30 31 + 29 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 31 32 + 30 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 32 33 +[END OF CURVES] + +[BOUNDARIES] + 4 - Number of boundaries - + 0 - Boundary number + 1 - number of curves on boundary, next line(s) are curvenumbers + 20 + 1 - Boundary number + 1 - number of curves on boundary, next line(s) are curvenumbers + 19 + 2 - Boundary number + 13 - number of curves on boundary, next line(s) are curvenumbers + 1 2 15 16 17 18 8 9 10 11 + 12 13 14 + 3 - Boundary number + 14 - number of curves on boundary, next line(s) are curvenumbers + 1 2 3 4 5 6 7 8 9 10 + 11 12 13 14 +[END OF BOUNDARIES] + +[USE PROBABILISTIC DEFAULTS BOUNDARIES] + 4 - Number of boundaries - + 1 + 1 + 1 + 1 +[END OF USE PROBABILISTIC DEFAULTS BOUNDARIES] + +[STDV BOUNDARIES] + 4 - Number of boundaries - + 0.00000000000000E+0000 + 0.00000000000000E+0000 + 0.00000000000000E+0000 + 0.00000000000000E+0000 +[END OF STDV BOUNDARIES] + +[DISTRIBUTION BOUNDARIES] + 4 - Number of boundaries - + 0 + 0 + 0 + 0 +[END OF DISTRIBUTION BOUNDARIES] + +[PIEZO LINES] + 2 - Number of piezometric level lines - + 1 - PlLine number + 6 - number of curves on PlLine, next line(s) are curvenumbers + 21 22 23 24 25 26 + 2 - PlLine number + 4 - number of curves on PlLine, next line(s) are curvenumbers + 27 28 29 30 +[END OF PIEZO LINES] + +[PHREATIC LINE] + 1 - Number of the piezometric level line acting as phreatic line - +[END OF PHREATIC LINE] + +[WORLD CO-ORDINATES] + 0.000 - X world 1 - + 0.000 - Y world 1 - + 0.000 - X world 2 - + 0.000 - Y world 2 - +[END OF WORLD CO-ORDINATES] + +[LAYERS] + 3 - Number of layers - + 1 - Layer number, next line is material of layer + zand + 2 - Piezometric level line at top of layer + 2 - Piezometric level line at bottom of layer + 1 - Boundarynumber at top of layer + 0 - Boundarynumber at bottom of layer + 2 - Layer number, next line is material of layer + klei + 99 - Piezometric level line at top of layer + 99 - Piezometric level line at bottom of layer + 2 - Boundarynumber at top of layer + 1 - Boundarynumber at bottom of layer + 3 - Layer number, next line is material of layer + nw dijks + 1 - Piezometric level line at top of layer + 99 - Piezometric level line at bottom of layer + 3 - Boundarynumber at top of layer + 2 - Boundarynumber at bottom of layer +[END OF LAYERS] + +[LAYERLOADS] + - Layers which are loads - + +[END OF LAYERLOADS] + +[END OF GEOMETRY DATA] +[RUN IDENTIFICATION TITLES] +dijkvak Ophemert, Hm 63 - 64 +profiel aan de norm + +[MODEL] + 1 : Bishop + 1 : C phi + 0 : Probabilistic off + 1 : Mean + 1 : Geotextiles on + 1 : Nails on + 0 : Zone plot off + 0 : Local measurements +[END OF MODEL] +[MSEEPNET] + Use potential file + 0 : Do not use water net of MSeep file + 0 : Do not make negative pressures 0 +[FORBIDDEN LINES] + 1 - Forbidden lines + 1 + 8.50 17.30 - X1 Y1 + 19.50 12.30 - X2 Y2 +[UNIT WEIGHT WATER] + 9.81 : 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] + 100 0 0 + 0 capillary water not included +[degree Free water(Cu)] + 100 100 100 +[degree earth quake] + 100 100 100 +[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 +[SPENCER SLIP DATA] + 0 Number of points +[SPENCER SLIP DATA 2] + 0 Number of points +[SPENCER SLIP INTERVAL] + 2 : Slip spencer interval +[LINE LOADS] + 0 = number of items +[UNIFORM LOADS ] + 1 = number of items +verkeer + 13.00 = magnitude + 6.00 8.50 = xstart and xend + 0.00 = distribution angle + 1 = permanent load +[TREE ON SLOPE] +0.00 = WindForce +0.00 = XCoordinate +0.00 = YCoordinate +10.00 = width of root zone +0.0 = AngleOfDistribution +[END OF TREE ON SLOPE] +[EARTH QUAKE] + 0.000 = horizontal acceleration + 0.000 = vertical acceleration + 0.000 = free water moment factor +[SIGMA-TAU CURVES] + 0 = number of items +[END OF SIGMA-TAU CURVES] +[BOND STRESS DIAGRAMS] + 0 = number of items +[END OF BOND STRESS DIAGRAMS] +[MINIMAL REQUIRED CIRCLE DEPTH] + 5.00 [m] +[Slip Circle Selection] +IsMinXEntryUsed=0 +IsMaxXEntryUsed=0 +XEntryMin=0.00 +XEntryMax=0.00 +[End of Slip Circle Selection] +[START VALUE SAFETY FACTOR] + 1.000 [-] +[REFERENCE LEVEL CU] + 6 +[LIFT SLIP DATA] + 23.196 33.196 6 X-direction Left + 16.802 26.802 6 Y-direction Left + 47.043 51.227 3 X-direction Right + 12.840 16.288 3 Y-direction Right + 7.900 7.900 1 Y-direction tangent lines + 0 Automatic grid calculation (1) +[EXTERNAL WATER LEVELS] + 0 = No water data used + 0.00 = Design level + 0.30 = Decimate height + 1 norm = 1/10000 + 1 = number of items +Water data (1) + 1 = Phreatic line + 0.00 = Level + Piezo lines + 3 - Number of layers + 3 3 = Pl-top and pl-bottom + 2 3 = Pl-top and pl-bottom + 99 2 = Pl-top and pl-bottom +[MODEL FACTOR] + 1.00 = Limit value stability factor + 0.08 = Standard deviation for limit value stability factor + 0.00 = Reference standard deviation for degree of consolidation + 100.00 = Length of the section + 0 = Use contribution of end section + 0.00 = Lateral stress ratio + 0.25 = Coefficient of variation contribution edge of section +[CALCULATION OPTIONS] +MoveCalculationGrid=1 +ProbCalculationType=2 +SearchMethod=0 +[END OF CALCULATION OPTIONS] +[PROBABILISTIC DEFAULTS] +CohesionVariationTotal=0.25 +CohesionDesignPartial=1.25 +CohesionDesignStdDev=-1.65 +CohesionDistribution=3 +PhiVariationTotal=0.15 +PhiDesignPartial=1.10 +PhiDesignStdDev=-1.65 +PhiDistribution=3 +StressTableVariationTotal=0.20 +StressTableDesignPartial=1.15 +StressTableDesignStdDev=-1.65 +StressTableDistribution=3 +RatioCuPcVariationTotal=0.25 +RatioCuPcDesignPartial=1.15 +RatioCuPcDesignStdDev=-1.65 +RatioCuPcDistribution=3 +CuVariationTotal=0.25 +CuDesignPartial=1.15 +CuDesignStdDev=-1.65 +CuDistribution=3 +POPVariationTotal=0.10 +POPDesignPartial=1.10 +POPDesignStdDev=-1.65 +POPDistribution=3 +CompressionRatioVariationTotal=0.25 +CompressionRatioDesignPartial=1.00 +CompressionRatioDesignStdDev=0.00 +CompressionRatioDistribution=3 +ConsolidationCoefTotalStdDev=0.20 +ConsolidationCoefDesignPartial=1.00 +ConsolidationCoefDesignStdDev=1.65 +ConsolidationCoefDistribution=2 +HydraulicPressureTotalStdDev=0.50 +HydraulicPressureDesignPartial=1.00 +HydraulicPressureDesignStdDev=1.65 +HydraulicPressureDistribution=3 +LimitValueBishopMean=1.00 +LimitValueBishopStdDev=0.08 +LimitValueBishopDistribution=3 +LimitValueVanMean=0.95 +LimitValueVanStdDev=0.08 +LimitValueVanDistribution=3 +[END OF PROBABILISTIC DEFAULTS] +[NEWZONE PLOT DATA] + 0.00 = Diketable Height [m] + 3.00 = Width top rest profile [m] + 0.00 = X co-ordinate indicating start of zone [m] + 0.00 = Boundary of M.H.W influence at X [m] + 0.00 = Boundary of M.H.W influence at Y [m] + 1.19 = Required safety in zone 1a + 1.11 = Required safety in zone 1b + 1.00 = Required safety in zone 2a + 1.00 = Required safety in zone 2b + 0.00 = Left side minimum road [m] + 0.00 = Right side minimum road [m] + 0.90 = Required safety in zone 3a + 0.90 = Required safety in zone 3b + 1 Stability calculation at right side + 0.50 = Remolding reduction factor + 0.80 = Schematization reduction factor + 1 Overtopping condition less or equal 0.1 l/m/s +[HORIZONTAL BALANCE] +HorizontalBalanceXLeft=0.000 +HorizontalBalanceXRight=0.000 +HorizontalBalanceYTop=0.00 +HorizontalBalanceYBottom=0.00 +HorizontalBalanceNYInterval=1 +[END OF HORIZONTAL BALANCE] +[REQUESTED CIRCLE SLICES] + 30 = number of slices +[REQUESTED LIFT SLICES] + 50 = number of slices +[REQUESTED SPENCER SLICES] + 50 = number of slices +[SOIL RESISTANCE] +SoilResistanceDowelAction=1 +SoilResistancePullOut=1 +[END OF SOIL RESISTANCE] +[GENETIC ALGORITHM OPTIONS BISHOP] +PopulationCount=30 +GenerationCount=30 +EliteCount=2 +MutationRate=0.200 +CrossOverScatterFraction=1.000 +CrossOverSinglePointFraction=0.000 +CrossOverDoublePointFraction=0.000 +MutationJumpFraction=1.000 +MutationCreepFraction=0.000 +MutationInverseFraction=0.000 +MutationCreepReduction=0.050 +[END OF GENETIC ALGORITHM OPTIONS BISHOP] +[GENETIC ALGORITHM OPTIONS LIFTVAN] +PopulationCount=30 +GenerationCount=60 +EliteCount=2 +MutationRate=0.200 +CrossOverScatterFraction=1.000 +CrossOverSinglePointFraction=0.000 +CrossOverDoublePointFraction=0.000 +MutationJumpFraction=1.000 +MutationCreepFraction=0.000 +MutationInverseFraction=0.000 +MutationCreepReduction=0.050 +[END OF GENETIC ALGORITHM OPTIONS LIFTVAN] +[GENETIC ALGORITHM OPTIONS SPENCER] +PopulationCount=50 +GenerationCount=50 +EliteCount=2 +MutationRate=0.300 +CrossOverScatterFraction=0.000 +CrossOverSinglePointFraction=0.700 +CrossOverDoublePointFraction=0.300 +MutationJumpFraction=0.000 +MutationCreepFraction=0.900 +MutationInverseFraction=0.100 +MutationCreepReduction=0.050 +[END OF GENETIC ALGORITHM OPTIONS SPENCER] +[MODEL SPECIAL] +IsAlternativeStrength=0 +IsAdditionalPorePressure=0 +[END OF MODEL SPECIAL] +[NAIL TYPE DEFAULTS] +NailTypeLengthNail=0.00 +NailTypeDiameterNail=0.00 +NailTypeDiameterGrout=0.00 +NailTypeYieldForceNail=0.00 +NailTypePlasticMomentNail=0.00 +NailTypeBendingStiffnessNail=0.00E+00 +NailTypeUseFacingOrBearingPlate=0 +[END OF NAIL TYPE DEFAULTS] +[END OF INPUT FILE] Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.resx =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.resx (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.resx (revision 407) @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Project name '{0}' is not valid + + + Project '{0}' not found + + + Could not find DGeoStability.exe at location {0} + + \ No newline at end of file Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.Designer.cs =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.Designer.cs (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.Designer.cs (revision 407) @@ -0,0 +1,90 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Deltares.DamMacroStability.Calculator.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Deltares.DamMacroStability.Calculator.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Could not find DGeoStability.exe at location {0}. + /// + internal static string DGeoStabilityExeRunner_RunDGeoStabilityProject_ExecutableNotFound { + get { + return ResourceManager.GetString("DGeoStabilityExeRunner_RunDGeoStabilityProject_ExecutableNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Project name '{0}' is not valid. + /// + internal static string DGeoStabilityExeRunner_RunDGeoStabilityProject_ProjectNameNullOrEmpty { + get { + return ResourceManager.GetString("DGeoStabilityExeRunner_RunDGeoStabilityProject_ProjectNameNullOrEmpty", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Project '{0}' not found. + /// + internal static string DGeoStabilityExeRunner_RunDGeoStabilityProject_ProjectNotExist { + get { + return ResourceManager.GetString("DGeoStabilityExeRunner_RunDGeoStabilityProject_ProjectNotExist", resourceCulture); + } + } + } +} Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileForFolder.txt =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileForFolder.txt (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileForFolder.txt (revision 407) @@ -0,0 +1,6 @@ +[D-Geo Stability batch processing] +Path=..\..\Tests\Files +Filespec=*.sti +Plot Critical Circle=1 +PlotWMF=1 +PlotJPeg=1 \ No newline at end of file Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.resx =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.resx (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.resx (revision 407) @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DGeoStability.exe niet gevonden in {0} + + + Projectnaam '{0}' is niet geldig + + + Project '{0}' niet gevonden + + \ No newline at end of file Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunnerException.cs =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunnerException.cs (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStabilityExeRunnerException.cs (revision 407) @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Deltares.DamMacroStability.Calculator +{ + public class DGeoStabilityExeRunnerException : Exception + { + public DGeoStabilityExeRunnerException() : this("There was an error") { } + public DGeoStabilityExeRunnerException(string message) : base(message) { } + public DGeoStabilityExeRunnerException(string message, Exception inner) : base(message, inner) { } + protected DGeoStabilityExeRunnerException( + System.Runtime.Serialization.SerializationInfo info, + System.Runtime.Serialization.StreamingContext context) + : base(info, context) { } + } +} Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/DGeoStability.exe =================================================================== diff -u Binary files differ Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs =================================================================== diff -u -r393 -r407 --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs (.../DGeoStabilityExeRunnerTests.cs) (revision 393) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Deltares.DamMacroStability.CalculatorTests/DGeoStabilityExeRunnerTests.cs (.../DGeoStabilityExeRunnerTests.cs) (revision 407) @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Deltares.DamMacroStability.Calculator; using NUnit.Framework; @@ -12,8 +8,9 @@ [TestFixture] public class DGeoStabilityExeRunnerTests { -// private const string NormalTestFile = @"..\..\..\data\dam\mstabfiles\zuivering Gendt.sti"; -// private const string BadTestFile = @"..\..\..\data\dam\mstabfiles\BadInputFile.sti"; + private const string NormalTestFile = @"zuivering Gendt.sti"; + private const string NormalTestFile2 = @"zuivering Gendt 2.sti"; + private const string TestFolder = @"..\..\Tests\Files"; private DGeoStabilityExeRunner runner; @@ -23,47 +20,148 @@ runner = new DGeoStabilityExeRunner(); } -// [Test] -// public void CanPerformCalculation() -// { -// var result = agent.ExtractStabilityResults(NormalTestFile); -// Assert.GreaterOrEqual(1.276, result.zone1.safetyFactor); -// } -// -// [Test] -// [ExpectedException(typeof(FileNotFoundException))] -// public void ThrowsFileExceptionUsingProjectFileThatNotExists() -// { -// agent.ExtractStabilityResults("teG1_ute7st.sti"); -// } -// -// [Test] -// [ExpectedException(typeof(ArgumentException))] -// public void ThrowsExceptionWhenProjectFileIsEmpty() -// { -// agent.ExtractStabilityResults(""); -// } -// -// [Test] -// [ExpectedException(typeof(ArgumentException))] -// public void ThrowsExceptionWhenProjectFileNameContainsOnlySpaces() -// { -// agent.ExtractStabilityResults(" "); -// } -// -// [Test] -// [ExpectedException(typeof(ArgumentException))] -// public void ThrowsExceptionWhenProjectFileNameIsNull() -// { -// agent.ExtractStabilityResults(null); -// } -// -// [Test] -// [ExpectedException(typeof(StabilityServiceAgentException))] -// public void ThrowsExceptionWhenOutputFileIsNotFound() -// { -// agent.ExtractStabilityResults(BadTestFile); -// } + [Test] + public void TestCreateDGeoStabilityIniFileForSingleInputFile() + { + string inputfileName = Path.Combine(TestFolder, NormalTestFile); + string inifileName = runner.CreateDGeoStabilityIniFile(inputfileName); + Assert.IsTrue(File.Exists(inifileName)); + + string expectedFile = Path.Combine(TestFolder, "ExpectedIniFileForSingleInputFile.txt"); + string[] expectedLines = File.ReadAllLines(expectedFile); + string[] resultLines = File.ReadAllLines(inifileName); + for (int i = 0; i < expectedLines.Length; i++) + { + Assert.AreEqual(expectedLines[i], resultLines[i]); + } + } + + [Test] + public void TestCreateDGeoStabilityIniFileForFolder() + { + string inifileName = runner.CreateDGeoStabilityIniFile(TestFolder); + Assert.IsTrue(File.Exists(inifileName)); + + string expectedFile = Path.Combine(TestFolder, "ExpectedIniFileForFolder.txt"); + string[] expectedLines = File.ReadAllLines(expectedFile); + string[] resultLines = File.ReadAllLines(inifileName); + for (int i = 0; i < expectedLines.Length; i++) + { + Assert.AreEqual(expectedLines[i], resultLines[i]); + } + } + + public void DeleteOutputFiles(string fileName) + { + string fileNameWithoutExtension = Path.Combine(Path.GetDirectoryName(fileName), Path.GetFileNameWithoutExtension(fileName)); + string dumpFile = fileNameWithoutExtension + ".std"; + string wmfFile = fileNameWithoutExtension + ".wmf"; + string jpgFile = fileNameWithoutExtension + ".jpg"; + if (File.Exists(dumpFile)) File.Delete(dumpFile); + if (File.Exists(wmfFile)) File.Delete(wmfFile); + if (File.Exists(jpgFile)) File.Delete(jpgFile); + } + + public void AssertOutputFiles(string fileName) + { + string fileNameWithoutExtension = Path.Combine(Path.GetDirectoryName(fileName), Path.GetFileNameWithoutExtension(fileName)); + string dumpFile = fileNameWithoutExtension + ".std"; + string wmfFile = fileNameWithoutExtension + ".wmf"; + string jpgFile = fileNameWithoutExtension + ".jpg"; + Assert.IsTrue(File.Exists(dumpFile)); + Assert.IsTrue(File.Exists(wmfFile)); + Assert.IsTrue(File.Exists(jpgFile)); + } + + [Test] + public void TestRunDGeoStabilityWithIniFileForSingleInputFile() + { + string expectedFileName = Path.Combine(TestFolder, NormalTestFile); + DeleteOutputFiles(expectedFileName); + + // Relative paths in ini file do not work yet in DGeoStability 16.2. This is fixed in 18.1. + string absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), TestFolder)); + string inputfileName = Path.Combine(absoluteFolder, NormalTestFile); + runner.RunDGeoStabilityProject(inputfileName); + + AssertOutputFiles(expectedFileName); + } + + [Test] + public void TestRunDGeoStabilityIniFileForFolder() + { + string expectedFileName1 = Path.Combine(TestFolder, NormalTestFile); + DeleteOutputFiles(expectedFileName1); + + string expectedFileName2 = Path.Combine(TestFolder, NormalTestFile2); + DeleteOutputFiles(expectedFileName2); + + // Relative paths in ini file do not work yet in DGeoStability 16.2. This is fixed in 18.1. + string absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), TestFolder)); + runner.RunDGeoStabilityProject(absoluteFolder); + + AssertOutputFiles(expectedFileName1); + AssertOutputFiles(expectedFileName2); + } + + #region Exceptions + + [Test] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Projectnaam ' ' is niet geldig")] + [SetUICulture("nl-NL")] + public void TestLanguageNlTestThrowsExceptionEmptyProject() + { + runner.RunDGeoStabilityProject(" "); + } + + [Test] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Project name ' ' is not valid")] + [SetUICulture("en-US")] + public void TestLanguageEnTestThrowsExceptionEmptyProject() + { + runner.RunDGeoStabilityProject(" "); + } + + [Test] + [ExpectedException(typeof(FileNotFoundException))] + public void TestThrowsExceptionFileNotFound() + { + runner.RunDGeoStabilityProject(@"C:\NonExistingFile.sti"); + } + + [Test] + public void TestDoesNotThrowExceptionFileExists() + { + runner.RunDGeoStabilityProject(Path.Combine(TestFolder, NormalTestFile)); + } + + [Test] + [ExpectedException(typeof(FileNotFoundException))] + public void TestThrowsExceptionFolderNotFound() + { + runner.RunDGeoStabilityProject(@"C:\NonExistingFolder"); + } + + [Test] + public void TestDoesNotThrowExceptionFolderExists() + { + runner.RunDGeoStabilityProject(TestFolder); + } + + [Test] + [ExpectedException(typeof(FileNotFoundException))] + public void TestThrowsExecutableNotFound() + { + runner.RunDGeoStabilityProject(@"..\DGeoStability.exe"); + } + + [Test] + public void TestDoesNotThrowExecutableExists() + { + runner.RunDGeoStabilityProject(@"DGeoStability.exe"); + } + + #endregion } } Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/AssemblyInfo.cs.svn =================================================================== diff -u -r387 -r407 --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/AssemblyInfo.cs.svn (.../AssemblyInfo.cs.svn) (revision 387) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/AssemblyInfo.cs.svn (.../AssemblyInfo.cs.svn) (revision 407) @@ -1,8 +1,10 @@ using System.Reflection; using System.Runtime.InteropServices; +using System.Runtime.CompilerServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("4f89e006-6e05-4f25-b17d-15285f5dc4c2")] [assembly: AssemblyVersion("17.1.0.SVNREV")] [assembly: AssemblyFileVersion("17.1.0.SVNREV")] +[assembly: InternalsVisibleTo("Deltares.DamMacroStability.CalculatorTests")] Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.Designer.cs =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.Designer.cs (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Properties/Resources.nl-NL.Designer.cs (revision 407) @@ -0,0 +1 @@ \ No newline at end of file Index: dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileForSingleInputFile.txt =================================================================== diff -u --- dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileForSingleInputFile.txt (revision 0) +++ dam failuremechanisms/damMacroStability/trunk/src/Tests/Files/ExpectedIniFileForSingleInputFile.txt (revision 407) @@ -0,0 +1,5 @@ +[D-Geo Stability batch processing] +InputFileName=..\..\Tests\Files\zuivering Gendt.sti +Plot Critical Circle=1 +PlotWMF=1 +PlotJPeg=1 \ No newline at end of file Index: dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Deltares.DamMacroStability.Calculator.csproj =================================================================== diff -u -r393 -r407 --- dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Deltares.DamMacroStability.Calculator.csproj (.../Deltares.DamMacroStability.Calculator.csproj) (revision 393) +++ dam failuremechanisms/damMacroStability/trunk/src/Deltares.DamMacroStability.Calculator/Deltares.DamMacroStability.Calculator.csproj (.../Deltares.DamMacroStability.Calculator.csproj) (revision 407) @@ -38,12 +38,40 @@ Properties\GlobalAssemblyInfo.cs + + + True + True + Resources.resx + + + True + True + Resources.nl-NL.resx + + + ResXFileCodeGenerator + Resources.nl-NL.Designer.cs + Designer + + + + PreserveNewest + + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + "$(ProjectDir)..\..\utils\svn_insert_version.cmd" "$(ProjectDir)Properties"