Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs =================================================================== diff -u -r2983 -r3009 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 2983) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 3009) @@ -1496,7 +1496,6 @@ SoilLayer2D soilLayerAquiferPartOne = CreateSoilLayer2D(bottomLeftUpperLayer, topRightLeftBottomLayer, bottomRightLeftBottomLayer, bottomLeftLeftBottomLayer); soilLayerAquiferPartOne.IsAquifer = true; - var topRightRightBottomLayer = new Point2D(rightCoordinate, -10); var bottomRightRightBottomLayer = new Point2D(rightCoordinate, -20); SoilLayer2D soilLayerAquiferPartTwo = CreateSoilLayer2D(topRightLeftBottomLayer, bottomRightUpperLayer, bottomRightRightBottomLayer, bottomRightLeftBottomLayer); soilLayerAquiferPartTwo.IsAquifer = true; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r3004 -r3009 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 3004) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 3009) @@ -64,8 +64,8 @@ var expectedKernelOutput = CreateKernelOutputForTest(testNumber); List logMessages; - var dd = FillEngineFromMacroStabilityWrapperOutput.FillEngineDataWithResults(expectedKernelOutput, out logMessages); - var kernelOutput = FillMacroStabilityWrapperOutputFromEngine.FillMacroStabilityWrapperOutput(dd, logMessages); + var engineOutput = FillEngineFromMacroStabilityWrapperOutput.FillEngineDataWithResults(expectedKernelOutput, out logMessages); + var kernelOutput = FillMacroStabilityWrapperOutputFromEngine.FillMacroStabilityWrapperOutput(engineOutput, logMessages); var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; ComparisonResult result; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs =================================================================== diff -u -r2982 -r3009 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs (.../PlLinesToWaternetConverter.cs) (revision 2982) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs (.../PlLinesToWaternetConverter.cs) (revision 3009) @@ -25,7 +25,7 @@ public static Waternet ConvertPlLineToWaternet(PlLines plLines, SoilProfile1D soilProfile1D, double penetrationLength, double xLeft, double xRight) { ThrowWhenPlLinesIsNull(plLines); - ThrowWhenSoilProfile1DIsNull(soilProfile1D); + ThrowWhenSoilProfileIsNull(soilProfile1D); var waternet = new Waternet { IsGenerated = false @@ -94,7 +94,7 @@ public static Waternet ConvertPlLineToWaternet(PlLines plLines, SoilProfile2D soilProfile, double penetrationLength) { ThrowWhenPlLinesIsNull(plLines); - ThrowWhenSoilProfile1DIsNull(soilProfile); + ThrowWhenSoilProfileIsNull(soilProfile); // Get all the xCoordinates to make cross sections IEnumerable points = soilProfile.Surfaces.SelectMany(surf => surf.GeometrySurface.OuterLoop.CalcPoints); @@ -206,7 +206,7 @@ SoilLayer1D currentAquifer = getSoilLayerFunc(crossSection); if (previousAquiferLayer != null && currentAquifer != null - && !AreVerticallyConnected(previousAquiferLayer, currentAquifer)) + && !AreHorizontallyConnected(previousAquiferLayer, currentAquifer)) { return Enumerable.Empty(); } @@ -228,7 +228,7 @@ return coordinates; } - private static bool AreVerticallyConnected(SoilLayer1D leftSoilLayer, SoilLayer1D rightSoilLayer) + private static bool AreHorizontallyConnected(SoilLayer1D leftSoilLayer, SoilLayer1D rightSoilLayer) { // The layers are identical if (ReferenceEquals(leftSoilLayer, rightSoilLayer)) @@ -266,7 +266,7 @@ /// /// The soil profile. /// - private static void ThrowWhenSoilProfile1DIsNull(SoilProfile soilProfile) + private static void ThrowWhenSoilProfileIsNull(SoilProfile soilProfile) { if (soilProfile == null) {