Changeset 2563 for inundation/fit_interpolate/interpolate.py

Timestamp:

Mar 21, 2006, 10:58:32 AM (18 years ago)

Author:

duncan

Message:

get interpolate tests running in test_all

File:

• inundation/fit_interpolate/interpolate.py (modified) (10 diffs)

inundation/fit_interpolate/interpolate.py

@@ -19 +19 @@
 
 import time
+import os
+from warnings import warn
 
 from Numeric import zeros, array, Float, Int, dot, transpose, concatenate, \
@@ -28 +30 @@
 from coordinate_transforms.geo_reference import Geo_reference
 from pyvolution.quad import build_quadtree
-from utilities.numerical_tools import ensure_numeric
+from utilities.numerical_tools import ensure_numeric, mean
 from utilities.polygon import inside_polygon
 
@@ -160 +162 @@
                     A[i,j] = sigmas[j]
             else:
-                print 'Could not find triangle for point', x 
+                # Hack so this message only appears when the test is
+                #run in fit_interpoate directory.
+                #Error message reminds me to do something
+                #with points outside the polygon
+                if os.getcwd()[-15:] == "fit_interpolate":
+                    print 'Could not find triangle for point', x 
         return A
 
@@ -258 +265 @@
 
 
-     # FIXME: What is a good start_blocking_count value?
+     # FIXME: What is a good start_blocking_len value?
     def interpolate(self, f, point_coordinates = None,
                     start_blocking_len = 500000, verbose=False):
@@ -298 +305 @@
                 #There are no good point_coordinates. import sys; sys.exit()
                 msg = 'ERROR (interpolate.py): No point_coordinates inputted'
-                raise msg
+                raise Exception(msg)
+            
             
         if point_coordinates is not None:
@@ -342 +350 @@
 
 
-class Interpolation_interface:
+class Interpolation_function:
     """Interpolation_interface - creates callable object f(t, id) or f(t,x,y)
     which is interpolated from time series defined at vertices of
@@ -394 +402 @@
 
 
-        from util import mean, ensure_numeric
+        #from util import mean, ensure_numeric
         from config import time_format
         import types
@@ -532 +540 @@
                 if x is None or y is None:
                     msg = 'Either point_id or x and y must be specified'
-                    raise msg
+                    raise Exception(msg)
             else:
                 if self.interpolation_points is None:
@@ -538 +546 @@
                           'with a list of interpolation points before parameter ' +\
                           'point_id can be used'
-                    raise msg
+                    raise Exception(msg)
 
 
         msg = 'Time interval [%s:%s]' %(self.T[0], self.T[1])
         msg += ' does not match model time: %s\n' %t
-        if t < self.T[0]: raise msg
-        if t > self.T[-1]: raise msg
+        if t < self.T[0]: raise Exception(msg)
+        if t > self.T[-1]: raise Exception(msg)
 
         oldindex = self.index #Time index
@@ -698 +706 @@
 def read_sww(file_name):
     """
+    obsolete - Nothing should be calling this
+    
     Read in an sww file.