Changeset 9141

Timestamp:

Jun 11, 2014, 9:54:34 AM (10 years ago)

Author:

davies

Message:

Removing duplicate points before passing to triangle.c [to avoid segfault in some cases with breaklines]

Location:

trunk/anuga_core/source/anuga/mesh_engine

Files:

• mesh_engine.py (modified) (1 diff)
• mesh_engine_c_layer.c (modified) (1 diff)

trunk/anuga_core/source/anuga/mesh_engine/mesh_engine.py

@@ -119 +119 @@
         #    list of neighboring triangles
         # EG handles lone verts!
-            
+    #
+    # GD (June 2014): We get segfaults in some cases with breakLines, unless
+    # we remove repeated values in 'points', and adjust segments accordingly
+    # 
+    pts_complex=points[:,0]+1j*points[:,1] # Use to match points
+    i=0 # Use this as a counter, since the length of 'points' changes as we go
+    while (i < len(pts_complex)-1):
+        i=i+1 # Maximum i = len(pts_complex)-1 = largest index of points
+        #
+        # Check if points[i,] is the same as a previous point
+        if(any(pts_complex[i]==pts_complex[0:i])):
+            # Get index of previous occurrence
+            earlierInd=(pts_complex[i]==pts_complex[0:i]).nonzero()[0][0]
+            # Remove the ith point, and adjust the segments
+            for ii in range(len(segments)):
+                for j in range(2):
+                    if(segments[ii,j] == i):
+                        # Segment will use previous occurrence of this point
+                        segments[ii,j]=earlierInd
+                    if(segments[ii,j]>i):
+                        # Decrement the index (since we will remove point[i,])
+                        segments[ii,j] = segments[ii,j]-1
+            # Remove ith point
+            points=num.delete(points, i, 0)
+            pointatts=num.delete(pointatts,i,0)
+            # Recompute the complex number points for matching
+            pts_complex=points[:,0]+1j*points[:,1]
+            i=i-1 # Repeat for the last value of i = next point
+
     trianglelist, pointlist, pointmarkerlist, pointattributelist, triangleattributelist, segmentlist, segmentmarkerlist, neighborlist = triang.genMesh(points,segments,holes,regions,
                           pointatts,segatts, mode)

trunk/anuga_core/source/anuga/mesh_engine/mesh_engine_c_layer.c

@@ -240 +240 @@
   out.holelist = (REAL *)NULL;
   out.regionlist = (REAL *)NULL;
-    
-  
+
   triangulate(mod, &in, &out, (struct triangulateio *)NULL );