Changeset 3260

Timestamp:

Jun 30, 2006, 10:19:24 AM (18 years ago)

Author:

duncan

Message:

bringing interpolate_sww back to life

Location:

inundation

Files:

• pyvolution/interpolate_sww.py (modified) (6 diffs)
• pyvolution/test_interpolate_sww.py (modified) (4 diffs)
• test_all.py (modified) (1 diff)

inundation/pyvolution/interpolate_sww.py

@@ -1 +1 @@
 """ Interpolation of a sww file.
 
-THIS FILE IS OBSOLETE
-
-Used to interpolate height information from sww files.
+Used to interpolate height and other information from sww files.
 
 When using as a stand alone application,
@@ -26 +24 @@
 
 from Numeric import transpose
-from least_squares import Interpolation 
+from fit_interpolate.interpolate import Interpolate 
 
 DEFAULT_QUANTITY = "depth"
 
 def  interpolate_sww2xya(sww_file, quantity_name,point_file_in,
-                         point_file_out, display_errors = True):
+                         point_file_out, verbose = True):
     """
     This function catches exceptions.
@@ -40 +38 @@
         interp.write_depth_xya(point_file_out)
     except IOError,e: #need to convert key error to ioerror
-        if display_errors:
+        if verbose:
             print "Could not load bad file. ", e
         import sys; sys.exit()
@@ -63 +61 @@
         # Refactor when necessary. - DSG
 
-        print "Obsolete."
         x, y, volumes, time, quantity = self.read_sww(file_name, quantity_name)
         vertex_coordinates = transpose([x,y])
@@ -87 +84 @@
             print vertex_coordinates
             print "****************************"
-        
-        self.interp = Interpolation(vertex_coordinates, volumes, alpha=0)
+        self.vertex_coordinates = vertex_coordinates
+        self.volumes = volumes
         self.time = time
 
@@ -105 +102 @@
         from load_mesh.loadASCII import import_points_file
         
+        interp = Interpolate(self.vertex_coordinates, self.volumes)
         point_dict = import_points_file(file_name)
         self.point_coordinates = point_dict['pointlist']
-        self.interp.build_interpolation_matrix_A(self.point_coordinates)
-        self.interpolated_quantity_raw = self.interp.interpolate(transpose(self.quantity))
+        self.interpolated_quantity_raw = interp.interpolate(transpose(self.quantity),
+                                                            point_coordinates = self.point_coordinates)
+        #self.interpolated_quantity_raw = self.interp.interpolate(transpose(self.quantity))
         self.interpolated_quantity = {}
         for i,time_slice in enumerate(self.time):

inundation/pyvolution/test_interpolate_sww.py

@@ -138 +138 @@
 
     def test_interpolate_sww(self):
-        """Not reaa unit test, rather a system test for
-        """
+        ### Not really a unit test, rather a system test for
+        ###  
 
         import time, os
@@ -231 +231 @@
         try:
             interpolate_sww2xya('??ffd??', 'stage','yeah','yeah.x',
-                                display_errors = False)
+                                verbose = False)
         except SystemExit:  pass
         else:
@@ -252 +252 @@
         try:
             interpolate_sww2xya(sww_file, 'stage','yeah','yeah.x',
-                                display_errors = False)
+                                verbose = False)
             
         except SystemExit:  pass
@@ -282 +282 @@
             interpolate_sww2xya(self.domain.filename,
                                 'stage','yeah','yeah.x',
-                                display_errors = False)
+                                verbose = False)
         except SystemExit:  pass
         else:

inundation/test_all.py

@@ -19 +19 @@
                  'test_advection.py', # removing this test for a bit
                  #'test_mesh.py', # bug fixing
-                 'test_interpolate_sww.py' # this test is obsolete
                  ]
                  #'test_calculate_region.py', 'test_calculate_point.py']