Changeset 6517 for branches/numpy/anuga/abstract_2d_finite_volumes/util.py

Timestamp:

Mar 16, 2009, 11:06:22 AM (14 years ago)

Author:

rwilson

Message:

Hand-merged recent changes in main trunk. Still work to be done in shallow_water.

File:

• branches/numpy/anuga/abstract_2d_finite_volumes/util.py (modified) (4 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/util.py

@@ -925 +925 @@
                     verbose = False):   
         
+    # FIXME(Ole): Shouldn't print statements here be governed by verbose?
     assert type(gauge_filename) == type(''), 'Gauge filename must be a string'
     
@@ -971 +972 @@
             raise msg
 
-        print 'swwfile', swwfile
+        if verbose:
+            print 'swwfile', swwfile
 
         # Extract parent dir name and use as label
@@ -2489 +2491 @@
                                  base_name=base,
                                  verbose=verbose)
+    #print 'sww files just after get_all_swwfiles()', sww_files
+    # fudge to get SWW files in 'correct' order, oldest on the left
+    sww_files.sort()
+
+    if verbose:
+        print 'sww files', sww_files
     
     #to make all the quantities lower case for file_function
@@ -2497 +2505 @@
 
     core_quantities = ['stage', 'elevation', 'xmomentum', 'ymomentum']
-    
+    gauge_file = out_name
+
+    heading = [quantity for quantity in quantities]
+    heading.insert(0,'time')
+    heading.insert(1,'hours')
+
+    #create a list of csv writers for all the points and write header
+    points_writer = []
+    for point_i,point in enumerate(points):
+        points_writer.append(writer(file(dir_name + sep + gauge_file
+                                         + point_name[point_i] + '.csv', "wb")))
+        points_writer[point_i].writerow(heading)
+    
+    if verbose: print 'Writing csv files'
+
+    quake_offset_time = None
+
     for sww_file in sww_files:
         sww_file = join(dir_name, sww_file+'.sww')