Changeset 4666 for anuga_core/source/anuga/utilities

Timestamp:

Aug 8, 2007, 2:29:01 PM (18 years ago)

Author:

duncan

Message:

unverified solution to ticket#176

Location:

anuga_core/source/anuga/utilities

Files:

• quad.py (modified) (9 diffs)
• test_quad.py (modified) (2 diffs)

anuga_core/source/anuga/utilities/quad.py

@@ -27 +27 @@
     """
   
-    def __init__(self, southern, northern, western, eastern, 
+    def __init__(self, southern, northern, western, eastern, mesh,
                  name = 'cell',
                  max_points_per_cell = 4):
@@ -39 +39 @@
         self.western = round(western,5)    
         self.eastern = round(eastern,5)
+        self.mesh = mesh
 
         # The points in this cell     
@@ -63 +64 @@
         cn = self.northern
         cw = self.western    
-        ce = self.eastern
+        ce = self.eastern   
+        mesh = self.mesh
 
         # create 4 child cells
-        self.AddChild(Cell((cn+cs)/2,cn,cw,(cw+ce)/2,self.name+'_nw'))
-        self.AddChild(Cell((cn+cs)/2,cn,(cw+ce)/2,ce,self.name+'_ne'))
-        self.AddChild(Cell(cs,(cn+cs)/2,(cw+ce)/2,ce,self.name+'_se'))
-        self.AddChild(Cell(cs,(cn+cs)/2,cw,(cw+ce)/2,self.name+'_sw'))
+        self.AddChild(Cell((cn+cs)/2,cn,cw,(cw+ce)/2,mesh,self.name+'_nw'))
+        self.AddChild(Cell((cn+cs)/2,cn,(cw+ce)/2,ce,mesh,self.name+'_ne'))
+        self.AddChild(Cell(cs,(cn+cs)/2,(cw+ce)/2,ce,mesh,self.name+'_se'))
+        self.AddChild(Cell(cs,(cn+cs)/2,cw,(cw+ce)/2,mesh,self.name+'_sw'))
         
  
@@ -140 +142 @@
         if len(args) == 2:
             point_id = int(args[1])
-            x, y = self.__class__.mesh.get_nodes()[point_id]
+            x, y = self.mesh.get_nodes()[point_id]
 
             #print point_id, x, y
@@ -181 +183 @@
                     self.store(point)
                 else:
-                    x = self.__class__.mesh.coordinates[point][0]
-                    y = self.__class__.mesh.coordinates[point][1]
+                    x = self.mesh.coordinates[point][0]
+                    y = self.mesh.coordinates[point][1]
                     print "(" + str(x) + "," + str(y) + ")"
                     raise 'point not in region: %s' %str(point)
@@ -223 +225 @@
             # print "verts", verts
             for vert in verts:
-                triangle_list = self.__class__.mesh.get_triangles_and_vertices_per_node(vert)
+                triangle_list = self.mesh.get_triangles_and_vertices_per_node(vert)
                 for k, _ in triangle_list:
                     if not triangles.has_key(k):
                         # print 'k',k
-                        tri = self.__class__.mesh.get_vertex_coordinates(k)
-                        n0 = self.__class__.mesh.get_normal(k, 0)
-                        n1 = self.__class__.mesh.get_normal(k, 1)
-                        n2 = self.__class__.mesh.get_normal(k, 2) 
+                        tri = self.mesh.get_vertex_coordinates(k)
+                        n0 = self.mesh.get_normal(k, 0)
+                        n1 = self.mesh.get_normal(k, 1)
+                        n2 = self.mesh.get_normal(k, 2) 
                         triangles[k]=(tri, (n0, n1, n2))
             self.triangles = triangles.items()
@@ -418 +420 @@
         
 
-    #Class initialisation method        
-    def initialise(cls, mesh):
-        cls.mesh = mesh
-
-    initialise = classmethod(initialise)
+    #Class initialisation method
+    # this is bad.  It adds a huge memory structure to the class.
+    # When the instance is deleted the mesh hangs round (leaks).
+    #def initialise(cls, mesh):
+    #    cls.mesh = mesh
+
+    #initialise = classmethod(initialise)
 
 def build_quadtree(mesh, max_points_per_cell = 4):
     """Build quad tree for mesh.
 
-    All vertices in mesh are stored in quadtree and a reference to the root is returned.
+    All vertices in mesh are stored in quadtree and a reference
+    to the root is returned.
     """
 
     from Numeric import minimum, maximum
 
-    #Initialise
-    Cell.initialise(mesh)
 
     #Make root cell
@@ -445 +448 @@
 
     
-    #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
-    #belong to the neighbouring cell.
-    #Hence, the root cell needs to be expanded slightly
+    # 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
+    # belong to the neighbouring cell.
+    # Hence, the root cell needs to be expanded slightly
     ymax += (ymax-ymin)/10
     xmax += (xmax-xmin)/10
@@ -462 +466 @@
     
     #FIXME: Use mesh.filename if it exists
-    root = Cell(ymin, ymax, xmin, xmax,
+    root = Cell(ymin, ymax, xmin, xmax,mesh,
                 #name = .... 
                 max_points_per_cell = max_points_per_cell)

anuga_core/source/anuga/utilities/test_quad.py

@@ -12 +12 @@
 
     def setUp(self):
-        self.cell = Cell(100, 140, 0, 40, 'cell')
 
         a = [3, 107]
@@ -30 +29 @@
         mesh = Mesh(points, vertices)
         self.mesh = mesh
-        Cell.initialise(mesh)
+        self.cell = Cell(100, 140, 0, 40, mesh, 'cell')
 
     def tearDown(self):