Changeset 4779 for anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py

Timestamp:

Nov 2, 2007, 5:18:29 PM (17 years ago)

Author:

duncan

Message:

reduce memory use in quantity.set_value. fit_to_mesh can now use an existing mesh instance, which it does in quantity.set_value.

File:

• anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py (modified) (4 diffs)

anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py

@@ -44 +44 @@
     
     def __init__(self,
-                 vertex_coordinates,
-                 triangles,
+                 vertex_coordinates=None,
+                 triangles=None,
+                 mesh=None,
                  mesh_origin=None,
                  verbose=False,
@@ -54 +55 @@
         function values at vertices to function values at data points
 
+        Pass in a mesh instance or vertex_coordinates and triangles
+        and optionally mesh_origin
+        
         Inputs:
 
@@ -64 +68 @@
           triangles: List of 3-tuples (or a Numeric array) of
               integers representing indices of all vertices in the mesh.
+
+        mesh: A mesh instance describing the mesh.
 
           mesh_origin: A geo_reference object or 3-tuples consisting of
@@ -79 +85 @@
         if max_vertices_per_cell == None:
             max_vertices_per_cell = MAX_VERTICES_PER_CELL
-        
-        #Convert input to Numeric arrays
-        triangles = ensure_numeric(triangles, Int)
-        vertex_coordinates = ensure_absolute(vertex_coordinates,
-                                             geo_reference = mesh_origin)
 
-        #Don't pass geo_reference to mesh.  It doesn't work. (Still??)
-        
-        if verbose: print 'FitInterpolate: Building mesh'        
-        self.mesh = Mesh(vertex_coordinates, triangles)
-        self.mesh.check_integrity()
+        if mesh is None:
+            # Fixme (DSG) Throw errors if triangles or vertex_coordinates
+            # are None
+            
+            #Convert input to Numeric arrays
+            triangles = ensure_numeric(triangles, Int)
+            vertex_coordinates = ensure_absolute(vertex_coordinates,
+                                                 geo_reference = mesh_origin)
+
+            if verbose: print 'FitInterpolate: Building mesh'        
+            self.mesh = Mesh(vertex_coordinates, triangles)
+            self.mesh.check_integrity()
+        else:
+            self.mesh = mesh
         
         if verbose: print 'FitInterpolate: Building quad tree'