Changeset 684 for inundation

Timestamp:

Dec 7, 2004, 4:06:17 PM (20 years ago)

Author:

duncan

Message:

update from Vanessa

File:

• inundation/ga/storm_surge/alpha_shape/alpha_shape.py (modified) (5 diffs)

inundation/ga/storm_surge/alpha_shape/alpha_shape.py

@@ -90 +90 @@
         pointattlist = [ [] for i in range(len(points)) ] 
         mode = "Qzcn"
-        #print "compute delaunay triangulation" 
+        print "computing delaunay triangulation ... \n" 
         tridata = triang.genMesh(points,seglist,holelist,regionlist,pointattlist,segattlist,trilist,mode)
         #print tridata
@@ -99 +99 @@
         self.hulledges = tridata['generatedsegmentlist']                              
 
-        #print "deltri: ", self.deltri, "\n"
+        print "Number of delaunay triangles: ", len(self.deltri), "\n"
         #print "deltrinbrs: ", self.deltrinbr, "\n"
 
         # Build Alpha table
+        print "Building alpha table ... \n" 
         self._tri_circumradius()
+        print "Largest circumradius ", max(self.triradius)
         self._edge_intervals()
         self._vertex_intervals()
@@ -112 +114 @@
             # every vertex is non-singular so... 
             self.optimum_alpha = max([ interval[0] for interval in self.vertexinterval])
-            #print "optimum alpha ", self.optimum_alpha
+            print "optimum alpha ", self.optimum_alpha
 
             #alpha_tri = self.get_alpha_triangles(self.optimum_alpha)
@@ -247 +249 @@
         for i in range(nv):
             radii = [ self.triradius[t] for t in vertexnbrs[i] if t>=0 ]
-            vertexinterval[i] = [min(radii), max(radii)]
-            if vertexnbrs[i][-1]==-1:
-                vertexinterval[i][1]=INF
+            try:
+                vertexinterval[i] = [min(radii), max(radii)]
+                if vertexnbrs[i][-1]==-1:
+                    vertexinterval[i][1]=INF
+            except ValueError:
+                print "Vertex %i is isolated?"%i
+                print "coords: ",self.points[i]
+                print "Vertex nbrs: ", vertexnbrs[i]
+                print "nbr radii: ",radii
+                vertexinterval[i] = [0,INF]
+                pass
 
         self.vertexnbr = vertexnbrs
@@ -303 +313 @@
             alpha = None
 
+        print "about to call alpha shape routine \n"
         alpha_shape_via_files(point_file, boundary_file, alpha)