Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile2DSurfaceLineHelper.cs =================================================================== diff -u -r6165 -r6245 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile2DSurfaceLineHelper.cs (.../SoilProfile2DSurfaceLineHelper.cs) (revision 6165) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile2DSurfaceLineHelper.cs (.../SoilProfile2DSurfaceLineHelper.cs) (revision 6245) @@ -74,7 +74,7 @@ { if (soilProfile2D == null || soilProfile2D.Surfaces.Count == 0) return null; - if (surfaceLine == null || surfaceLine.CalcPoints.Count == 0) + if (surfaceLine == null || surfaceLine.Points.Count == 0) return null; SoilProfile2D clonedProfile = soilProfile2D.Clone(); @@ -111,7 +111,7 @@ public static bool IsSurfaceLineAboveBottomSoilProfile2D(SurfaceLine2 surfaceLine, SoilProfile2D soilProfile2D) { double bottom = soilProfile2D.Geometry.Bottom; - foreach (Point2D point in surfaceLine.Geometry.CalcPoints) + foreach (Point2D point in surfaceLine.Geometry.Points) { if (point.Z < bottom) { @@ -154,7 +154,7 @@ } resultGeometry.Rebox(); - if (surfaceLine == null || surfaceLine.CalcPoints.Count <= 2) + if (surfaceLine == null || surfaceLine.Points.Count <= 2) { return null; } @@ -200,7 +200,7 @@ { geometryData.NewlyEffectedCurves.Clear(); geometryData.NewlyEffectedPoints.Clear(); - IList points = surfaceLine.CalcPoints; + IList points = surfaceLine.Points; GeometryData geometry = geometryData; Point2D currentPoint1 = points[0].Clone(); var existingPoint1 = geometry.GetPointAtLocation(currentPoint1); @@ -268,7 +268,7 @@ private static void RemoveGeometryDataAboveSurfaceLine(GeometryPointString surfaceLine, ref GeometryData result) { - if (surfaceLine == null || surfaceLine.CalcPoints.Count <= 1) + if (surfaceLine == null || surfaceLine.Points.Count <= 1) return; foreach (GeometrySurface geometrySurface in result.Surfaces.ToArray()) { @@ -352,7 +352,7 @@ return false; } - return layer.GeometrySurface.OuterLoop.CalcPoints.All(point => !point.Z.IsLessThan(surfaceLine.GetZatX(point.X))); + return layer.GeometrySurface.OuterLoop.Points.All(point => !point.Z.IsLessThan(surfaceLine.GetZatX(point.X))); } private static void ReconstructPreConsolidations(ref SoilProfile2D result, SoilProfile2D clonedProfile) @@ -365,8 +365,8 @@ private static SoilLayer2D DetermineLayerIfSurfaceIsLeftOrRightOfOldSurfaces(GeometrySurface surface, List oldSurfaces) { - double[] xMin = surface.OuterLoop.CalcPoints.Select(p => p.X).OrderBy(x => x).Distinct().ToArray(); - double[] zMin = surface.OuterLoop.CalcPoints.Select(p => p.Z).OrderBy(z => z).Distinct().ToArray(); + double[] xMin = surface.OuterLoop.Points.Select(p => p.X).OrderBy(x => x).Distinct().ToArray(); + double[] zMin = surface.OuterLoop.Points.Select(p => p.Z).OrderBy(z => z).Distinct().ToArray(); var leftPoint = new Point2D { X = xMin[0] - 0.1,