Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r2963 -r2965 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2963) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 2965) @@ -217,10 +217,9 @@ Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXCount, actualSlipPlaneUpliftVan.RightGridXCount); Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZCount, actualSlipPlaneUpliftVan.RightGridZCount); - //Todo remove comments when Carlos is ready with C#wrapper. -// Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineZTop, actualSlipPlaneUpliftVan.TangentLineZTop); -// Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineZBottom, actualSlipPlaneUpliftVan.TangentLineZBottom); -// Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineCount, actualSlipPlaneUpliftVan.TangentLineCount); + Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineZTop, actualSlipPlaneUpliftVan.TangentLineZTop); + Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineZBottom, actualSlipPlaneUpliftVan.TangentLineZBottom); + Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineCount, actualSlipPlaneUpliftVan.TangentLineCount); } private static void CompareWaternet(Waternet expectedWaternet, Waternet actualWaternet) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs =================================================================== diff -u -r2960 -r2965 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs (.../FillEngineFromMacroStabilityWrapperInput.cs) (revision 2960) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperInput.cs (.../FillEngineFromMacroStabilityWrapperInput.cs) (revision 2965) @@ -129,12 +129,11 @@ RightGridZBottom = kernelSlipPlaneUpliftVan.RightGrid.GridZBottom }; - // Tangentlines are filled from bottom to top as specified by the FillMacroStabilityWrapperInputFromEngine. - // Todo navragen bij Carlos - // IEnumerable tangentLines = kernelSlipPlaneUpliftVan.TangentLines.ToArray(); - // UpliftVanCalculationGrid.TangentLineZBottom = tangentLines.First(); - // UpliftVanCalculationGrid.TangentLineZTop = tangentLines.Last(); - // UpliftVanCalculationGrid.TangentLineCount = tangentLines.Count() - 1; // -1 as the ZTop coordinate is inclusive + // Tangent lines are filled from bottom to top as specified by the FillMacroStabilityWrapperInputFromEngine. + IEnumerable tangentLines = kernelSlipPlaneUpliftVan.TangentLines.ToArray(); + UpliftVanCalculationGrid.TangentLineZBottom = tangentLines.First(); + UpliftVanCalculationGrid.TangentLineZTop = tangentLines.Last(); + UpliftVanCalculationGrid.TangentLineCount = tangentLines.Count() - 1; // -1 as the ZTop coordinate is inclusive } private void TransferWaternet(KernelWaternet kernelWaternet) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r2960 -r2965 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 2960) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 2965) @@ -289,11 +289,10 @@ }; // kernelSearchAreaConditions.AutoTangentLines = damUpliftVanCalculationGrid.TangentLineAutomaticAtBoundaries; - //Todo navragen bij Carlos waarom dit nu opeens weg is. - // kernelUpliftVanCalculationGrid.TangentLines = GetTangentLines(damUpliftVanCalculationGrid.TangentLineZBottom, - // damUpliftVanCalculationGrid.TangentLineZTop, - // damUpliftVanCalculationGrid.TangentLineCount) - // .ToArray(); + kernelUpliftVanCalculationGrid.TangentLines = GetTangentLines(damUpliftVanCalculationGrid.TangentLineZBottom, + damUpliftVanCalculationGrid.TangentLineZTop, + damUpliftVanCalculationGrid.TangentLineCount) + .ToArray(); } private static IEnumerable GetTangentLines(double tangentLineZBottom, double tangentLineZTop, int nrOfTangentLines)