Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs =================================================================== diff -u -r93b256575fba3e4068baadeeb62140533336371a -ra8d92ed8a79b45075e5e3a388da73d0ea40a25e3 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs (.../AddNewDemoDikeAssessmentSectionCommand.cs) (revision 93b256575fba3e4068baadeeb62140533336371a) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs (.../AddNewDemoDikeAssessmentSectionCommand.cs) (revision a8d92ed8a79b45075e5e3a388da73d0ea40a25e3) @@ -108,19 +108,17 @@ surfaceLinesImporter.Import(pipingFailureMechanism.SurfaceLines, tempPath.FilePath); } - using (var tempPath = new TemporaryImportFile("complete.soil")) + using (var tempPath = new TemporaryImportFile("DR6.soil")) { var surfaceLinesImporter = new PipingSoilProfilesImporter(); surfaceLinesImporter.Import(pipingFailureMechanism.SoilProfiles, tempPath.FilePath); } var calculation = pipingFailureMechanism.CalculationsGroup.GetPipingCalculations().First(); calculation.InputParameters.SetSurfaceLine(pipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001")); - calculation.InputParameters.SoilProfile = pipingFailureMechanism.SoilProfiles.First(sl => sl.Name == "AD640M00_Segment_36005_1D2"); + calculation.InputParameters.SetSoilProfile(pipingFailureMechanism.SoilProfiles.First(sl => sl.Name == "W1-6_0_1D1")); calculation.InputParameters.PhreaticLevelExit.Mean = (RoundedDouble)3; calculation.InputParameters.AssessmentLevel = (RoundedDouble)0.0; - calculation.InputParameters.ThicknessCoverageLayer = new LognormalDistribution(2); - calculation.InputParameters.ThicknessAquiferLayer = new LognormalDistribution(2); } } } \ No newline at end of file Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj =================================================================== diff -u -rfc22f4b149d07797f0526f04ca58595bb9446786 -ra8d92ed8a79b45075e5e3a388da73d0ea40a25e3 --- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision fc22f4b149d07797f0526f04ca58595bb9446786) +++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision a8d92ed8a79b45075e5e3a388da73d0ea40a25e3) @@ -145,7 +145,6 @@ - @@ -178,6 +177,7 @@ + Index: Demo/Ringtoets/src/Demo.Ringtoets/Resources/DR6.soil =================================================================== diff -u Binary files differ Index: Demo/Ringtoets/src/Demo.Ringtoets/Resources/complete.soil =================================================================== diff -u -rdbf6ecaa927e26f430d7c73290df7e825ec04744 -ra8d92ed8a79b45075e5e3a388da73d0ea40a25e3 Binary files differ Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs =================================================================== diff -u -r1069905ff1d4bb81d6acff6c130a4bed0b041b58 -ra8d92ed8a79b45075e5e3a388da73d0ea40a25e3 --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs (.../AddNewDemoDikeAssessmentSectionCommandTest.cs) (revision 1069905ff1d4bb81d6acff6c130a4bed0b041b58) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs (.../AddNewDemoDikeAssessmentSectionCommandTest.cs) (revision a8d92ed8a79b45075e5e3a388da73d0ea40a25e3) @@ -69,7 +69,7 @@ Assert.AreEqual(1669, demoAssessmentSection.ReferenceLine.Points.Count()); var profiles = demoAssessmentSection.PipingFailureMechanism.SoilProfiles.ToArray(); - Assert.AreEqual(26, profiles.Length); + Assert.AreEqual(4, profiles.Length); var surfaceLines = demoAssessmentSection.PipingFailureMechanism.SurfaceLines.ToArray(); Assert.AreEqual(4, surfaceLines.Length); AssertCharacteristicPointsOnSurfaceLines(surfaceLines); @@ -135,11 +135,11 @@ PipingCalculationService.Calculate(calculation); Assert.IsTrue(calculation.HasOutput); Assert.AreEqual(99.0, calculation.Output.HeaveFactorOfSafety, 1e-3); - Assert.AreEqual(426.608, calculation.Output.HeaveZValue, 1e-3); + Assert.AreEqual(1.148, calculation.Output.HeaveZValue, 1e-3); Assert.AreEqual(99.0, calculation.Output.UpliftFactorOfSafety, 1e-3); Assert.AreEqual(4.968, calculation.Output.UpliftZValue, 1e-3); - Assert.AreEqual(-1.391, calculation.Output.SellmeijerFactorOfSafety, 1e-3); - Assert.AreEqual(3.249, calculation.Output.SellmeijerZValue, 1e-3); + Assert.AreEqual(-0.366, calculation.Output.SellmeijerFactorOfSafety, 1e-3); + Assert.AreEqual(4.253, calculation.Output.SellmeijerZValue, 1e-3); } private static void AssertExpectedPipingInput(PipingInput inputParameters) @@ -160,15 +160,15 @@ Assert.AreEqual(37, inputParameters.BeddingAngle, 1e-3); Assert.AreEqual("PK001_0001", inputParameters.SurfaceLine.Name); - Assert.AreEqual("AD640M00_Segment_36005_1D2", inputParameters.SoilProfile.Name); + Assert.AreEqual("W1-6_0_1D1", inputParameters.SoilProfile.Name); Assert.AreEqual(3.666, PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(inputParameters).GetDesignValue(), 1e-3); Assert.AreEqual(1.355, PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(inputParameters).GetDesignValue(), 1e-3); - Assert.AreEqual(0.011, PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(inputParameters).GetDesignValue(), 1e-3); - Assert.AreEqual(81.175842733588766, PipingSemiProbabilisticDesignValueFactory.GetSeepageLength(inputParameters).GetDesignValue(), 1e-2); + Assert.AreEqual(5.86, PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(inputParameters).GetDesignValue(), 1e-3); + Assert.AreEqual(81.18, PipingSemiProbabilisticDesignValueFactory.GetSeepageLength(inputParameters).GetDesignValue(), 1e-2); Assert.AreEqual(0.011, PipingSemiProbabilisticDesignValueFactory.GetDiameter70(inputParameters).GetDesignValue(), 1e-3); Assert.AreEqual(2.347, PipingSemiProbabilisticDesignValueFactory.GetDarcyPermeability(inputParameters).GetDesignValue(), 1e-3); - Assert.AreEqual(2.35, PipingSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(inputParameters).GetDesignValue(), 1e-2); + Assert.AreEqual(20.13, PipingSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(inputParameters).GetDesignValue(), 1e-2); } } } \ No newline at end of file