Changeset 4911

Timestamp:

Jan 8, 2008, 10:05:27 AM (17 years ago)

Author:

sexton

Message:

updates to plotting of bearing

File:

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

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1021 +1021 @@
     speed = zeros((n0,m,p), Float)
     bearings = zeros((n0,m,p), Float)
+    due_east = 90.0*ones(n0, Float)
+    due_west = 270.0*ones(n0, Float)
     depths = zeros((n0,m,p), Float)
     eastings = zeros((n0,m,p), Float)
@@ -1062 +1064 @@
                        +gaugeloc+'.csv'
             fid_out = open(thisfile, 'w')
-            s = 'Time, Stage, Momentum, Speed, Elevation, xmom, ymom \n'
+            s = 'Time, Stage, Momentum, Speed, Elevation, xmom, ymom, Bearing \n'
             fid_out.write(s)
             #### generate quantities #######
@@ -1077 +1079 @@
                     else:
                         vel = m / (depth + 1.e-6/depth) 
-                    #bearing = calc_bearing(uh, vh)                    
+                    bearing = calc_bearing(uh, vh)                    
                     model_time[i,k,j] = (t + starttime)/scale #t/60.0
                     stages[i,k,j] = w
@@ -1085 +1087 @@
                     momenta[i,k,j] = m 
                     speed[i,k,j] = vel 
-                    #bearings[i,k,j] = bearing 
+                    bearings[i,k,j] = bearing 
                     depths[i,k,j] = depth
                     thisgauge = gauges[k]
                     eastings[i,k,j] = thisgauge[0]
-                    s = '%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f\n' %(t, w, m, vel, z, uh, vh)
+                    s = '%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f,\n' %(t, w, m, vel, z, uh, vh, bearing)
                     fid_out.write(s)
                     if t == 0:
@@ -1225 +1227 @@
                         units = 'm / sec'
                     if which_quantity == 'bearing':
-                        due_east = 90.0*ones(shape(model_time[0:n[j]-1,k,j],Float))
-                        due_west = 270.0*ones(shape(model_time[0:n[j]-1,k,j],Float))
-                        plot(model_time[0:n[j]-1,k,j], bearings, '-', 
-                             model_time[0:n[j]-1,k,j], due_west, '-.', 
-                             model_time[0:n[j]-1,k,j], due_east, '-.')
+                        #due_east = 90.0*ones(shape(model_time[0:n[j]-1,k,j],Float))
+                        #due_west = 270.0*ones(shape(model_time[0:n[j]-1,k,j],Float))
+                        plot(model_time[0:n[j]-1,k,j], bearings[0:n[j]-1,k,j], '-', 
+                             model_time[0:n[j]-1,k,j], due_west[0:n[j]-1], '-.', 
+                             model_time[0:n[j]-1,k,j], due_east[0:n[j]-1], '-.')
                         units = 'degrees from North'
                         ax = axis([time_min, time_max, 0.0, 360.0])