Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs =================================================================== diff -u -r2050 -r2961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 2050) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 2961) @@ -47,20 +47,24 @@ Assert.AreEqual(0, waternet.HeadLineList[0].Points[0].Z, cDif); Assert.AreEqual(100, waternet.HeadLineList[0].Points[1].X, cDif); Assert.AreEqual(-1, waternet.HeadLineList[0].Points[1].Z, cDif); + // expected waternet lines from pl 2, 3 and 4 Assert.AreEqual(3, waternet.WaternetLineList.Count); + // expected waternet line 0 is connected to pl2 with level -6.111 + 2.1 = -4.011 Assert.AreEqual(waternet.HeadLineList[0], waternet.WaternetLineList[0].HeadLine); Assert.AreEqual(0, waternet.WaternetLineList[0].Points[0].X, cDif); Assert.AreEqual(-4.011, waternet.WaternetLineList[0].Points[0].Z, cDif); Assert.AreEqual(100, waternet.WaternetLineList[0].Points[1].X, cDif); Assert.AreEqual(-4.011, waternet.WaternetLineList[0].Points[1].Z, cDif); - // expected waternet line 1 is connected to pl3 with level -2.111 + + // expected waternet line 1 is connected to pl3 with level -6.111 Assert.AreEqual(waternet.HeadLineList[1], waternet.WaternetLineList[1].HeadLine); - Assert.AreEqual(-2.111, waternet.WaternetLineList[1].Points[0].Z, cDif); - // expected waternet line 2 is connected to pl4 with level -6.111 + Assert.AreEqual(-6.111, waternet.WaternetLineList[1].Points[0].Z, cDif); + + // expected waternet line 2 is connected to pl4 with level -2.111 Assert.AreEqual(waternet.HeadLineList[2], waternet.WaternetLineList[2].HeadLine); - Assert.AreEqual(-6.111, waternet.WaternetLineList[2].Points[0].Z, cDif); + Assert.AreEqual(-2.111, waternet.WaternetLineList[2].Points[0].Z, cDif); } [Test] @@ -107,8 +111,8 @@ // expected waternet line 0 is connected to pl2 with level -6.111 + 2.1 = -4.011 Assert.AreEqual(waternet.HeadLineList[0], waternet.WaternetLineList[0].HeadLine); Assert.AreEqual(-4.011, waternet.WaternetLineList[0].Points[0].Z, cDif); - // expected waternet line 1 is connected to pl4 with level -6.111 - Assert.AreEqual(waternet.HeadLineList[2], waternet.WaternetLineList[1].HeadLine); + // expected waternet line 1 is connected to pl3 with level -6.111 + Assert.AreEqual(waternet.HeadLineList[1], waternet.WaternetLineList[1].HeadLine); Assert.AreEqual(-6.111, waternet.WaternetLineList[1].Points[0].Z, cDif); // check that no waternetlines are added for pl2, pl3 and pl4 when BottomAquiferLayer is null Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs =================================================================== diff -u -r2050 -r2961 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs (.../PlLinesToWaternetConverter.cs) (revision 2050) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverter.cs (.../PlLinesToWaternetConverter.cs) (revision 2961) @@ -53,9 +53,9 @@ if (headLine != null) { waternet.HeadLineList.Add(headLine); - if (soilProfile1D.InBetweenAquiferLayer != null) + if (soilProfile1D.BottomAquiferLayer != null) { - var level = soilProfile1D.InBetweenAquiferLayer.TopLevel; + var level = soilProfile1D.BottomAquiferLayer.TopLevel; var waternetLine = ConvertLevelToWaternetLine(level, xLeft, xRight); waternetLine.HeadLine = headLine; waternet.WaternetLineList.Add(waternetLine); @@ -67,9 +67,9 @@ if (headLine != null) { waternet.HeadLineList.Add(headLine); - if (soilProfile1D.BottomAquiferLayer != null) + if (soilProfile1D.InBetweenAquiferLayer != null) { - var level = soilProfile1D.BottomAquiferLayer.TopLevel; + var level = soilProfile1D.InBetweenAquiferLayer.TopLevel; var waternetLine = ConvertLevelToWaternetLine(level, xLeft, xRight); waternetLine.HeadLine = headLine; waternet.WaternetLineList.Add(waternetLine);