Changeset 824

Timestamp:

Feb 1, 2005, 2:12:49 PM (20 years ago)

Author:

prow

Message:

Fixed some bugs. See docs.

File:

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

inundation/ga/storm_surge/pmesh/mesh.py

@@ -790 +790 @@
         pointlist=[]
         pointattributelist=[]
-        
         index = 0
         for vertex in self.userVertices:
@@ -843 +842 @@
         pointattributelist=[]
 
-        index = 0
+
+        self.maxVertexIndex=0
         for vertex in self.meshVertices:
-            vertex.index = index 
+            vertex.index = self.maxVertexIndex 
             pointlist.append((vertex.x,vertex.y))
             pointattributelist.append((vertex.attributes))           
-            index += 1
+            self.maxVertexIndex += 1
 
         meshDict['generatedpointlist'] = pointlist
@@ -925 +925 @@
         #print genDict
         #print "@#@#@#"
-        
-        index = 0
+
+        self.maxVertexIndex = 0
         for point in genDict['generatedpointlist']:
             v=Vertex(point[0], point[1])
-            v.index = index
-            index +=1
+            v.index =  self.maxVertexIndex
+            self.maxVertexIndex +=1
             self.meshVertices.append(v)
 
@@ -2182 +2182 @@
         """
 
-        new_triangle1 = Triangle(new_point,triangle.vertices[0],triangle.vertices[1],attribute = None, neighbors = None)
-        new_triangle2 = Triangle(new_point,triangle.vertices[2],triangle.vertices[0],attribute = None, neighbors = None)
+        new_triangle1 = Triangle(new_point,triangle.vertices[0],triangle.vertices[1],attribute = triangle.attribute, neighbors = None)
+        new_triangle2 = Triangle(new_point,triangle.vertices[2],triangle.vertices[0],attribute = triangle.attribute, neighbors = None)
 
         new_triangle1.setNeighbors(triangle.neighbors[2],None,new_triangle2)
@@ -2260 +2260 @@
         new_coordinate = [((a[0]-b[0])/2+b[0]),((a[1]-b[1])/2+b[1])]
         newVertex = Vertex(new_coordinate[0],new_coordinate[1], attributes = attributes)
+        mesh.maxVertexIndex+=1
+        newVertex.index = mesh.maxVertexIndex
+        mesh.meshVertices.append(newVertex)
         return newVertex