Changeset 5776

Timestamp:

Sep 20, 2008, 12:18:08 AM (15 years ago)

Author:

ole

Message:

Optimised get_energy_through_cross_section

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• quantity.py (modified) (3 diffs)
• test_quantity.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -1006 +1006 @@
 
 
-    def get_interpolated_values(self, interpolation_points):
+    def get_interpolated_values(self, interpolation_points,
+                                verbose=False):
         """ Get values at interpolation points
         
@@ -1047 +1048 @@
                                          axis=1)
 
-        can_reuse = False
-        if hasattr(self, 'interpolation_object'):
-            # Reuse to save time
-            I = self.interpolation_object
-
-            if allclose(interpolation_points.shape, 
-                        I._point_coordinates.shape):
-                if allclose(interpolation_points, I._point_coordinates):
-                    can_reuse = True
-                
-
-        if can_reuse is True:
-            # Use absence of points to indicate reuse in I.interpolate
-            result = I.interpolate(vertex_values) 
-        else:    
-            from anuga.fit_interpolate.interpolate import Interpolate
-
-            # Create interpolation object with matrix
-            I = Interpolate(vertex_coordinates, triangles)
-            self.interpolation_object = I
-
-            # Call interpolate with points the first time
-            interpolation_points = ensure_numeric(interpolation_points, Float)
-            result = I.interpolate(vertex_values, interpolation_points)     
-
-        return result
-
-
-    def get_values(self, interpolation_points=None,
+        # Use caching to reuse interpolation information
+        from anuga.fit_interpolate.interpolate import interpolate
+        return interpolate(vertex_coordinates, triangles, vertex_values, interpolation_points,
+                           use_cache=True, 
+                           verbose=verbose)
+
+
+    def get_values(self, 
+                   interpolation_points=None,
                    location='vertices',
-                   indices = None):
+                   indices=None,
+                   verbose=False):
         """get values for quantity
 
@@ -1119 +1101 @@
         #              polygon into get_values. The question becomes how
         #              resulting values should be ordered.
+        
+        if verbose is True:
+            print 'Getting values from %s' %location
 
         if interpolation_points is not None:
-            return self.get_interpolated_values(interpolation_points)
+            return self.get_interpolated_values(interpolation_points,
+                                                verbose=verbose)
         
         

anuga_core/source/anuga/abstract_2d_finite_volumes/test_quantity.py

@@ -2310 +2310 @@
         answer = quantity.get_values(location='centroids')
         #print answer
-        #print quantity.get_values(points=interpolation_points)
-        assert allclose(answer, quantity.get_values(interpolation_points=interpolation_points))        
+        #print quantity.get_values(interpolation_points=interpolation_points)
+        assert allclose(answer, quantity.get_values(interpolation_points=interpolation_points,
+                                                    verbose=False))