Changeset 3768

Timestamp:

Oct 13, 2006, 12:13:34 PM (18 years ago)

Author:

ole

Message:

A bit of formatting

File:

• anuga_core/source/anuga/fit_interpolate/interpolate.py (modified) (16 diffs)

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -35 +35 @@
 from anuga.utilities.numerical_tools import ensure_numeric, mean, NAN
 from anuga.utilities.polygon import in_and_outside_polygon
-from anuga.geospatial_data.geospatial_data import Geospatial_data, ensure_absolute
+from anuga.geospatial_data.geospatial_data import Geospatial_data
+from anuga.geospatial_data.geospatial_data import ensure_absolute
 from anuga.fit_interpolate.search_functions import search_tree_of_vertices
 from anuga.fit_interpolate.general_fit_interpolate import FitInterpolate
@@ -120 +121 @@
         # FIXME (Ole): Need an input check that dimensions are compatible
 
-        # FIXME (Ole): Why is the interpolation matrix rebuilt everytime the method is called
-        # even if interpolation points are unchanged.
+        # FIXME (Ole): Why is the interpolation matrix rebuilt everytime the
+        # method is called even if interpolation points are unchanged.
         
         #print "point_coordinates interpolate.interpolate", point_coordinates 
@@ -168 +169 @@
                                  len(point_coordinates),
                                  start_blocking_len):
+                    
                     t = self.interpolate_block(f, point_coordinates[start:end],
                                                verbose=verbose)
@@ -174 +176 @@
                     z = concatenate((z,t))
                     start = end
+                    
                 end = len(point_coordinates)
                 t = self.interpolate_block(f, point_coordinates[start:end],
@@ -179 +182 @@
                 z = concatenate((z,t))
         return z
-
 
     def interpolate_block(self, f, point_coordinates = None, verbose=False):
@@ -213 +215 @@
             z[i] = NAN
         return z
-
 
     def _build_interpolation_matrix_A(self,
@@ -364 +365 @@
         velocity_y_writer.writerow(velocity_ys)
 
+
 class Interpolation_function:
     """Interpolation_interface - creates callable object f(t, id) or f(t,x,y)
@@ -398 +400 @@
     If None, return average value
     """
-
-    
+  
     
     def __init__(self,
@@ -467 +468 @@
         self.index = 0    # Initial time index
         self.precomputed_values = {}
-        
-
-
-
         
             
@@ -504 +501 @@
             if verbose: print 'Interpolate'
             for i, t in enumerate(self.time):
-                #Interpolate quantities at this timestep
+                # Interpolate quantities at this timestep
                 if verbose and i%((p+10)/10)==0:
                     print ' time step %d of %d' %(i, p)
@@ -510 +507 @@
                 for name in quantity_names:
                     if len(quantities[name].shape) == 2:
-                        result = interpol.interpolate(quantities[name][i,:],
-                                                      point_coordinates = \
-                                                      self.interpolation_points)
+                        Q = quantities[name][i,:] # Quantities at timestep i
                     else:
-                       #Assume no time dependency 
-                       result = interpol.interpolate(quantities[name][:],
-                                     point_coordinates = \
-                                     self.interpolation_points)
+                        Q = quantities[name][:]   # No time dependency
                        
+                    # Interpolate    
+                    result = interpol.interpolate(Q,
+                                                  point_coordinates=\
+                                                  self.interpolation_points)
                     self.precomputed_values[name][i, :] = result
+
                    
-            #Report
+            # Report
             if verbose:
                 print self.statistics()
@@ -527 +524 @@
             
         else:
-            #Store quantitites as is
-            for name in quantity_names:
+            # Store quantitites as is
+            for name in quantity_names:
                 self.precomputed_values[name] = quantities[name]
 
-
     def __repr__(self):
-        #return 'Interpolation function (spatio-temporal)'
+        # return 'Interpolation function (spatio-temporal)'
         return self.statistics()
-    
-
-    def __call__(self, t, point_id = None, x = None, y = None):
+ 
+    def __call__(self, t, point_id=None, x=None, y=None):
         """Evaluate f(t), f(t, point_id) or f(t, x, y)
 
@@ -665 +660 @@
         return self.time
 
+
     def statistics(self):
         """Output statistics about interpolation_function
@@ -711 +707 @@
         return str
 
+
 def interpolate_sww(sww_file, time, interpolation_points,
                     quantity_names = None, verbose = False):
@@ -729 +726 @@
 
     #Will return the quantity values at the specified times and locations
-    interp =  Interpolation_interface(
-                 time,
-                 quantities,
-                 quantity_names = quantity_names,  
-                 vertex_coordinates = vertex_coordinates,
-                 triangles = volumes,
-                 interpolation_points = interpolation_points,
-                 verbose = verbose)
+    interp = Interpolation_interface(time,
+                                     quantities,
+                                     quantity_names=quantity_names,  
+                                     vertex_coordinates=vertex_coordinates,
+                                     triangles=volumes,
+                                     interpolation_points=interpolation_points,
+                                     verbose=verbose)
 
 
@@ -801 +797 @@
     return x, y, volumes, time, quantities
 
+
 #-------------------------------------------------------------
 if __name__ == "__main__":