Changeset 6013

Timestamp:

Nov 28, 2008, 11:17:57 AM (16 years ago)

Author:

kristy

Message:

Created and out name for sww2csv, so that it can be renamed due to several sww files in the one directory.

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (5 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -2074 +2074 @@
 def sww2csv_gauges(sww_file,
                    gauge_file,
+                   out_name=None,
                    quantities = ['stage', 'depth', 'elevation',
                                  'xmomentum', 'ymomentum'],
@@ -2096 +2097 @@
         NOTE: order of column can change but names eg 'easting', 'elevation' 
         must be the same! ALL lowercaps!
+
+        out_name: prefix for output file name (default is 'gauge_')
         
     Outputs: 
         one file for each gauge/point location in the points file. They
         will be named with this format in the same directory as the 'sww_file'
-            gauge_<name>.csv    eg gauge_point1.csv
+            <out_name><name>.csv
+        eg gauge_point1.csv if <out_name> not supplied
+           myfile_2_point1.csv if <out_name> ='myfile_2_'
+            
             
         They will all have a header
@@ -2133 +2139 @@
     assert type(gauge_file) == type(''),\
            'Gauge filename must be a string'
+    assert type(out_name) == type(''),\
+           'Output filename prefix must be a string'
     
     try:
@@ -2208 +2216 @@
                                  use_cache=use_cache)
 
-    gauge_file='gauge_'
+    if out_name is None:
+        gauge_file='gauge_'
+    else:
+        gauge_file = out_name
 
     heading = [quantity for quantity in quantities]
@@ -2219 +2230 @@
     for i,point in enumerate(points):
         #print 'gauge file:',dir_name+sep+'gauge_'+point_name[i]+'.csv'
-        points_writer.append(writer(file(dir_name+sep+'gauge_'+point_name[i]+'.csv', "wb")))
+        points_writer.append(writer(file(dir_name+sep+gauge_file+point_name[i]+'.csv', "wb")))
         points_writer[i].writerow(heading)