Changeset 1396

Timestamp:

May 16, 2005, 11:23:35 AM (20 years ago)

Author:

duncan

Message:

load_mesh refactoring

Location:

inundation/ga/storm_surge/pyvolution

Files:

• interpolate_sww.py (modified) (3 diffs)
• test_interpolate_sww.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/interpolate_sww.py

@@ -72 +72 @@
         file_name - the xya file
         """
-        self.point_coordinates = self.read_xya(file_name)
+        
+        from load_mesh.loadASCII import import_points_file
+        
+        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 = self.interp.interpolate(transpose(self.quantity))
+        self.interpolated_quantity_raw = self.interp.interpolate(transpose(self.quantity))
+        self.interpolated_quantity = {}
+        for i,time_slice in enumerate(self.time):
+            self.interpolated_quantity[str(time_slice)] = self.interpolated_quantity_raw[:,i]
         
+            
     def read_sww(self,file_name, quantity_name):
         """
@@ -121 +129 @@
         return x, y, volumes, time, quantity
 
-    def read_xya(self,point_file):
-        """
-        Read in an xya file.
-
-        Input;
-        point_file - the xya file
-
-        Output;
-        point_coordinates - the points (x,y) where the depth values
-                             (w.r.t. time) are needed
-        """
-        from load_mesh.loadASCII import import_points_file
-        
-        point_dict = import_points_file(point_file)
-        return point_dict['pointlist']
-
-
     def write_depth_xya(self,point_file, delimiter = ','):
         """
@@ -145 +136 @@
         The time list is defined
         """
-        from load_mesh.loadASCII import  export_xya_file
+        from load_mesh.loadASCII import  export_points_file
 
-        #create the first line, giving the times 
-        if len(self.time) != 0:
-            for i in range(len(self.time)):
-                if i == 0:
-                    title = str(self.time[0])
-                else:
-                    title = title + delimiter + str(self.time[i])
-        else:
-            title  = ""
-        
-        #print ">" +  str(self.time) + "<"
-        #print ">" + title + "<"
         
         xya_dict = {}
         xya_dict['pointlist'] = self.point_coordinates
-        xya_dict['pointattributelist'] = self.interpolated_quantity
-        
-        export_xya_file(point_file, xya_dict, title, delimiter = delimiter)
+        xya_dict['attributelist'] = self.interpolated_quantity
+        export_points_file(point_file, xya_dict)
         
 #-------------------------------------------------------------

inundation/ga/storm_surge/pyvolution/test_interpolate_sww.py

@@ -18 +18 @@
 class Test_Interpolate_sww(unittest.TestCase):
     def setUp(self):
+
         import time
         from mesh_factory import rectangular
@@ -164 +165 @@
         assert allclose(interp.time,[0.0,2.0])
 
-        #answer = [ 0.15, 0.1, 0., -0.3, -0.35, -0.4, -0.7, -0.8, -0.850]
-        #print "answer",answer
-        #print interp.stage[0]
-        #stage_t = transpose(interp.stage)
-        #assert allclose(stage_t[0], answer)
-        #assert allclose(stage_t[1],stage_t[0])
-
         # create an .xya file
         point_file = tempfile.mktemp(".xya")
@@ -179 +173 @@
         interp.interpolate_xya(point_file)
 
-        answer = [[0.08, 0.08], [0.02, 0.02], [0.14, 0.14], [.08,.08]]
+        answer = {}
+        answer['0.0'] =  [ 0.08, 0.02, 0.14,0.08]
+        answer['2.0'] =  [ 0.08, 0.02, 0.14,0.08]
+        
         #print "answer",answer
-        assert allclose(interp.interpolated_quantity,answer)
+        #print "interp.interpolated_quantity",interp.interpolated_quantity
+        assert allclose(interp.interpolated_quantity['0.0'],answer['0.0'])
+        assert allclose(interp.interpolated_quantity['2.0'],answer['2.0'])
 
         # create an output .xya file
@@ -189 +188 @@
         #check the output file
         xya_dict = import_points_file(point_file_out)
-        #print "xya_dict", xya_dict
-        title_list,point_attributes = concatinate_attributelist(xya_dict['attributelist'])
-        assert allclose(interp.point_coordinates, xya_dict['pointlist'])
-        assert allclose(interp.interpolated_quantity,
-                        point_attributes )
-
-        # FIXME -remove
-        #title = xya_dict['title'].split('\n')
-        #print "title",title
-        #string_list = title[0].split(',') # assume a title has only one line
-        #time_list = []
+        assert allclose(xya_dict['attributelist']['0.0'],answer['0.0'])
+        assert allclose(xya_dict['attributelist']['2.0'],answer['2.0'])
+        assert allclose(xya_dict['pointlist'],[[ 0.0, 0.6],[0.0, 0.9],[ 0.0,0.1],[ 0.4,1.0]])
 
         # Try another quantity
@@ -205 +196 @@
         interp.interpolate_xya(point_file)
 
-        answer = [[0.08, 0.08], [0.02, 0.02], [0.14, 0.14], [-.32,-.32]]
+        answer['0.0'] =  [ 0.08, 0.02, 0.14,-0.32]
+        answer['2.0'] =  [ 0.08, 0.02, 0.14,-0.32]        
         #print "answer",answer
-        assert allclose(interp.interpolated_quantity,answer)
-
+        #print "interp.interpolated_quantity",interp.interpolated_quantity
+        assert allclose(interp.interpolated_quantity['0.0'],answer['0.0'])
+        assert allclose(interp.interpolated_quantity['2.0'],answer['2.0'])
 
         # look at error catching