Changeset 6035 for anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

Timestamp:

Nov 30, 2008, 10:43:05 AM (16 years ago)

Author:

steve

Message:

Fixed up a few test errors (in windows) in util.py and in interpolate.py. Still 2 failures in test_data_manager.py

File:

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

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -2074 +2074 @@
 def sww2csv_gauges(sww_file,
                    gauge_file,
-                   out_name=None,
+                   out_name='gauge_',
                    quantities = ['stage', 'depth', 'elevation',
                                  'xmomentum', 'ymomentum'],
@@ -2090 +2090 @@
         sww_file: path to any sww file
         
-        points_file: Assumes that it follows this format
+        gauge_file: Assumes that it follows this format
             name, easting, northing, elevation
             point1, 100.3, 50.2, 10.0
@@ -2110 +2110 @@
         They will all have a header
     
-    Usage: gauges_sww2csv(sww_file='test1.sww',
+    Usage: sww2csv_gauges(sww_file='test1.sww',
                           quantities = ['stage', 'elevation','depth','bearing'],
                           gauge_file='gauge.txt')    
@@ -2122 +2122 @@
 
     This is currently quite specific.
-    If it need to be more general, chagne things.
+    If it needs to be more general, change things.
 
     This is really returning speed, not velocity.
@@ -2139 +2139 @@
     assert type(gauge_file) == type(''),\
            'Gauge filename must be a string'
+           
     assert type(out_name) == type(''),\
            'Output filename prefix must be a string'
@@ -2215 +2216 @@
                                  verbose=verbose,
                                  use_cache=use_cache)
-
-    if out_name is None:
-        gauge_file='gauge_'
-    else:
-        gauge_file = out_name
+        
+    gauge_file = out_name
 
     heading = [quantity for quantity in quantities]