Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj =================================================================== diff -u -r1944 -r1948 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 1944) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj (.../Deltares.DamEngine.Calculators.Tests.csproj) (revision 1948) @@ -130,6 +130,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs =================================================================== diff -u -r1650 -r1948 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 1650) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/UpliftHelper.cs (.../UpliftHelper.cs) (revision 1948) @@ -42,21 +42,20 @@ { riverLevelLow = damKernelInput.RiverLevelLow; } - var soilGeometry2DName = damKernelInput.SubSoilScenario.FullStiFileName; UpliftSituation upliftSituation; SensorPlLineCreatorSettings sensorPlLineCreatorSettings = new SensorPlLineCreatorSettings(); sensorPlLineCreatorSettings.SensorLocation = location.SensorLocation; sensorPlLineCreatorSettings.DateTime = damKernelInput.TimeStepDateTime; var plLines = PlLinesHelper.CreatePlLinesForStability(location, damKernelInput.SubSoilScenario, riverLevel, - soilGeometry2DName, riverLevelLow, - damKernelInput.DamFailureMechanismeCalculationSpecification.AssessmentScenarioJobSettings, + riverLevelLow, damKernelInput.DamFailureMechanismeCalculationSpecification.AssessmentScenarioJobSettings, sensorPlLineCreatorSettings, out upliftSituation); if (plLines != null) { var surfaceLineWithNewHeight = location.SurfaceLine; double? upliftFactor = GetLowestUpliftFactor(surfaceLineWithNewHeight, - damKernelInput.SubSoilScenario.SoilProfile1D, soilGeometry2DName, plLines, location); + damKernelInput.SubSoilScenario.SoilProfile1D, damKernelInput.SubSoilScenario.FullStiFileName, + damKernelInput.SubSoilScenario.SoilProfile2D, plLines, location); upliftSituation.IsUplift = (upliftFactor < upliftCriterion); } else @@ -66,13 +65,14 @@ return upliftSituation; } - private static double? GetLowestUpliftFactor(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile, string soilGeometry2DName, - PlLines plLines, Location location) + private static double? GetLowestUpliftFactor(SurfaceLine2 surfaceLine, SoilProfile1D soilProfile1D, string soilGeometry2DName, + SoilProfile2D soilProfile2D, PlLines plLines, Location location) { var upliftLocationDeterminator = new UpliftLocationDeterminator() { SurfaceLine = surfaceLine, - SoilProfile = soilProfile, + SoilProfile = soilProfile1D, + SoilProfile2D = soilProfile2D, SoilGeometry2DName = soilGeometry2DName, SoilList = location.SoilList, DikeEmbankmentMaterial = location.GetDikeEmbankmentSoil(), Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs =================================================================== diff -u -r1649 -r1948 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 1649) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/PlLinesHelper.cs (.../PlLinesHelper.cs) (revision 1948) @@ -47,7 +47,7 @@ /// The uplift situation. /// The created Pl-lines public static PlLines CreatePlLinesForStability(Location location, SoilGeometryProbability subSoilScenario, - double waterLevel, string soilGeometry2DName, double? waterLevelRiverLow, + double waterLevel, double? waterLevelRiverLow, RegionalAssessmentScenarioJobSettings regionalAssessmentScenarioJobSettings, SensorPlLineCreatorSettings sensorPlLineCreatorSettings, out UpliftSituation upliftSituation) @@ -59,7 +59,7 @@ case PlLineCreationMethod.ExpertKnowledgeLinearInDike: case PlLineCreationMethod.ExpertKnowledgeRRD: plLines = CreatePlLinesForStabilityExpertKnowledge(location, subSoilScenario, - waterLevel, soilGeometry2DName, waterLevelRiverLow, + waterLevel, waterLevelRiverLow, regionalAssessmentScenarioJobSettings, out upliftSituation); break; case PlLineCreationMethod.Sensors: @@ -111,7 +111,7 @@ /// The uplift situation. /// The created Pl-lines public static PlLines CreatePlLinesForStabilityExpertKnowledge(Location location, SoilGeometryProbability subSoilScenario, - double waterLevel, string soilGeometry2DName, double? waterLevelRiverLow, + double waterLevel, double? waterLevelRiverLow, RegionalAssessmentScenarioJobSettings regionalAssessmentScenarioJobSettings, out UpliftSituation upliftSituation) { @@ -128,7 +128,8 @@ ModelParametersForPlLines = location.ModelParametersForPlLines, SoilProfile = subSoilScenario.SoilProfile1D, SoilProfileType = subSoilScenario.SoilProfileType, - SoilGeometry2DName = soilGeometry2DName, + SoilGeometry2DName = subSoilScenario.FullStiFileName, + SoilProfile2D = subSoilScenario.SoilProfile2D, GaugePlLines = null, // TODO: Operational Gauges = null, // TODO: Operational IsAdjustPL3AndPL4SoNoUpliftWillOccurEnabled = true, // for stability this must be set to true Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs =================================================================== diff -u -r1945 -r1948 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 1945) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 1948) @@ -4,6 +4,8 @@ using Deltares.DamEngine.Calculators.KernelWrappers.Common; using Deltares.DamEngine.Calculators.Tests.KernelWrappers.DamMacroStabilityCommon; using Deltares.DamEngine.Data.General; +using Deltares.DamEngine.Data.Geometry; +using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamEngine.TestHelpers.Factories; using NUnit.Framework; @@ -13,9 +15,15 @@ { [Test] - public void TestDetermineStabilityUplift() + public void TestDetermineStabilityUpliftWithStiFile() { var damKernelInput = CreateDamKernelInput(); + var soilGeometry2DName = "SimpleGeometry.sti"; + damKernelInput.SubSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile; + damKernelInput.SubSoilScenario.StiFileName = soilGeometry2DName; + damKernelInput.SubSoilScenario.FullStiFileName = Path.Combine(damKernelInput.ProjectDir, + Path.Combine(damKernelInput.Location.StabilityOptions.SoilGeometries2DPath, soilGeometry2DName)); + damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; var upliftSituation = UpliftHelper.DetermineStabilityUplift(damKernelInput, false); Assert.IsTrue(upliftSituation.IsUplift); @@ -25,31 +33,43 @@ Assert.IsFalse(upliftSituation.IsUplift); } + [Test] + public void TestDetermineStabilityUpliftWithSoilProfile2D() + { + SoilProfile2D soilProfile2D = CreateSoilProfile2D(); + //Assert.AreEqual(3, soilProfile2D.Geometry.Curves.Count); + + var damKernelInput = CreateDamKernelInput(); + damKernelInput.SubSoilScenario.SoilProfileType = SoilProfileType.ProfileType2D; + damKernelInput.SubSoilScenario.StiFileName =""; + damKernelInput.SubSoilScenario.FullStiFileName = ""; + damKernelInput.SubSoilScenario.SoilProfile2D = soilProfile2D; + + damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; + var upliftSituation = UpliftHelper.DetermineStabilityUplift(damKernelInput, false); + Assert.IsTrue(upliftSituation.IsUplift); + + damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; + upliftSituation = UpliftHelper.DetermineStabilityUplift(damKernelInput, false); + Assert.IsFalse(upliftSituation.IsUplift); + } + private static DamKernelInput CreateDamKernelInput() { - const string testFolder = - @"..\..\Deltares.DamEngine.Calculators.Tests\KernelWrappers\DamMacroStabilityCommon\TestData"; + const string testFolder = @"KernelWrappers\DamMacroStabilityCommon\TestData"; - var absoluteFolder = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); - var projectPath = Path.Combine(absoluteFolder, "testProjectMap"); - var soilDbName = Path.Combine(projectPath, "testSoilMaterials.mdb"); - var geometryFolder = "testGeomMap"; - var geometryPath = Path.Combine(projectPath, geometryFolder); - var soilGeometry2DName = "test1D1.sti"; + var projectPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); + var soilDbName = Path.Combine(projectPath, "soilMaterials.mdb"); var location = DamMacroStabilityTestHelper.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1()); location.StabilityOptions = new StabilityOptions(); location.StabilityOptions.TrafficLoad = 10.0; - location.StabilityOptions.SoilGeometries2DPath = geometryPath; + location.StabilityOptions.SoilGeometries2DPath = projectPath; location.StabilityOptions.SoilDatabaseName = soilDbName; location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1; var subSoilScenario = new SoilGeometryProbability(); - subSoilScenario.StiFileName = soilGeometry2DName; - subSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile; subSoilScenario.SegmentFailureMechanismType = FailureMechanismSystemType.StabilityInside; - subSoilScenario.FullStiFileName = Path.Combine(projectPath, - Path.Combine(location.StabilityOptions.SoilGeometries2DPath, subSoilScenario.StiFileName)); var damKernelInput = new DamKernelInput(); damKernelInput.Location = location; @@ -60,5 +80,57 @@ return damKernelInput; } + + private static SoilProfile2D CreateSoilProfile2D() + { + SoilProfile2D soilProfile2D = new SoilProfile2D(); + + var geometry = new GeometryData(); + geometry.Left = 0; + geometry.Right = 100; + geometry.Bottom = -10; + soilProfile2D.Geometry = geometry; + + var layer = new SoilLayer2D + { + Name = "Layer 1", + Soil = new Soil("OA", 17.70, 17.70) + }; + layer.GeometrySurface = new GeometrySurface(); + var outerLoop = new GeometryLoop(); + var point1 = new Point2D(0, 1); + var point2 = new Point2D(100, 1); + var point3 = new Point2D(100, -5); + var point4 = new Point2D(0, -5); + outerLoop.CurveList.Add(new GeometryCurve(point1, point2)); + outerLoop.CurveList.Add(new GeometryCurve(point2, point3)); + outerLoop.CurveList.Add(new GeometryCurve(point3, point4)); + outerLoop.CurveList.Add(new GeometryCurve(point4, point1)); + layer.GeometrySurface.OuterLoop = outerLoop; + layer.WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic; + layer.IsAquifer = true; + soilProfile2D.Surfaces.Add(layer); + + layer = new SoilLayer2D + { + Name = "Layer 2", + Soil = new Soil("LM", 18.00, 18.00) + }; + layer.GeometrySurface = new GeometrySurface(); + outerLoop = new GeometryLoop(); + var point5 = new Point2D(0, -10); + var point6 = new Point2D(100, -10); + outerLoop.CurveList.Add(new GeometryCurve(point4, point3)); + outerLoop.CurveList.Add(new GeometryCurve(point3, point6)); + outerLoop.CurveList.Add(new GeometryCurve(point6, point5)); + outerLoop.CurveList.Add(new GeometryCurve(point5, point4)); + layer.GeometrySurface.OuterLoop = outerLoop; + layer.WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic; + layer.IsAquifer = true; + soilProfile2D.Surfaces.Add(layer); + + return soilProfile2D; + } + } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/SimpleGeometry.sti =================================================================== diff -u --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/SimpleGeometry.sti (revision 0) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/TestData/SimpleGeometry.sti (revision 1948) @@ -0,0 +1,575 @@ +Input file for D-Geo Stability : Stability of earth slopes. +============================================================================== +COMPANY : + +DATE : 30-11-2018 +TIME : 14:12:39 +FILENAME : D:\src\dam\DamEngine\trunk\src\Deltares.DamEngine.Calculators.Tests\KernelWrappers\DamMacroStabilityCommon\TestData\SimpleGeometry.sti +CREATED BY : D-Geo Stability version 18.1.1.3 +========================== BEGINNING OF DATA ========================== +[VERSION] +Soil=1003 +Geometry=1000 +StressCurve=1000 +BondStressDiagram=1000 +YieldStress=1001 +D-Geo Stability=1008 +[END OF VERSION] + +[SOIL COLLECTION] + 2 = number of items +[SOIL] +OA +SoilColor=120796 +SoilSoilType=1 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=17.70 +SoilGamWet=17.70 +SoilRestSlope=1 +SoilCohesion=4.00 +SoilPhi=17.60 +SoilDilatancy=0.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName= +SoilBondStressTableName= +SoilMatStrengthType=0 +SoilProbInputValues=0 +SoilRatioCuPc=0.22 +SoilStrengthIncreaseExponent=0.80 +SoilPOPTop=0.00 +SoilPOPBottom=0.00 +SoilAdditionalFactorLEM=1.00 +SoilPc=0.00E+00 +SoilPOP=10.00 +SoilRheologicalCoefficient=0.00 +SoilXCoorSoilPc=-100.000 +SoilYCoorSoilPc=-100.000 +SoilIsPopCalculated=0 +SoilIsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=1 +SoilStdCohesion=1.00 +SoilStdPhi=2.64 +SoilStdRatioCuPc=0.06 +SoilStdRatioCuPcPassive=0.06 +SoilStdRatioCuPcActive=0.06 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=0.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] +LM +SoilColor=9764853 +SoilSoilType=1 +SoilUseSoilType=0 +SoilExcessPorePressure=0.00 +SoilPorePressureFactor=1.00 +SoilGamDry=18.00 +SoilGamWet=18.00 +SoilRestSlope=1 +SoilCohesion=4.60 +SoilPhi=21.90 +SoilDilatancy=0.00 +SoilCuTop=0.00 +SoilCuBottom=0.00 +SoilCuGradient=0.00 +SoilStressTableName= +SoilBondStressTableName= +SoilMatStrengthType=0 +SoilProbInputValues=0 +SoilRatioCuPc=0.22 +SoilStrengthIncreaseExponent=0.80 +SoilPOPTop=0.00 +SoilPOPBottom=0.00 +SoilAdditionalFactorLEM=1.00 +SoilPc=0.00E+00 +SoilPOP=10.00 +SoilRheologicalCoefficient=0.00 +SoilXCoorSoilPc=-100.000 +SoilYCoorSoilPc=-100.000 +SoilIsPopCalculated=0 +SoilIsOCRCalculated=0 +SoilIsAquifer=0 +SoilUseProbDefaults=1 +SoilStdCohesion=1.15 +SoilStdPhi=3.29 +SoilStdRatioCuPc=0.06 +SoilStdRatioCuPcPassive=0.06 +SoilStdRatioCuPcActive=0.06 +SoilStdCu=0.00 +SoilStdCuTop=0.00 +SoilStdCuGradient=0.00 +SoilStdPn=0.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] + 6 - Number of geometry points - + 1 0.000 1.000 0.000 + 2 100.000 1.000 0.000 + 3 0.000 -5.000 0.000 + 4 100.000 -5.000 0.000 + 5 0.000 -10.000 0.000 + 6 100.000 -10.000 0.000 +[END OF POINTS] + +[CURVES] + 3 - 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 + 3 4 + 3 - Curve number + 2 - number of points on curve, next line(s) are pointnumbers + 5 6 +[END OF CURVES] + +[BOUNDARIES] + 3 - Number of boundaries - + 0 - Boundary number + 1 - number of curves on boundary, next line(s) are curvenumbers + 3 + 1 - Boundary number + 1 - number of curves on boundary, next line(s) are curvenumbers + 2 + 2 - Boundary number + 1 - number of curves on boundary, next line(s) are curvenumbers + 1 +[END OF BOUNDARIES] + +[USE PROBABILISTIC DEFAULTS BOUNDARIES] + 3 - Number of boundaries - + 1 + 1 + 1 +[END OF USE PROBABILISTIC DEFAULTS BOUNDARIES] + +[STDV BOUNDARIES] + 3 - Number of boundaries - + 0.00000000000000E+0000 + 0.00000000000000E+0000 + 0.00000000000000E+0000 +[END OF STDV BOUNDARIES] + +[DISTRIBUTION BOUNDARIES] + 3 - Number of boundaries - + 0 + 0 + 0 +[END OF DISTRIBUTION BOUNDARIES] + +[PIEZO LINES] + 0 - Number of piezometric level lines - +[END OF PIEZO LINES] + +[PHREATIC LINE] + 0 - 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] + 2 - Number of layers - + 1 - Layer number, next line is material of layer + LM + 0 - Piezometric level line at top of layer + 0 - 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 + OA + 0 - Piezometric level line at top of layer + 0 - Piezometric level line at bottom of layer + 2 - Boundarynumber at top of layer + 1 - Boundarynumber at bottom of layer +[END OF LAYERS] + +[LAYERLOADS] + - Layers which are loads - + +[END OF LAYERLOADS] + +[END OF GEOMETRY DATA] +[RUN IDENTIFICATION TITLES] + + + +[END OF RUN IDENTIFICATION TITLES] +[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 +[END OF MSEEPNET] +[UNIT WEIGHT WATER] + 9.81 : Unit weight water +[END OF UNIT WEIGHT WATER] +[DEGREE OF CONSOLIDATION] + 2 Number of layers + 2 100 + 1 100 100 + 0 capillary water not included +[END OF DEGREE OF CONSOLIDATION] +[DEGREE TEMPORARY LOADS] + 100 100 + 0 capillary water not included +[END OF DEGREE TEMPORARY LOADS] +[DEGREE EARTH QUAKE] + 100 100 +[END OF DEGREE EARTH QUAKE] +[CIRCLES] + 0.000 0.000 1 X-direction + 0.000 0.000 1 Y-direction + 0.000 0.000 0 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 +[END OF LINE LOADS] +[UNIFORM LOADS] + 0 = number of items +[END OF UNIFORM LOADS] +[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 +[END OF EARTH QUAKE] +[SIGMA-TAU CURVES] + 0 = number of items +[END OF SIGMA-TAU CURVES] +[BOND STRESS DIAGRAMS] + 0 = number of items +[END OF BOND STRESS DIAGRAMS] +[MEASURED YIELD STRESSES] +[YIELD STRESSES] + 0 = number of items +[END OF YIELD STRESSES] +[END OF MEASURED YIELD STRESSES] +[MINIMAL REQUIRED CIRCLE DEPTH] + 0.00 [m] +[END OF MINIMAL REQUIRED CIRCLE DEPTH] +[SLIP CIRCLE SELECTION] +IsMinXEntryUsed=0 +IsMaxXEntryUsed=0 +XEntryMin=0.00 +XEntryMax=0.00 +[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 + 0 number of points +[END OF REFERENCE LEVEL SU] + +[LIFT SLIP DATA] + 0.000 0.000 1 X-direction Left + 0.000 0.000 1 Y-direction Left + 0.000 0.000 1 X-direction Right + 0.000 0.000 1 Y-direction Right + 0.000 0.000 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 + 0.30 = Decimate height + 1 norm = 1/10000 + 1 = number of items +Water data (1) + 1 = Phreatic line + 0.00 = Level + Piezo lines + 2 - Number of layers + 3 3 = Pl-top and pl-bottom + 2 3 = 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 + 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 +[END OF MODEL FACTOR] +[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=20.00 +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 +[END OF NEWZONE PLOT DATA] +[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 +[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 +[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=40 +GenerationCount=40 +EliteCount=2 +MutationRate=0.250 +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: DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs =================================================================== diff -u -r1614 -r1948 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1614) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/PlLinesCreator/PlLinesCreator.cs (.../PlLinesCreator.cs) (revision 1948) @@ -46,7 +46,7 @@ public SoilProfileType SoilProfileType { get; set; } public SoilProfile1D SoilProfile { get; set; } - public SoilProfile2D SoilProfile2D { get; set; } //#Bka to be implemented for real profiles2D + public SoilProfile2D SoilProfile2D { get; set; } public string SoilGeometry2DName { get; set; } public Soil DikeEmbankmentMaterial { get; set; } @@ -214,7 +214,7 @@ case SoilProfileType.ProfileType2D: soilProfile = SoilProfile2D.GetSoilProfile1D(xCoordinate); cachedSoilProfiles1D[xCoordinate] = soilProfile; - return soilProfile; //#Bka: real prof2D must be passed to Creator like 1D + return soilProfile; case SoilProfileType.ProfileTypeStiFile: var geometry2DTo1DConverter = new Geometry2DTo1DConverter(this.SoilGeometry2DName, this.SurfaceLine, this.DikeEmbankmentMaterial, this.SoilList, -this.XSoilGeometry2DOrigin); soilProfile = geometry2DTo1DConverter.Convert(xCoordinate); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs =================================================================== diff -u -r1649 -r1948 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1649) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs (.../MStabXmlDoc.cs) (revision 1948) @@ -207,8 +207,9 @@ SensorPlLineCreatorSettings sensorPlLineCreatorSettings = new SensorPlLineCreatorSettings(); sensorPlLineCreatorSettings.SensorLocation = location.SensorLocation; sensorPlLineCreatorSettings.DateTime = timeStepDateTime; + subSoilScenario.FullStiFileName = soilGeometry2DName; failureMechanismParametersMStab.PlLines = PlLinesHelper.CreatePlLinesForStability( - location, subSoilScenario, waterLevel, soilGeometry2DName, riverLevelLow, + location, subSoilScenario, waterLevel, riverLevelLow, regionalAssessmentScenarioJobSettings, sensorPlLineCreatorSettings, out upliftSituation); // Slip circle definition for Uplift Van;