Changeset 4918

Timestamp:

Jan 9, 2008, 2:24:52 PM (17 years ago)

Author:

nick

Message:

corrections to sww2csv_gauges in util.py

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• test_util.py (modified) (2 diffs)
• util.py (modified) (7 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -1580 +1580 @@
 #        points_file = 'test_point.csv'
         file_id = open(points_file,"w")
-        file_id.write("name, easting, northing \n\
+        file_id.write("name,easting,northing \n\
 point1, 5.0, 1.0\n\
 point2, 0.5, 2.0\n")
@@ -1641 +1641 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Util,'test')
-#    suite = unittest.makeSuite(Test_Util,'test_gauges_sww')
+#    suite = unittest.makeSuite(Test_Util,'test_sww2')
 #    runner = unittest.TextTestRunner(verbosity=2)
     runner = unittest.TextTestRunner(verbosity=1)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -18 +18 @@
     
 from anuga.geospatial_data.geospatial_data import ensure_absolute
+from math import sqrt, atan, degrees
 
 
@@ -947 +948 @@
     """ Calculate velocity bearing from North
     """
-    from math import atan, degrees
+#    from math import atan, degrees
     
     angle = degrees(atan(vh/(uh+1.e-15)))
@@ -971 +972 @@
     each sww file
     """
-    from math import sqrt, atan, degrees
+#    from math import sqrt, atan, degrees
     from Numeric import ones, allclose, zeros, Float, ravel
     from os import sep, altsep, getcwd, mkdir, access, F_OK, environ
@@ -2328 +2329 @@
             point2, 10.3, 70.3, 78.0
         
+        NOTE: order of column can change but names eg 'easting', elevation' 
+        must be the same!
+        
     Outputs:
         one file for each gauge/point location in the points file. They
@@ -2372 +2376 @@
                   %(gauge_file, e)
         raise msg
-    if verbose: print '\n Gauges obtained from: %s \n' %gauge_filename
+    if verbose: print '\n Gauges obtained from: %s \n' %gauge_file
     
     
@@ -2379 +2383 @@
     point_name = []
     
-    #skip header
-    point_reader.next()
     #read point info from file
     for i,row in enumerate(point_reader):
 #        print 'i',i,'row',row
-        points.append([float(row[1]),float(row[2])])
-        point_name.append(row[0])
+        #read header and determine the column numbers to read correcty.
+        if i==0:
+            for j,value in enumerate(row):
+#                print 'j',j,value, row
+                if value.strip()=='easting':easting=j
+                if value.strip()=='northing':northing=j
+                if value.strip()=='name':name=j
+                if value.strip()=='elevation':elevation=j
+        else:
+#            print i,'easting',easting,'northing',northing, row[easting]
+            points.append([float(row[easting]),float(row[northing])])
+            point_name.append(row[name])
         
     #convert to array for file_function
@@ -2480 +2492 @@
                             momentum = sqrt(point_quantities[2]**2 +\
                                             point_quantities[3]**2)
-                            vel = momentum/depth              
+#                            vel = momentum/depth              
+                            vel = momentum/(point_quantities[0] - point_quantities[1])
 #                            vel = momentum/(depth + 1.e-6/depth)