Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs
===================================================================
diff -u -r5960 -r6087
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs	(.../UpliftLocationDeterminator.cs)	(revision 5960)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Uplift/UpliftLocationDeterminator.cs	(.../UpliftLocationDeterminator.cs)	(revision 6087)
@@ -77,16 +77,16 @@
         ThrowIfNoSurfaceLinDefined();
         ThrowIfNoSoilProfileDefined();
 
-        GeometryPoint startSurfacePoint = SurfaceLine.GetDikeToeInward();
+        Point2D startSurfacePoint = SurfaceLine.GetDikeToeInward();
 
-        IEnumerable<GeometryPoint> relevantSurfacePointsList = from GeometryPoint point in SurfaceLine.Geometry.Points
+        IEnumerable<Point2D> relevantSurfacePointsList = from Point2D point in SurfaceLine.Geometry.CalcPoints
                                                                where point.X >= startSurfacePoint.X
                                                                orderby point.X
                                                                select point;
 
         var foundUpliftFactor = false;
         UpliftLocationAndResult upliftLocationAndResult = null;
-        foreach (GeometryPoint surfacePoint in relevantSurfacePointsList)
+        foreach (Point2D surfacePoint in relevantSurfacePointsList)
         {
             upliftLocationAndResult = GetUpliftFactorAtPoint(surfacePoint);
             if ((upliftLocationAndResult != null) && (upliftLocationAndResult.UpliftFactor < upliftCriterion))
@@ -106,7 +106,7 @@
     /// </summary>
     /// <param name="point"></param>
     /// <returns>location and upliftfactor</returns>
-    public UpliftLocationAndResult GetUpliftFactorAtPoint(GeometryPoint point)
+    public UpliftLocationAndResult GetUpliftFactorAtPoint(Point2D point)
     {
         const double toleranceAlmostEqual = 1e-09;
         SoilProfile1D soilProfileInCurrentPoint = GetSoilProfileBelowPoint(point.X);
@@ -191,13 +191,13 @@
         ThrowIfNoSurfaceLinDefined();
         ThrowIfNoSoilProfileDefined();
 
-        GeometryPoint startSurfacePoint = SurfaceLine.GetDikeToeInward();
-        IEnumerable<GeometryPoint> relevantSurfacePointsList = from GeometryPoint point in SurfaceLine.Geometry.Points
+        Point2D startSurfacePoint = SurfaceLine.GetDikeToeInward();
+        IEnumerable<Point2D> relevantSurfacePointsList = from Point2D point in SurfaceLine.Geometry.CalcPoints
                                                                where point.X >= startSurfacePoint.X
                                                                orderby point.X
                                                                select point;
         UpliftLocationAndResult lowestUpliftLocationAndResult = null;
-        foreach (GeometryPoint surfacePoint in relevantSurfacePointsList)
+        foreach (Point2D surfacePoint in relevantSurfacePointsList)
         {
             UpliftLocationAndResult upliftLocationAndResult = GetUpliftFactorAtPoint(surfacePoint);
             if (upliftLocationAndResult != null)
@@ -216,10 +216,10 @@
     /// <summary>
     /// Create upliftcalculator at given point
     /// </summary>
-    /// <param name="point">GeometryPoint for which to calculate upliftfactor</param>
+    /// <param name="point">Point2D for which to calculate upliftfactor</param>
     /// <param name="topOfLayer">Top of layer where uplift occurs</param>
     /// <returns>location and upliftfactor</returns>
-    private UpliftCalculator CreateUpliftCalculator(GeometryPoint point, double topOfLayer, SoilProfile1D soilProfile)
+    private UpliftCalculator CreateUpliftCalculator(Point2D point, double topOfLayer, SoilProfile1D soilProfile)
     {
         PlLine phreaticLine = PlLines.Lines[PlLineType.Pl1];
         return new UpliftCalculator