Changeset 6194 for anuga_core/source/anuga/fit_interpolate/interpolate.py

Timestamp:

Jan 19, 2009, 8:47:26 AM (15 years ago)

Author:

ole

Message:

Work on Patong, diagnostics and one optimisation

File:

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

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -759 +759 @@
         import types
 
+        if verbose is True:
+            print 'Interpolation_function: input checks'
+
         # Check temporal info
-        time = ensure_numeric(time)        
-        msg = 'Time must be a monotonuosly increasing sequence %s' % time
-        assert num.alltrue(time[1:] - time[:-1] >= 0), msg
+        time = ensure_numeric(time)
+        if not num.alltrue(time[1:] - time[:-1] >= 0):
+            # This message is time consuming to form due to the conversion of
+            msg = 'Time must be a monotonuosly increasing sequence %s' % time
+            raise Exception, msg
 
         # Check if quantities is a single array only
@@ -788 +793 @@
             self.spatial = True          
 
+        if verbose is True:
+            print 'Interpolation_function: thinning'
+
+            
         # Thin timesteps if needed
         # Note array() is used to make the thinned arrays contiguous in memory
@@ -794 +803 @@
             if len(quantities[name].shape) == 2:
                 quantities[name] = num.array(quantities[name][::time_thinning,:])
-             
+
+        if verbose is True:
+            print 'Interpolation_function: precomputing'
+            
         # Save for use with statistics
         self.quantities_range = {}
@@ -915 +927 @@
                 print msg
 
+            # FIXME(Ole): This one is no longer needed for STS files
             interpol = Interpolate(vertex_coordinates,
                                    triangles,