Changeset 707 for inundation

Timestamp:

Dec 14, 2004, 2:18:21 PM (20 years ago)

Author:

duncan

Message:

fixed round off error in quad

Location:

inundation/ga/storm_surge/pyvolution

Files:

• quad.py (modified) (3 diffs)
• test_quad.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/quad.py

@@ -181 +181 @@
                     self.store(point)
                 else:
+                    x = self.__class__.mesh.coordinates[point][0]
+                    y = self.__class__.mesh.coordinates[point][1]
+                    print "(" + str(x) + "," + str(y) + ")"
                     raise 'point not in region: %s' %str(point)
                 
@@ -397 +400 @@
     ymax = max(mesh.coordinates[:,1])
 
+    
     #Ensure boundary points are fully contained in region
     #It is a property of the cell structure that points on xmax or ymax of any given cell
@@ -402 +406 @@
     #Hence, the root cell needs to be expanded slightly
     ymax += (ymax-ymin)/10
-    xmax += (xmax-xmin)/10   
-
-
+    xmax += (xmax-xmin)/10
+
+    # To avoid round off error
+    ymin -= (ymax-ymin)/10
+    xmin -= (xmax-xmin)/10   
+
+    #print "xmin", xmin 
+    #print "xmax", xmax
+    #print "ymin", ymin 
+    #print "ymax", ymax
+    
     #FIXME: Use mesh.filename if it exists
     root = Cell(ymin, ymax, xmin, xmax,

inundation/ga/storm_surge/pyvolution/test_quad.py

@@ -130 +130 @@
         self.assertEqual(result, [0,1,2,3])
 
+     
+    def test_build_quadtreeII(self):
+
+        self.cell = Cell(100, 140, 0, 40, 'cell')
         
+        p0 = [34.6292076111,-7999.92529297]
+        p1 = [8000.0, 7999.0]
+        p2 = [-7999.96630859, 7999.0]
+        p3 = [34, 7999.97021484]
 
+        points = [p0,p1,p2, p3]
+        #bac, bce, ecf, dbe, daf, dae 
+        vertices = [[0,1,2],[0,2,3]]
+
+        mesh = Mesh(points, vertices)
+
+        #This was causing round off error
+        Q = build_quadtree(mesh)
+        
 #-------------------------------------------------------------
 if __name__ == "__main__":