Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs =================================================================== diff -u -r2936 -r2941 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs (.../FillEngineFromMacroStabilityWrapperInput.cs) (revision 2936) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs (.../FillEngineFromMacroStabilityWrapperInput.cs) (revision 2941) @@ -74,7 +74,8 @@ TransferSoils(macroStabilityInput.StabilityModel.Soils); var lastStage = macroStabilityInput.StabilityModel.ConstructionStages.Last(); TransferSoilProfile2D(lastStage.SoilProfile, lastStage.PreconsolidationStresses); - TransferSurfaceLine(macroStabilityInput.PreprocessingInput.PreConstructionStages.Last().Surfaceline); + var lastPreConStage = macroStabilityInput.PreprocessingInput.PreConstructionStages.Last(); + TransferSurfaceLine(lastPreConStage.Surfaceline); TransferWaternet(macroStabilityInput.StabilityModel.ConstructionStages.Last().Waternet); TransferUpliftVanCalculationGrid(macroStabilityInput.StabilityModel.UpliftVanCalculationGrid, macroStabilityInput.PreprocessingInput.SearchAreaConditions); TransferTrafficLoad(macroStabilityInput.StabilityModel.ConstructionStages.Last().UniformLoads); @@ -177,21 +178,20 @@ private void TransferSurfaceLine(MacroStability.CSharpWrapper.Input.SurfaceLine kernelSurfaceLine) { - // SurfaceLine2 = new SurfaceLine2(); - // foreach (var kernelCharPoint in kernelSurfaceLine2.CharacteristicPoints) - // { - // CharacteristicPoint damCharPoint; - // damCharPoint = new CharacteristicPoint() - // { - // CharacteristicPointType = ConversionHelper.ConvertToDamCharacteristicPointType(kernelCharPoint.CharacteristicPointType), - // GeometryPoint = new GeometryPoint() - // { - // X = kernelCharPoint.X, - // Z = kernelCharPoint.Z - // } - // }; - // SurfaceLine2.CharacteristicPoints.Add(damCharPoint); - // } + SurfaceLine2 = new SurfaceLine2(); + foreach (var kernelCharPoint in kernelSurfaceLine.CharacteristicPoints) + { + var damCharPoint = new CharacteristicPoint() + { + CharacteristicPointType = ConversionHelper.ConvertToDamCharacteristicPointType(kernelCharPoint.CharacteristicPoint), + GeometryPoint = new GeometryPoint() + { + X = kernelCharPoint.GeometryPoint.X, + Z = kernelCharPoint.GeometryPoint.Z + } + }; + SurfaceLine2.CharacteristicPoints.Add(damCharPoint); + } } private void TransferSoils(IList stabilityModelSoils) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r2936 -r2941 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 2936) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 2941) @@ -181,22 +181,19 @@ } } - private void TransferSurfaceLine(Data.Geotechnics.SurfaceLine2 damSurfaceLine, SurfaceLine kernelSurfaceLine) + private void TransferSurfaceLine(SurfaceLine2 damSurfaceLine, SurfaceLine kernelSurfaceLine) { - // foreach (var damCharPoint in damSurfaceLine.CharacteristicPoints) - // { - // CharacteristicPoint kernelCharPoint; - // kernelCharPoint = new CharacteristicPoint() - // { - // CharacteristicPointType = ConversionHelper.ConvertToMacroStabilityCharacteristicPointType(damCharPoint.CharacteristicPointType), - // GeometryPoint = new GeometryPoint() - // { - // X = damCharPoint.X, - // Z = damCharPoint.Z - // } - // }; - // kernelSurfaceLine.CharacteristicPoints.Add(kernelCharPoint); - // } + kernelSurfaceLine.CharacteristicPoints = new List(); + foreach (var damCharPoint in damSurfaceLine.CharacteristicPoints) + { + + var kernelCharPoint = new SurfaceLineCharacteristicPoint(); + kernelCharPoint.CharacteristicPoint = + ConversionHelper.ConvertToMacroStabilityCharacteristicPointType( + damCharPoint.CharacteristicPointType); + kernelCharPoint.GeometryPoint = new Point2D(damCharPoint.X, damCharPoint.Z); + kernelSurfaceLine.CharacteristicPoints.Add(kernelCharPoint); + } } private void TransferWaternet(WaterNet damWaternet, Deltares.MacroStability.CSharpWrapper.Input.Waternet kernelWaternet) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r2936 -r2941 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2936) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2941) @@ -20,7 +20,6 @@ // All rights reserved. using System.Collections.Generic; -using System.IO; using System.Linq; using Deltares.DamEngine.Calculators.KernelWrappers.Common; using Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon; @@ -31,8 +30,7 @@ using Deltares.DamEngine.TestHelpers; using Deltares.DamEngine.TestHelpers.Factories; using KellermanSoftware.CompareNetObjects; -using CharacteristicPointSet = Deltares.MacroStability.CSharpWrapper.Input.CharacteristicPoint; -using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType; +using CharacteristicPointSet = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointSet; using HeadLine = Deltares.DamEngine.Data.Geometry.HeadLine; using SoilProfile2D = Deltares.DamEngine.Data.Geotechnics.SoilProfile2D; using SurfaceLine2 = Deltares.DamEngine.Data.Geotechnics.SurfaceLine2; @@ -102,6 +100,7 @@ CompareStabilityModel(expectedParametersMStab, fillEngineFromMacroStabilityWrapperInput.FailureMechanismParametersMStab); CompareSoilModel(expectedSoilList, fillEngineFromMacroStabilityWrapperInput.SoilList); CompareSoilProfile2D(expectedSoilProfile2D, fillEngineFromMacroStabilityWrapperInput.SoilProfile2D); + CompareSurfaceLine(expectedSurfaceLine2D, fillEngineFromMacroStabilityWrapperInput.SurfaceLine2); //Todo : add and or implement comparer per item as these are added to the code } @@ -208,8 +207,10 @@ // Assert.AreEqual(expectedWaternet.ExternalWaterLevel, actualWaternet.ExternalWaterLevel); } - private void CompareSoilSurfaceLine(CharacteristicPointSet expectedCharacteristicPoints, CharacteristicPointSet actualCharacteristicPoints) + private void CompareSurfaceLine(SurfaceLine2 expectedSurfaceLine2, SurfaceLine2 actualSurfaceLine2) { + CharacteristicPointSet expectedCharacteristicPoints = expectedSurfaceLine2.CharacteristicPoints; + CharacteristicPointSet actualCharacteristicPoints = actualSurfaceLine2.CharacteristicPoints; var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; compare.Config.MembersToIgnore = new List() {