Changeset 5496

Timestamp:

Jul 11, 2008, 4:38:08 PM (16 years ago)

Author:

duncan

Message:

adding froude number to interpolate_sww2csv

File:

• anuga_core/source/anuga/fit_interpolate/interpolate.py (modified) (6 diffs)

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -429 +429 @@
                         velocity_y_file,
                         stage_file=None,
+                        froude_file=None,
                         #quantities = ['depth', 'velocity'],
                         time_thinning=1,
@@ -477 +478 @@
     if stage_file is not None:
         stage_writer = writer(file(stage_file, "wb"))
+    if froude_file is not None:
+        froude_writer = writer(file(froude_file, "wb"))
     # Write heading
     heading = [str(x[0])+ ':' + str(x[1]) for x in points]
@@ -484 +487 @@
     velocity_y_writer.writerow(heading)
     if stage_file is not None:
-        stage_writer.writerow(heading)    
+        stage_writer.writerow(heading) 
+    if froude_file is not None:
+        froude_writer.writerow(heading)     
     
     for time in callable_sww.get_time():
@@ -492 +497 @@
         if stage_file is not None:  
             stages = [time]  
+        if froude_file is not None:  
+            froudes = [time]  
         for point_i, point in enumerate(points):
             quantities = callable_sww(time,point_i)
@@ -516 +523 @@
                 else:
                     velocity_y = 0
+            if depth < 1.e-30: # use epsilon
+                froude = NAN
+            else:
+                froude = sqrt(velocity_x*velocity_x + velocity_y*velocity_y)/ \
+                         sqrt(depth * 9.8066) # gravity m/s/s
             depths.append(depth)
             velocity_xs.append(velocity_x)
@@ -521 +533 @@
             if stage_file is not None:
                 stages.append(w)
+            if froude_file is not None:
+                froudes.append(froude)
         depth_writer.writerow(depths)
         velocity_x_writer.writerow(velocity_xs)
         velocity_y_writer.writerow(velocity_ys)
         if stage_file is not None:
-            stage_writer.writerow(stages)        
+            stage_writer.writerow(stages)   
+        if froude_file is not None:
+            froude_writer.writerow(froudes)