Changeset 7207 for branches/numpy/anuga/shallow_water

Timestamp:

Jun 17, 2009, 4:12:11 PM (16 years ago)

Author:

rwilson

Message:

Back-merge from Numeric trunk. Final one?

Location:

branches/numpy/anuga/shallow_water

Files:

• data_manager.py (modified) (3 diffs)
• shallow_water_domain.py (modified) (1 diff)
• tsunami_okada.py (modified) (1 diff)

branches/numpy/anuga/shallow_water/data_manager.py

@@ -3189 +3189 @@
               % (num.min(times), num.max(times), len(times.flat))
 
-        q = amplitudes.flatten()
+#        q = amplitudes.flatten()
         name = 'Amplitudes (ha) [cm]'
-        print '  %s in [%f, %f]' % (name, min(q), max(q))
-
-        q = uspeed.flatten()
+        print '  %s in [%f, %f]' % (name, num.min(amplitudes), num.max(amplitudes))
+
+#        q = uspeed.flatten()
         name = 'Speeds (ua) [cm/s]'
-        print '  %s in [%f, %f]' % (name, min(q), max(q))
-
-        q = vspeed.flatten()
+        print '  %s in [%f, %f]' % (name, num.min(uspeed), num.max(uspeed))
+
+#        q = vspeed.flatten()
         name = 'Speeds (va) [cm/s]'
-        print '  %s in [%f, %f]' % (name, min(q), max(q))
-
-        q = elevations.flatten()
+        print '  %s in [%f, %f]' % (name, num.min(vspeed), num.max(vspeed))
+
+#        q = elevations.flatten()
         name = 'Elevations (e) [m]'
-        print '  %s in [%f, %f]' % (name, min(q), max(q))
+        print '  %s in [%f, %f]' % (name, num.min(elevations), num.max(elevations))
 
     # print number_of_latitudes, number_of_longitudes
@@ -3337 +3337 @@
         print '  Quantities [SI units]:'
         for name in ['stage', 'xmomentum', 'ymomentum', 'elevation']:
-            q = outfile.variables[name][:].flatten()
-            print '    %s in [%f, %f]' % (name, min(q), max(q))
+            q = outfile.variables[name][:]    # .flatten()
+            print '    %s in [%f, %f]' % (name, num.min(q), num.max(q))
 
     outfile.close()
@@ -7363 +7363 @@
             points = num.ascontiguousarray(num.concatenate((x[:,num.newaxis],
                                                             y[:,num.newaxis]),
-                                                           axis=1))
+                                                            axis=1))
             point_indices = inside_polygon(points, polygon)
 

branches/numpy/anuga/shallow_water/shallow_water_domain.py

@@ -913 +913 @@
         """
         
-        boundary_flows, total_boundary_inflow, total_boundary_outflow = self.compute_boundary_flows() 
+        (boundary_flows, total_boundary_inflow,
+         total_boundary_outflow) = self.compute_boundary_flows() 
         
         s = '---------------------------\n'        

branches/numpy/anuga/shallow_water/tsunami_okada.py

@@ -215 +215 @@
             yrec=x
             for i in range(0,len(zrec[0])):
-                if (num.any(zrec[0][i]==yrec) and num.any(zrec[1][i]==xrec)):
+                if (num.all(zrec[0][i]==yrec) and num.all(zrec[1][i]==xrec)):
                     Z=zrec[2][i]
                     Z=0.001*Z