Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs
===================================================================
diff -u -r6230 -r6245
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs	(.../SoilProfile2DSurfaceLineHelperTests.cs)	(revision 6230)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs	(.../SoilProfile2DSurfaceLineHelperTests.cs)	(revision 6245)
@@ -164,9 +164,9 @@
 
     private static SurfaceLine2 CreateSurfaceLineForSoilProfile2D(SoilProfile2D soilProfile2D, PositionToSoilProfile2D positionToSoilProfile2D)
     {
-        Point2D geometryPoint = soilProfile2D.Geometry.SurfaceLine.CalcPoints.First();
+        Point2D geometryPoint = soilProfile2D.Geometry.SurfaceLine.Points.First();
         var leftPoint = new Point2D(geometryPoint.X, geometryPoint.Z);
-        geometryPoint = soilProfile2D.Geometry.SurfaceLine.CalcPoints.Last();
+        geometryPoint = soilProfile2D.Geometry.SurfaceLine.Points.Last();
         var rightPoint = new Point2D(geometryPoint.X, geometryPoint.Z);
         var middlePoint = new Point2D((leftPoint.X + rightPoint.X) / 2, (leftPoint.Z + rightPoint.Z) / 2);
         switch (positionToSoilProfile2D)
@@ -207,8 +207,8 @@
 
         int indexLayer = -1;
         // Find a point within the expected soil layer
-        double[] xMin = expectedSoilLayer.GeometrySurface.OuterLoop.CalcPoints.Select(p => p.X).OrderBy(x => x).Distinct().ToArray();
-        double[] zMin = expectedSoilLayer.GeometrySurface.OuterLoop.CalcPoints.Select(p => p.Z).OrderBy(z => z).Distinct().ToArray();
+        double[] xMin = expectedSoilLayer.GeometrySurface.OuterLoop.Points.Select(p => p.X).OrderBy(x => x).Distinct().ToArray();
+        double[] zMin = expectedSoilLayer.GeometrySurface.OuterLoop.Points.Select(p => p.Z).OrderBy(z => z).Distinct().ToArray();
         var gravityPoint = new Point2D
         {
             X = xMin[0] + 2,
@@ -229,24 +229,24 @@
         Assert.Multiple(() =>
         {
             Assert.That(soilProfile2D.Surfaces[indexLayer].SoilName, Is.EqualTo(expectedSoilLayer.SoilName));
-            Assert.That(soilProfile2D.Geometry.Surfaces[indexLayer].OuterLoop.CalcPoints, Has.Count.EqualTo(expectedSoilLayer.GeometrySurface.OuterLoop.CalcPoints.Count));
+            Assert.That(soilProfile2D.Geometry.Surfaces[indexLayer].OuterLoop.Points, Has.Count.EqualTo(expectedSoilLayer.GeometrySurface.OuterLoop.Points.Count));
             Assert.That(soilProfile2D.Geometry.Surfaces[indexLayer].OuterLoop.CurveList, Has.Count.EqualTo(expectedSoilLayer.GeometrySurface.OuterLoop.CurveList.Count));
-            Assert.That(soilProfile2D.Surfaces[indexLayer].GeometrySurface.OuterLoop.CalcPoints, Has.Count.EqualTo(expectedSoilLayer.GeometrySurface.OuterLoop.CalcPoints.Count));
+            Assert.That(soilProfile2D.Surfaces[indexLayer].GeometrySurface.OuterLoop.Points, Has.Count.EqualTo(expectedSoilLayer.GeometrySurface.OuterLoop.Points.Count));
             Assert.That(soilProfile2D.Surfaces[indexLayer].GeometrySurface.OuterLoop.CurveList, Has.Count.EqualTo(expectedSoilLayer.GeometrySurface.OuterLoop.CurveList.Count));
         });
         foreach (GeometryCurve curve in expectedSoilLayer.GeometrySurface.OuterLoop.CurveList)
         {
             Assert.That(IsCurvePresentInSoilLayer(soilProfile2D.Surfaces[indexLayer], curve), Is.True);
         }
-        foreach (Point2D point in expectedSoilLayer.GeometrySurface.OuterLoop.CalcPoints)
+        foreach (Point2D point in expectedSoilLayer.GeometrySurface.OuterLoop.Points)
         {
             Assert.That(IsPointPresentInSoilLayer(soilProfile2D.Surfaces[indexLayer], point), Is.True);
         }
     }
     
     private static bool IsPointPresentInSoilLayer(SoilLayer2D soilLayer, Point2D point)
     {
-        return soilLayer.GeometrySurface.OuterLoop.CalcPoints.Any(p => p.X.IsNearEqual(point.X) && p.Z.IsNearEqual(point.Z));
+        return soilLayer.GeometrySurface.OuterLoop.Points.Any(p => p.X.IsNearEqual(point.X) && p.Z.IsNearEqual(point.Z));
     }
     
     private static bool IsCurvePresentInSoilLayer(SoilLayer2D soilLayer, GeometryCurve curve)
@@ -350,25 +350,25 @@
         if (testCaseSurfaceLine.TestNumber == 6)
         {
             Assert.That(newSoilProfile2D, Is.Not.Null);
-            Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints, Has.Count.EqualTo(8));
+            Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points, Has.Count.EqualTo(8));
             Assert.Multiple(() =>
             {
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[0].X, Is.EqualTo(10));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[0].Z, Is.EqualTo(10));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[1].X, Is.EqualTo(30));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[1].Z, Is.EqualTo(12));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[2].X, Is.EqualTo(50));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[2].Z, Is.EqualTo(10));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[3].X, Is.EqualTo(60));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[3].Z, Is.EqualTo(9));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[4].X, Is.EqualTo(70));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[4].Z, Is.EqualTo(8));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[5].X, Is.EqualTo(90));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[5].Z, Is.EqualTo(10));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[6].X, Is.EqualTo(110));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[6].Z, Is.EqualTo(12));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[7].X, Is.EqualTo(130));
-                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.CalcPoints[7].Z, Is.EqualTo(10));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[0].X, Is.EqualTo(10));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[0].Z, Is.EqualTo(10));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[1].X, Is.EqualTo(30));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[1].Z, Is.EqualTo(12));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[2].X, Is.EqualTo(50));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[2].Z, Is.EqualTo(10));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[3].X, Is.EqualTo(60));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[3].Z, Is.EqualTo(9));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[4].X, Is.EqualTo(70));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[4].Z, Is.EqualTo(8));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[5].X, Is.EqualTo(90));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[5].Z, Is.EqualTo(10));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[6].X, Is.EqualTo(110));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[6].Z, Is.EqualTo(12));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[7].X, Is.EqualTo(130));
+                Assert.That(newSoilProfile2D.Geometry.SurfaceLine.Points[7].Z, Is.EqualTo(10));
             });
         }
     }