Changeset 2563 for inundation/fit_interpolate/test_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/test_interpolate.py (modified) (4 diffs)

inundation/fit_interpolate/test_interpolate.py

@@ -20 +20 @@
 from coordinate_transforms.geo_reference import Geo_reference
 from shallow_water import Domain, Transmissive_boundary #, mean
-from util import mean
+from utilities.numerical_tools import mean
 from data_manager import get_dataobject
 
@@ -623 +623 @@
         #Check basic interpolation of one quantity using averaging
         #(no interpolation points or spatial info)
-        from util import mean        
-        I = Interpolation_interface(time, [mean(Q[0,:]),
+        I = Interpolation_function(time, [mean(Q[0,:]),
                                           mean(Q[1,:]),
                                           mean(Q[2,:])])
@@ -702 +701 @@
 
         #Check interpolation of one quantity using interpolaton points
-        I = Interpolation_interface(time, Q,
+        I = Interpolation_function(time, Q,
                                    vertex_coordinates = points,
                                    triangles = triangles, 
@@ -770 +769 @@
 
         #Check interpolation of one quantity using interpolaton points)
-        I = Interpolation_interface(time, Q,
+        I = Interpolation_function(time, Q,
                                    vertex_coordinates = points,
                                    triangles = triangles,