Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs =================================================================== diff -u -r4998 -r5001 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs (.../MacroStabilityCommonHelperTests.cs) (revision 4998) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs (.../MacroStabilityCommonHelperTests.cs) (revision 5001) @@ -200,6 +200,29 @@ }); } + [Test, Ignore("Work in progress")] + public void GivenSoilGeometryProbabilityWithSoilProfile2DAndSurfaceLineFullyAboveSoilProfile2DWhenCombiningThenLayerIsAddedOnTopOfSoilProfile2D() + { + SoilGeometryProbability soilGeometryProbability = CreateSoilGeometryProbabilityWithSoilProfile2DWithSurfaceLineDitchDike(); + SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineAboveSurfaceLineDikeAndDitch(); + // Now combine the soilGeometryProbability with the surfaceLine which should result that a layer is added on + // top of the SoilProfile2D + MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); + GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry; + // For debugging purposes + // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); + // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => + { + Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); + Assert.That(geometry.Surfaces, Has.Count.EqualTo(2)); + Assert.That(geometry.Left, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(geometry.Right, Is.EqualTo(80.0).Within(cTolerance)); + Assert.That(geometry.Bottom, Is.EqualTo(-20.0).Within(cTolerance)); + Assert.That(geometry.MaxGeometryPointsZ, Is.EqualTo(10.0).Within(cTolerance)); + }); + } + private SoilGeometryProbability CreateSoilGeometryProbabilityWithSoilProfile2DWithSurfaceLineDitchDike() { SoilGeometryProbability soilGeometryProbability = FactoryForSoilGeometryProbabilities.CreateSoilGeometryProbabilityWithSoilProfile1D(); Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs =================================================================== diff -u -r4991 -r5001 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs (.../FactoryForSurfaceLines.cs) (revision 4991) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSurfaceLines.cs (.../FactoryForSurfaceLines.cs) (revision 5001) @@ -761,18 +761,16 @@ /// surface line public static SurfaceLine2 CreateSurfaceLineWithDikeAndDitch() { - //Surface line tutorial 1 var surfaceLine = new SurfaceLine2 { - Name = "Tutorial1", + Name = "SurfaceLineWithDikeAndDitch", Geometry = new GeometryPointString(), CharacteristicPoints = { GeometryMustContainPoint = true } }; - // Next point adjusted so create PL line can be tested better surfaceLine.EnsurePointOfType(0.0, 0, CharacteristicPointType.SurfaceLevelOutside); surfaceLine.EnsurePointOfType(10.0, 0, CharacteristicPointType.DikeToeAtRiver); surfaceLine.EnsurePointOfType(34.5, 5, CharacteristicPointType.DikeTopAtRiver); @@ -788,4 +786,31 @@ surfaceLine.Geometry.SyncCalcPoints(); return surfaceLine; } + + /// + /// Creates a surface line, that contains a dike and is fully above SurfaceLineWithDikeAndDitch. + /// + /// surface line + public static SurfaceLine2 CreateSurfaceLineAboveSurfaceLineDikeAndDitch() + { + var surfaceLine = new SurfaceLine2 + { + Name = "AboveSurfaceLineWithDikeAndDitch", + Geometry = new GeometryPointString(), + CharacteristicPoints = + { + GeometryMustContainPoint = true + } + }; + + surfaceLine.EnsurePointOfType(0.0, 5.0, CharacteristicPointType.SurfaceLevelOutside); + surfaceLine.EnsurePointOfType(10.0, 5.0, CharacteristicPointType.DikeToeAtRiver); + surfaceLine.EnsurePointOfType(34.5, 10.0, CharacteristicPointType.DikeTopAtRiver); + surfaceLine.EnsurePointOfType(40.5, 10.0, CharacteristicPointType.DikeTopAtPolder); + surfaceLine.EnsurePointOfType(50.5, 5.0, CharacteristicPointType.DikeToeAtPolder); + surfaceLine.EnsurePointOfType(75.0, 5.0, CharacteristicPointType.SurfaceLevelInside); + + surfaceLine.Geometry.SyncCalcPoints(); + return surfaceLine; + } } \ No newline at end of file