Changeset 3419

Timestamp:

Jul 25, 2006, 2:23:44 PM (19 years ago)

Author:

duncan

Message:

add time column

Location:

inundation/fit_interpolate

Files:

• interpolate.py (modified) (2 diffs)
• test_interpolate.py (modified) (1 diff)

inundation/fit_interpolate/interpolate.py

@@ -278 +278 @@
         return A
 
-def interpolate_sww2csv(sww_file, points,
+def interpolate_sww2csv(sww_file,
+                        points,
                         depth_file,
                         velocity_file,
@@ -308 +309 @@
     velocity_writer = writer(file(velocity_file, "wb"))
     # Write heading
-    depth_writer.writerow([str(x[0])+ ':' + str(x[1]) for x in points])
-    velocity_writer.writerow([str(x[0])+ ':' + str(x[1]) for x in points])
+    heading = [str(x[0])+ ':' + str(x[1]) for x in points]
+    heading.insert(0, "time")
+    depth_writer.writerow(heading)
+    velocity_writer.writerow(heading)
     #for row in someiterable:
         #csvwriter.writerow(row)
     for time in callable_sww.get_time():
-        depths = []
-        velocitys = []
+        depths = [time]
+        velocitys = [time]
         for point_i, point in enumerate(points):
             quantities = callable_sww(time,point_i)

inundation/fit_interpolate/test_interpolate.py

@@ -1413 +1413 @@
                             verbose=False)
 
-        depth_answers_array = [[6.0, 1.5], [15., 10.5]] 
-        velocity_answers_array = [[5./6.0, 5./1.5], [5./15., 5./10.5]]
+        depth_answers_array = [[0.0, 6.0, 1.5], [2.0, 15., 10.5]] 
+        velocity_answers_array = [[0.0, 5./6.0, 5./1.5], [2.0, 5./15., 5./10.5]]
         depth_file_handle = file(depth_file)
         depth_reader = csv.reader(depth_file_handle)