Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs =================================================================== diff -u -r6100 -r6245 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 6100) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 6245) @@ -177,11 +177,11 @@ Assert.Multiple(() => { // phreatic line (PL 1) - Assert.That(waternet.PhreaticLine.CalcPoints, Has.Count.EqualTo(2)); - Assert.That(waternet.PhreaticLine.CalcPoints[0].X, Is.EqualTo(xLeft).Within(precision3Decimals)); - Assert.That(waternet.PhreaticLine.CalcPoints[0].Z, Is.EqualTo(pL1Level).Within(precision3Decimals)); - Assert.That(waternet.PhreaticLine.CalcPoints[1].X, Is.EqualTo(xRight).Within(precision3Decimals)); - Assert.That(waternet.PhreaticLine.CalcPoints[1].Z, Is.EqualTo(pL1Level).Within(precision3Decimals)); + Assert.That(waternet.PhreaticLine.Points, Has.Count.EqualTo(2)); + Assert.That(waternet.PhreaticLine.Points[0].X, Is.EqualTo(xLeft).Within(precision3Decimals)); + Assert.That(waternet.PhreaticLine.Points[0].Z, Is.EqualTo(pL1Level).Within(precision3Decimals)); + Assert.That(waternet.PhreaticLine.Points[1].X, Is.EqualTo(xRight).Within(precision3Decimals)); + Assert.That(waternet.PhreaticLine.Points[1].Z, Is.EqualTo(pL1Level).Within(precision3Decimals)); WaternetLine waternetLinePl1 = waternet.WaternetLineList.Find(waternetLine => waternetLine.Name == "Waternet line phreatic line"); // expected: waternet line connected to pl1 has level: @@ -190,13 +190,13 @@ // - for Hydrostatic type, -2.111 m + 1 mm (Pl1 is in layer 2 from 0 m to -2.111 m) // - for Full hydrostatic, -30 (the bottom of the geometry) - Assert.That(waternetLinePl1.HeadLine.CalcPoints, Is.EqualTo(waternet.PhreaticLine.CalcPoints)); + Assert.That(waternetLinePl1.HeadLine.Points, Is.EqualTo(waternet.PhreaticLine.Points)); Assert.That(waternetLinePl1.HeadLine.Name, Is.EqualTo(waternet.PhreaticLine.Name)); - Assert.That(waternetLinePl1.CalcPoints, Has.Count.EqualTo(2)); - Assert.That(waternetLinePl1.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl1.CalcPoints[0].Z, Is.EqualTo(levelWaternetPl1).Within(precision3Decimals)); - Assert.That(waternetLinePl1.CalcPoints[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl1.CalcPoints[1].Z, Is.EqualTo(levelWaternetPl1).Within(precision3Decimals)); + Assert.That(waternetLinePl1.Points, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl1.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl1.Points[0].Z, Is.EqualTo(levelWaternetPl1).Within(precision3Decimals)); + Assert.That(waternetLinePl1.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl1.Points[1].Z, Is.EqualTo(levelWaternetPl1).Within(precision3Decimals)); }); // PL 2 @@ -205,20 +205,20 @@ { Assert.Multiple(() => { - Assert.That(waternet.HeadLineList[0].CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternet.HeadLineList[0].Points, Has.Count.EqualTo(2)); Assert.That(waternet.HeadLineList[0].Name, Is.EqualTo("Head line 2 (PL 2)")); // check the points of first headline that represents pl 2 - Assert.That(waternet.HeadLineList[0].CalcPoints[0].X, Is.EqualTo(xLeft).Within(precision3Decimals)); - Assert.That(waternet.HeadLineList[0].CalcPoints[0].Z, Is.EqualTo(-6).Within(precision3Decimals)); - Assert.That(waternet.HeadLineList[0].CalcPoints[1].X, Is.EqualTo(xRight).Within(precision3Decimals)); - Assert.That(waternet.HeadLineList[0].CalcPoints[1].Z, Is.EqualTo(-6).Within(precision3Decimals)); + Assert.That(waternet.HeadLineList[0].Points[0].X, Is.EqualTo(xLeft).Within(precision3Decimals)); + Assert.That(waternet.HeadLineList[0].Points[0].Z, Is.EqualTo(-6).Within(precision3Decimals)); + Assert.That(waternet.HeadLineList[0].Points[1].X, Is.EqualTo(xRight).Within(precision3Decimals)); + Assert.That(waternet.HeadLineList[0].Points[1].Z, Is.EqualTo(-6).Within(precision3Decimals)); // expected: waternet line connected to pl2 has level -6.111 + 2.1 = -4.011 Assert.That(waternetLinePl2.HeadLine, Is.EqualTo(waternet.HeadLineList[0])); - Assert.That(waternetLinePl2.CalcPoints, Has.Count.EqualTo(2)); - Assert.That(waternetLinePl2.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl2.CalcPoints[0].Z, Is.EqualTo(-4.011).Within(precision3Decimals)); - Assert.That(waternetLinePl2.CalcPoints[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl2.CalcPoints[1].Z, Is.EqualTo(-4.011).Within(precision3Decimals)); + Assert.That(waternetLinePl2.Points, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl2.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl2.Points[0].Z, Is.EqualTo(-4.011).Within(precision3Decimals)); + Assert.That(waternetLinePl2.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl2.Points[1].Z, Is.EqualTo(-4.011).Within(precision3Decimals)); }); } else @@ -239,45 +239,45 @@ { // expected: waternet line connected to pl3 has level -6.111 Assert.That(waternetLinePl3.HeadLine.Name, Is.EqualTo("Head line 3 (PL 3)")); - Assert.That(waternetLinePl3.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl3.Points, Has.Count.EqualTo(2)); }); Assert.Multiple(() => { - Assert.That(waternetLinePl3.CalcPoints[0].Z, Is.EqualTo(-6.111).Within(precision3Decimals)); + Assert.That(waternetLinePl3.Points[0].Z, Is.EqualTo(-6.111).Within(precision3Decimals)); // expected: highest waternet lines connected to pl4 have levels -2.111 and -3.373 Assert.That(waternetLinePl4TopInBetweenAquiferTop.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4TopInBetweenAquiferTop.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl4TopInBetweenAquiferTop.Points, Has.Count.EqualTo(2)); Assert.That(waternetLinePl4TopInBetweenAquiferBottom.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4TopInBetweenAquiferBottom.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl4TopInBetweenAquiferBottom.Points, Has.Count.EqualTo(2)); }); Assert.Multiple(() => { - Assert.That(waternetLinePl4TopInBetweenAquiferTop.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4TopInBetweenAquiferTop.CalcPoints[0].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); - Assert.That(waternetLinePl4TopInBetweenAquiferTop.CalcPoints[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl4TopInBetweenAquiferTop.CalcPoints[1].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); - Assert.That(waternetLinePl4TopInBetweenAquiferBottom.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4TopInBetweenAquiferBottom.CalcPoints[0].Z, Is.EqualTo(-3.373).Within(precision3Decimals)); - Assert.That(waternetLinePl4TopInBetweenAquiferBottom.CalcPoints[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl4TopInBetweenAquiferBottom.CalcPoints[1].Z, Is.EqualTo(-3.373).Within(precision3Decimals)); + Assert.That(waternetLinePl4TopInBetweenAquiferTop.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4TopInBetweenAquiferTop.Points[0].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); + Assert.That(waternetLinePl4TopInBetweenAquiferTop.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl4TopInBetweenAquiferTop.Points[1].Z, Is.EqualTo(-2.111).Within(precision3Decimals)); + Assert.That(waternetLinePl4TopInBetweenAquiferBottom.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4TopInBetweenAquiferBottom.Points[0].Z, Is.EqualTo(-3.373).Within(precision3Decimals)); + Assert.That(waternetLinePl4TopInBetweenAquiferBottom.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl4TopInBetweenAquiferBottom.Points[1].Z, Is.EqualTo(-3.373).Within(precision3Decimals)); // expected: lowest waternet lines 4 connected to pl4 have levels -4.151 and -5.373 Assert.That(waternetLinePl4BottomInBetweenAquiferTop.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4BottomInBetweenAquiferTop.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl4BottomInBetweenAquiferTop.Points, Has.Count.EqualTo(2)); Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.Points, Has.Count.EqualTo(2)); }); Assert.Multiple(() => { - Assert.That(waternetLinePl4BottomInBetweenAquiferTop.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4BottomInBetweenAquiferTop.CalcPoints[0].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); - Assert.That(waternetLinePl4BottomInBetweenAquiferTop.CalcPoints[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl4BottomInBetweenAquiferTop.CalcPoints[1].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); - Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.CalcPoints[0].Z, Is.EqualTo(-5.373).Within(precision3Decimals)); - Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.CalcPoints[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.CalcPoints[1].Z, Is.EqualTo(-5.373).Within(precision3Decimals)); + Assert.That(waternetLinePl4BottomInBetweenAquiferTop.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4BottomInBetweenAquiferTop.Points[0].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); + Assert.That(waternetLinePl4BottomInBetweenAquiferTop.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl4BottomInBetweenAquiferTop.Points[1].Z, Is.EqualTo(-4.151).Within(precision3Decimals)); + Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.Points[0].Z, Is.EqualTo(-5.373).Within(precision3Decimals)); + Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl4BottomInBetweenAquiferBottom.Points[1].Z, Is.EqualTo(-5.373).Within(precision3Decimals)); }); } else @@ -313,13 +313,13 @@ Assert.Multiple(() => { WaternetLine waternetLinePl1 = waternet.WaternetLineList.Find(waternetLine => waternetLine.Name == "Waternet line phreatic line"); - Assert.That(waternetLinePl1.HeadLine.CalcPoints, Is.EqualTo(waternet.PhreaticLine.CalcPoints)); + Assert.That(waternetLinePl1.HeadLine.Points, Is.EqualTo(waternet.PhreaticLine.Points)); Assert.That(waternetLinePl1.HeadLine.Name, Is.EqualTo(waternet.PhreaticLine.Name)); - Assert.That(waternetLinePl1.CalcPoints, Has.Count.EqualTo(2)); - Assert.That(waternetLinePl1.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl1.CalcPoints[0].Z, Is.EqualTo(levelWaternetPl1).Within(precision3Decimals)); - Assert.That(waternetLinePl1.CalcPoints[1].X, Is.EqualTo(100).Within(precision3Decimals)); - Assert.That(waternetLinePl1.CalcPoints[1].Z, Is.EqualTo(levelWaternetPl1).Within(precision3Decimals)); + Assert.That(waternetLinePl1.Points, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl1.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl1.Points[0].Z, Is.EqualTo(levelWaternetPl1).Within(precision3Decimals)); + Assert.That(waternetLinePl1.Points[1].X, Is.EqualTo(100).Within(precision3Decimals)); + Assert.That(waternetLinePl1.Points[1].Z, Is.EqualTo(levelWaternetPl1).Within(precision3Decimals)); }); } } @@ -334,11 +334,11 @@ Assert.That(waternet.HeadLineList, Has.Count.EqualTo(3)); Assert.Multiple(() => { - Assert.That(waternet.HeadLineList[0].CalcPoints, Has.Count.EqualTo(2)); - Assert.That(waternet.HeadLineList[1].CalcPoints, Has.Count.EqualTo(2)); - Assert.That(waternet.HeadLineList[2].CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternet.HeadLineList[0].Points, Has.Count.EqualTo(2)); + Assert.That(waternet.HeadLineList[1].Points, Has.Count.EqualTo(2)); + Assert.That(waternet.HeadLineList[2].Points, Has.Count.EqualTo(2)); // phreatic line - Assert.That(waternet.PhreaticLine.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternet.PhreaticLine.Points, Has.Count.EqualTo(2)); }); // check that no headline are added when Pl2, Pl3 or Pl4 does not exist or has no points @@ -349,9 +349,9 @@ Assert.That(waternet.HeadLineList, Has.Count.EqualTo(1)); Assert.Multiple(() => { - Assert.That(waternet.HeadLineList[0].CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternet.HeadLineList[0].Points, Has.Count.EqualTo(2)); // phreatic line - Assert.That(waternet.PhreaticLine.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternet.PhreaticLine.Points, Has.Count.EqualTo(2)); }); } @@ -374,22 +374,22 @@ Waternet waternet = PlLinesToWaternetConverter.CreateWaternetBasedOnPlLines(plLines, soilProfile, surfaceLine, penetrationZone, pressureType); // Assert - AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.CalcPoints); + AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); Assert.That(waternet.HeadLineList, Has.Count.EqualTo(headlineCount)); var indexHeadlinePl3 = 0; var indexHeadlinePl4 = 1; if (pressureType == IntrusionVerticalWaterPressureType.SemiTimeDependent && penetrationZone > 0) { - AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].CalcPoints); + AssertGeometry(plLines.Lines[PlLineType.Pl2].Points, waternet.HeadLineList[0].Points); indexHeadlinePl3 += 1; indexHeadlinePl4 += 1; } if (pressureType != IntrusionVerticalWaterPressureType.FullHydroStatic) { - AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[indexHeadlinePl3].CalcPoints); - AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[indexHeadlinePl4].CalcPoints); + AssertGeometry(plLines.Lines[PlLineType.Pl3].Points, waternet.HeadLineList[indexHeadlinePl3].Points); + AssertGeometry(plLines.Lines[PlLineType.Pl4].Points, waternet.HeadLineList[indexHeadlinePl4].Points); } Assert.That(waternet.WaternetLineList, Has.Count.EqualTo(waternetLineCount)); @@ -401,7 +401,7 @@ new(leftCoordinate, levelWaternetPl1), new(rightCoordinate, levelWaternetPl1) ]; - AssertGeometry(expectedWaternetLine1, pl1WaternetLine.CalcPoints); + AssertGeometry(expectedWaternetLine1, pl1WaternetLine.Points); Point2D[] expectedBottomAquiferCoordinates = [ @@ -415,7 +415,7 @@ Assert.That(pl2WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[0])); Point2D[] offSetAquiferCoordinates = expectedBottomAquiferCoordinates.Select(aquiferCoordinate => new Point2D(aquiferCoordinate.X, aquiferCoordinate.Z + penetrationLength)) .ToArray(); - AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.CalcPoints); + AssertGeometry(offSetAquiferCoordinates, pl2WaternetLine.Points); } else { @@ -426,35 +426,35 @@ { WaternetLine pl3WaternetLine = waternet.WaternetLineList.Find(w => w.HeadLine.Name == "Head line 3 (PL 3)"); Assert.That(pl3WaternetLine.HeadLine, Is.SameAs(waternet.HeadLineList[indexHeadlinePl3])); - AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.CalcPoints); + AssertGeometry(expectedBottomAquiferCoordinates, pl3WaternetLine.Points); WaternetLine pl4WaternetLine1Top = waternet.WaternetLineList.Find(w => w.Name == "Waternet line in-between aquifer top (1)"); Assert.That(pl4WaternetLine1Top.HeadLine, Is.SameAs(waternet.HeadLineList[indexHeadlinePl4])); AssertGeometry([ new Point2D(leftCoordinate, 10), new Point2D(rightCoordinate, 10) - ], pl4WaternetLine1Top.CalcPoints); + ], pl4WaternetLine1Top.Points); WaternetLine pl4WaternetLineBottom = waternet.WaternetLineList.Find(w => w.Name == "Waternet line in-between aquifer bottom (1)"); Assert.That(pl4WaternetLineBottom.HeadLine, Is.SameAs(waternet.HeadLineList[indexHeadlinePl4])); AssertGeometry([ new Point2D(leftCoordinate, 0), new Point2D(rightCoordinate, 0) - ], pl4WaternetLineBottom.CalcPoints); + ], pl4WaternetLineBottom.Points); WaternetLine pl4WaternetLine2Top = waternet.WaternetLineList.Find(w => w.Name == "Waternet line in-between aquifer top (2)"); Assert.That(pl4WaternetLine2Top.HeadLine, Is.SameAs(waternet.HeadLineList[indexHeadlinePl4])); AssertGeometry([ new Point2D(leftCoordinate, -10), new Point2D(rightCoordinate, -10) - ], pl4WaternetLine2Top.CalcPoints); + ], pl4WaternetLine2Top.Points); WaternetLine pl4WaternetLine2Bottom = waternet.WaternetLineList.Find(w => w.Name == "Waternet line in-between aquifer bottom (2)"); Assert.That(pl4WaternetLine2Bottom.HeadLine, Is.SameAs(waternet.HeadLineList[indexHeadlinePl4])); AssertGeometry([ new Point2D(leftCoordinate, -20), new Point2D(rightCoordinate, -20) - ], pl4WaternetLine2Bottom.CalcPoints); + ], pl4WaternetLine2Bottom.Points); } } @@ -471,15 +471,15 @@ Waternet waternet = PlLinesToWaternetConverter.CreateWaternetBasedOnPlLines(plLines, soilProfile, surfaceLine, 0, pressureType); // Assert - AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.CalcPoints); + AssertGeometry(plLines.Lines[PlLineType.Pl1].Points, waternet.PhreaticLine.Points); WaternetLine pl1WaternetLine = waternet.WaternetLineList.Find(w => w.HeadLine.Name == waternet.PhreaticLine.Name); Assert.That(pl1WaternetLine.HeadLine.Name, Is.SameAs(waternet.PhreaticLine.Name)); Point2D[] expectedWaternetLine1 = [ new(leftCoordinate, expectedLevelWaternetPl1), new(rightCoordinate, expectedLevelWaternetPl1) ]; - AssertGeometry(expectedWaternetLine1, pl1WaternetLine.CalcPoints); + AssertGeometry(expectedWaternetLine1, pl1WaternetLine.Points); } /// @@ -575,13 +575,13 @@ const double right = 50.123; WaternetLine waternetLine = PlLinesToWaternetConverter.CreateWaternetLine(level, left, right); - Assert.That(waternetLine.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternetLine.Points, Has.Count.EqualTo(2)); Assert.Multiple(() => { - Assert.That(waternetLine.CalcPoints[0].X, Is.EqualTo(-50.111).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[0].Z, Is.EqualTo(1.234).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[1].X, Is.EqualTo(50.123).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[1].Z, Is.EqualTo(1.234).Within(precision3Decimals)); + Assert.That(waternetLine.Points[0].X, Is.EqualTo(-50.111).Within(precision3Decimals)); + Assert.That(waternetLine.Points[0].Z, Is.EqualTo(1.234).Within(precision3Decimals)); + Assert.That(waternetLine.Points[1].X, Is.EqualTo(50.123).Within(precision3Decimals)); + Assert.That(waternetLine.Points[1].Z, Is.EqualTo(1.234).Within(precision3Decimals)); }); } @@ -614,24 +614,24 @@ Assert.That(waternetLine, Has.Count.EqualTo(9)); Assert.Multiple(() => { - Assert.That(waternetLine.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[0].Z, Is.EqualTo(0.92).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[1].X, Is.EqualTo(10.14).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[1].Z, Is.EqualTo(0.95).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[2].X, Is.EqualTo(17.08).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[2].Z, Is.EqualTo(0.88).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[3].X, Is.EqualTo(19.45).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[3].Z, Is.EqualTo(0.81).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[4].X, Is.EqualTo(20.62).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[4].Z, Is.EqualTo(0.3).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[5].X, Is.EqualTo(21.84).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[5].Z, Is.EqualTo(-0.61).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[6].X, Is.EqualTo(23.08).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[6].Z, Is.EqualTo(-0.38).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[7].X, Is.EqualTo(24.61).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[7].Z, Is.EqualTo(0.63).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[8].X, Is.EqualTo(80.78).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[8].Z, Is.EqualTo(0.63).Within(precision3Decimals)); + Assert.That(waternetLine.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLine.Points[0].Z, Is.EqualTo(0.92).Within(precision3Decimals)); + Assert.That(waternetLine.Points[1].X, Is.EqualTo(10.14).Within(precision3Decimals)); + Assert.That(waternetLine.Points[1].Z, Is.EqualTo(0.95).Within(precision3Decimals)); + Assert.That(waternetLine.Points[2].X, Is.EqualTo(17.08).Within(precision3Decimals)); + Assert.That(waternetLine.Points[2].Z, Is.EqualTo(0.88).Within(precision3Decimals)); + Assert.That(waternetLine.Points[3].X, Is.EqualTo(19.45).Within(precision3Decimals)); + Assert.That(waternetLine.Points[3].Z, Is.EqualTo(0.81).Within(precision3Decimals)); + Assert.That(waternetLine.Points[4].X, Is.EqualTo(20.62).Within(precision3Decimals)); + Assert.That(waternetLine.Points[4].Z, Is.EqualTo(0.3).Within(precision3Decimals)); + Assert.That(waternetLine.Points[5].X, Is.EqualTo(21.84).Within(precision3Decimals)); + Assert.That(waternetLine.Points[5].Z, Is.EqualTo(-0.61).Within(precision3Decimals)); + Assert.That(waternetLine.Points[6].X, Is.EqualTo(23.08).Within(precision3Decimals)); + Assert.That(waternetLine.Points[6].Z, Is.EqualTo(-0.38).Within(precision3Decimals)); + Assert.That(waternetLine.Points[7].X, Is.EqualTo(24.61).Within(precision3Decimals)); + Assert.That(waternetLine.Points[7].Z, Is.EqualTo(0.63).Within(precision3Decimals)); + Assert.That(waternetLine.Points[8].X, Is.EqualTo(80.78).Within(precision3Decimals)); + Assert.That(waternetLine.Points[8].Z, Is.EqualTo(0.63).Within(precision3Decimals)); }); } @@ -708,8 +708,8 @@ soilProfile.Surfaces.Add(soilLayer9); soilProfile.Surfaces.Add(soilLayerBottom); soilProfile.Geometry.Surfaces.Add(new GeometrySurface()); - soilProfile.Geometry.SurfaceLine.CalcPoints.Add(new Point2D(leftCoordinate, 0)); - soilProfile.Geometry.SurfaceLine.CalcPoints.Add(new Point2D(rightCoordinate, 0)); + soilProfile.Geometry.SurfaceLine.Points.Add(new Point2D(leftCoordinate, 0)); + soilProfile.Geometry.SurfaceLine.Points.Add(new Point2D(rightCoordinate, 0)); PlLines plLines = CreateAllPlLines(pL1Level); @@ -720,10 +720,10 @@ Assert.That(waternetLine, Has.Count.EqualTo(2)); Assert.Multiple(() => { - Assert.That(waternetLine.CalcPoints[0].X, Is.EqualTo(leftCoordinate).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[0].Z, Is.EqualTo(expectedWaternetLineLevel).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[1].X, Is.EqualTo(rightCoordinate).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[1].Z, Is.EqualTo(expectedWaternetLineLevel).Within(precision3Decimals)); + Assert.That(waternetLine.Points[0].X, Is.EqualTo(leftCoordinate).Within(precision3Decimals)); + Assert.That(waternetLine.Points[0].Z, Is.EqualTo(expectedWaternetLineLevel).Within(precision3Decimals)); + Assert.That(waternetLine.Points[1].X, Is.EqualTo(rightCoordinate).Within(precision3Decimals)); + Assert.That(waternetLine.Points[1].Z, Is.EqualTo(expectedWaternetLineLevel).Within(precision3Decimals)); }); } @@ -781,18 +781,18 @@ Assert.That(waternetLine, Has.Count.EqualTo(6)); Assert.Multiple(() => { - Assert.That(waternetLine.CalcPoints[0].X, Is.EqualTo(xLeft).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[0].Z, Is.EqualTo(-10).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[1].X, Is.EqualTo(xPointF).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[1].Z, Is.EqualTo(-10).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[2].X, Is.EqualTo(xPointG).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[2].Z, Is.EqualTo(-12.5).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[3].X, Is.EqualTo(xPointH).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[3].Z, Is.EqualTo(-12.5).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[4].X, Is.EqualTo(xPointI).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[4].Z, Is.EqualTo(-10).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[5].X, Is.EqualTo(xRight).Within(precision3Decimals)); - Assert.That(waternetLine.CalcPoints[5].Z, Is.EqualTo(-10).Within(precision3Decimals)); + Assert.That(waternetLine.Points[0].X, Is.EqualTo(xLeft).Within(precision3Decimals)); + Assert.That(waternetLine.Points[0].Z, Is.EqualTo(-10).Within(precision3Decimals)); + Assert.That(waternetLine.Points[1].X, Is.EqualTo(xPointF).Within(precision3Decimals)); + Assert.That(waternetLine.Points[1].Z, Is.EqualTo(-10).Within(precision3Decimals)); + Assert.That(waternetLine.Points[2].X, Is.EqualTo(xPointG).Within(precision3Decimals)); + Assert.That(waternetLine.Points[2].Z, Is.EqualTo(-12.5).Within(precision3Decimals)); + Assert.That(waternetLine.Points[3].X, Is.EqualTo(xPointH).Within(precision3Decimals)); + Assert.That(waternetLine.Points[3].Z, Is.EqualTo(-12.5).Within(precision3Decimals)); + Assert.That(waternetLine.Points[4].X, Is.EqualTo(xPointI).Within(precision3Decimals)); + Assert.That(waternetLine.Points[4].Z, Is.EqualTo(-10).Within(precision3Decimals)); + Assert.That(waternetLine.Points[5].X, Is.EqualTo(xRight).Within(precision3Decimals)); + Assert.That(waternetLine.Points[5].Z, Is.EqualTo(-10).Within(precision3Decimals)); }); } @@ -840,11 +840,11 @@ Assert.Multiple(() => { - Assert.That(waternet.PhreaticLine.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternet.PhreaticLine.Points, Has.Count.EqualTo(2)); WaternetLine waternetLinePl1 = waternet.WaternetLineList.Find(waternetLine => waternetLine.Name == "Waternet line phreatic line"); - Assert.That(waternetLinePl1.HeadLine.CalcPoints, Is.EqualTo(waternet.PhreaticLine.CalcPoints)); + Assert.That(waternetLinePl1.HeadLine.Points, Is.EqualTo(waternet.PhreaticLine.Points)); Assert.That(waternetLinePl1.HeadLine.Name, Is.EqualTo(waternet.PhreaticLine.Name)); - Assert.That(waternetLinePl1.CalcPoints, Has.Count.EqualTo(10)); + Assert.That(waternetLinePl1.Points, Has.Count.EqualTo(10)); }); // no PL 2 WaternetLine waternetLinePl2 = waternet.WaternetLineList.Find(waternetLine => waternetLine.Name == "Penetration zone lower aquifer"); @@ -854,19 +854,19 @@ Assert.Multiple(() => { Assert.That(waternetLinePl3.HeadLine.Name, Is.EqualTo("Head line 3 (PL 3)")); - Assert.That(waternetLinePl3.CalcPoints, Has.Count.EqualTo(6)); - Assert.That(waternetLinePl3.CalcPoints[0].X, Is.EqualTo(0)); - Assert.That(waternetLinePl3.CalcPoints[0].Z, Is.EqualTo(-6)); - Assert.That(waternetLinePl3.CalcPoints[1].X, Is.EqualTo(59.25)); - Assert.That(waternetLinePl3.CalcPoints[1].Z, Is.EqualTo(-6)); - Assert.That(waternetLinePl3.CalcPoints[2].X, Is.EqualTo(59.5)); - Assert.That(waternetLinePl3.CalcPoints[2].Z, Is.EqualTo(-8)); - Assert.That(waternetLinePl3.CalcPoints[3].X, Is.EqualTo(61.5)); - Assert.That(waternetLinePl3.CalcPoints[3].Z, Is.EqualTo(-8)); - Assert.That(waternetLinePl3.CalcPoints[4].X, Is.EqualTo(61.75)); - Assert.That(waternetLinePl3.CalcPoints[4].Z, Is.EqualTo(-6)); - Assert.That(waternetLinePl3.CalcPoints[5].X, Is.EqualTo(75)); - Assert.That(waternetLinePl3.CalcPoints[5].Z, Is.EqualTo(-6)); + Assert.That(waternetLinePl3.Points, Has.Count.EqualTo(6)); + Assert.That(waternetLinePl3.Points[0].X, Is.EqualTo(0)); + Assert.That(waternetLinePl3.Points[0].Z, Is.EqualTo(-6)); + Assert.That(waternetLinePl3.Points[1].X, Is.EqualTo(59.25)); + Assert.That(waternetLinePl3.Points[1].Z, Is.EqualTo(-6)); + Assert.That(waternetLinePl3.Points[2].X, Is.EqualTo(59.5)); + Assert.That(waternetLinePl3.Points[2].Z, Is.EqualTo(-8)); + Assert.That(waternetLinePl3.Points[3].X, Is.EqualTo(61.5)); + Assert.That(waternetLinePl3.Points[3].Z, Is.EqualTo(-8)); + Assert.That(waternetLinePl3.Points[4].X, Is.EqualTo(61.75)); + Assert.That(waternetLinePl3.Points[4].Z, Is.EqualTo(-6)); + Assert.That(waternetLinePl3.Points[5].X, Is.EqualTo(75)); + Assert.That(waternetLinePl3.Points[5].Z, Is.EqualTo(-6)); }); // PL 4: 4 waternet lines expected at top and bottom and at both sides of the ditch // No waternet line expected for the in-between aquifer in the dike body @@ -877,40 +877,40 @@ Assert.Multiple(() => { Assert.That(waternetLinePl4LeftDitchTop.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4LeftDitchTop.CalcPoints, Has.Count.EqualTo(3)); + Assert.That(waternetLinePl4LeftDitchTop.Points, Has.Count.EqualTo(3)); Assert.That(waternetLinePl4LeftDitchBottom.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4LeftDitchBottom.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl4LeftDitchBottom.Points, Has.Count.EqualTo(2)); Assert.That(waternetLinePl4RightDitchTop.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4RightDitchTop.CalcPoints, Has.Count.EqualTo(3)); + Assert.That(waternetLinePl4RightDitchTop.Points, Has.Count.EqualTo(3)); Assert.That(waternetLinePl4RightDitchBottom.HeadLine.Name, Is.EqualTo("Head line 4 (PL 4)")); - Assert.That(waternetLinePl4RightDitchBottom.CalcPoints, Has.Count.EqualTo(2)); + Assert.That(waternetLinePl4RightDitchBottom.Points, Has.Count.EqualTo(2)); }); Assert.Multiple(() => { - Assert.That(waternetLinePl4LeftDitchTop.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchTop.CalcPoints[0].Z, Is.EqualTo(-2).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchTop.CalcPoints[1].X, Is.EqualTo(58.75).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchTop.CalcPoints[1].Z, Is.EqualTo(-2).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchTop.CalcPoints[2].X, Is.EqualTo(59).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchTop.CalcPoints[2].Z, Is.EqualTo(-4).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchTop.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchTop.Points[0].Z, Is.EqualTo(-2).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchTop.Points[1].X, Is.EqualTo(58.75).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchTop.Points[1].Z, Is.EqualTo(-2).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchTop.Points[2].X, Is.EqualTo(59).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchTop.Points[2].Z, Is.EqualTo(-4).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchBottom.CalcPoints[0].X, Is.EqualTo(0).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchBottom.CalcPoints[0].Z, Is.EqualTo(-4).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchBottom.CalcPoints[1].X, Is.EqualTo(59).Within(precision3Decimals)); - Assert.That(waternetLinePl4LeftDitchBottom.CalcPoints[1].Z, Is.EqualTo(-4).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchBottom.Points[0].X, Is.EqualTo(0).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchBottom.Points[0].Z, Is.EqualTo(-4).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchBottom.Points[1].X, Is.EqualTo(59).Within(precision3Decimals)); + Assert.That(waternetLinePl4LeftDitchBottom.Points[1].Z, Is.EqualTo(-4).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchTop.CalcPoints[0].X, Is.EqualTo(62).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchTop.CalcPoints[0].Z, Is.EqualTo(-4).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchTop.CalcPoints[1].X, Is.EqualTo(62.25).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchTop.CalcPoints[1].Z, Is.EqualTo(-2).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchTop.CalcPoints[2].X, Is.EqualTo(75).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchTop.CalcPoints[2].Z, Is.EqualTo(-2).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchTop.Points[0].X, Is.EqualTo(62).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchTop.Points[0].Z, Is.EqualTo(-4).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchTop.Points[1].X, Is.EqualTo(62.25).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchTop.Points[1].Z, Is.EqualTo(-2).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchTop.Points[2].X, Is.EqualTo(75).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchTop.Points[2].Z, Is.EqualTo(-2).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchBottom.CalcPoints[0].X, Is.EqualTo(62).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchBottom.CalcPoints[0].Z, Is.EqualTo(-4).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchBottom.CalcPoints[1].X, Is.EqualTo(75).Within(precision3Decimals)); - Assert.That(waternetLinePl4RightDitchBottom.CalcPoints[1].Z, Is.EqualTo(-4).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchBottom.Points[0].X, Is.EqualTo(62).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchBottom.Points[0].Z, Is.EqualTo(-4).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchBottom.Points[1].X, Is.EqualTo(75).Within(precision3Decimals)); + Assert.That(waternetLinePl4RightDitchBottom.Points[1].Z, Is.EqualTo(-4).Within(precision3Decimals)); }); }