Changeset 6481

Timestamp:

Mar 10, 2009, 1:50:08 PM (14 years ago)

Author:

rwilson

Message:

Changed 'max(a.flat)' to 'num.max(a)' (ditto min()).

Location:

branches/numpy/anuga

Files:

• abstract_2d_finite_volumes/domain.py (modified) (2 diffs)
• abstract_2d_finite_volumes/general_mesh.py (modified) (2 diffs)
• shallow_water/data_manager.py (modified) (9 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/domain.py

@@ -879 +879 @@
 
             msg += '------------------------------------------------\n'
-            msg += '  Speeds in [%f, %f]\n' % (min(self.max_speed.flat),
-                                               max(self.max_speed.flat))
+            msg += '  Speeds in [%f, %f]\n' % (num.min(self.max_speed),
+                                               num.max(self.max_speed))
             msg += '  Histogram:\n'
 
@@ -892 +892 @@
                 else:
                     # Closed upper interval
-                    hi = max(self.max_speed.flat)
+                    hi = num.max(self.max_speed)
                     msg += '    [%f, %f]: %d\n' % (lo, hi, count)
 

branches/numpy/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -128 +128 @@
 
         msg = 'Vertex indices reference non-existing coordinate sets'
-        assert max(self.triangles.flat) < self.nodes.shape[0], msg
+        assert num.max(self.triangles) < self.nodes.shape[0], msg
 
         # FIXME: Maybe move to statistics?
@@ -530 +530 @@
         Y = C[:,1:6:2].copy()
 
-        xmin = min(X.flat)
-        xmax = max(X.flat)
-        ymin = min(Y.flat)
-        ymax = max(Y.flat)
+        xmin = num.min(X)
+        xmax = num.max(X)
+        ymin = num.min(Y)
+        ymax = num.max(Y)
 
         return xmin, xmax, ymin, ymax

branches/numpy/anuga/shallow_water/data_manager.py

@@ -2236 +2236 @@
         print '  Extent:'
         print '    x [m] in [%f, %f], len(x) == %d'\
-              %(min(x.flat), max(x.flat), len(x.flat))
+              %(num.min(x), num.max(x), len(x.flat))
         print '    y [m] in [%f, %f], len(y) == %d'\
-              %(min(y.flat), max(y.flat), len(y.flat))
+              %(num.min(y), num.max(y), len(y.flat))
         if timestep is not None:
             print '    t [s] = %f, len(t) == %d' %(times, 1)
@@ -2364 +2364 @@
 
     if verbose:
-        print 'Interpolated values are in [%f, %f]' %(min(grid_values.flat),
-                                                      max(grid_values.flat))
+        print 'Interpolated values are in [%f, %f]' %(num.min(grid_values),
+                                                      num.max(grid_values))
 
     #Assign NODATA_value to all points outside bounding polygon (from interpolation mesh)
@@ -2620 +2620 @@
         print '  Extent:'
         print '    x [m] in [%f, %f], len(x) == %d' \
-              % (min(x.flat), max(x.flat), len(x.flat))
+              % (num.min(x), num.max(x), len(x.flat))
         print '    y [m] in [%f, %f], len(y) == %d' \
-              % (min(y.flat), max(y.flat), len(y.flat))
+              % (num.min(y), num.max(y), len(y.flat))
         print '    t [s] in [%f, %f], len(t) == %d' \
               % (min(times), max(times), len(times))
@@ -2673 +2673 @@
     if verbose:
         print 'Interpolated values are in [%f, %f]' \
-              % (min(interpolated_values.flat), max(interpolated_values.flat))
+              % (num.min(interpolated_values), num.max(interpolated_values))
 
     # Assign NODATA_value to all points outside bounding polygon
@@ -3150 +3150 @@
         print '  Extent (lat/lon):'
         print '    lat in [%f, %f], len(lat) == %d' \
-              % (min(latitudes.flat), max(latitudes.flat), len(latitudes.flat))
+              % (num.min(latitudes), num.max(latitudes), len(latitudes.flat))
         print '    lon in [%f, %f], len(lon) == %d' \
-              % (min(longitudes.flat), max(longitudes.flat),
+              % (num.min(longitudes), num.max(longitudes),
                  len(longitudes.flat))
         print '    t in [%f, %f], len(t) == %d' \
-              % (min(times.flat), max(times.flat), len(times.flat))
-
-        q = amplitudes.flat
+              % (num.min(times), num.max(times), len(times.flat))
+
+        q = amplitudes.flatten()
         name = 'Amplitudes (ha) [cm]'
         print '  %s in [%f, %f]' % (name, min(q), max(q))
 
-        q = uspeed.flat
+        q = uspeed.flatten()
         name = 'Speeds (ua) [cm/s]'
         print '  %s in [%f, %f]' % (name, min(q), max(q))
 
-        q = vspeed.flat
+        q = vspeed.flatten()
         name = 'Speeds (va) [cm/s]'
         print '  %s in [%f, %f]' % (name, min(q), max(q))
 
-        q = elevations.flat
+        q = elevations.flatten()
         name = 'Elevations (e) [m]'
         print '  %s in [%f, %f]' % (name, min(q), max(q))
@@ -3298 +3298 @@
         print '  Extent:'
         print '    x [m] in [%f, %f], len(x) == %d' \
-              % (min(x.flat), max(x.flat), len(x.flat))
+              % (num.min(x), num.max(x), len(x.flat))
         print '    y [m] in [%f, %f], len(y) == %d' \
-              % (min(y.flat), max(y.flat), len(y.flat))
+              % (num.min(y), num.max(y), len(y.flat))
         print '    t [s] in [%f, %f], len(t) == %d' \
               % (min(times), max(times), len(times))
         print '  Quantities [SI units]:'
         for name in ['stage', 'xmomentum', 'ymomentum', 'elevation']:
-            q = outfile.variables[name][:].flat
+            q = outfile.variables[name][:].flatten()
             print '    %s in [%f, %f]' % (name, min(q), max(q))
 
@@ -3468 +3468 @@
     fid.close()
 
-    return [min(x), max(x), min(y), max(y), min(stage.flat), max(stage.flat)]
+    return [min(x), max(x), min(y), max(y), num.min(stage), num.max(stage)]
 
 
@@ -5937 +5937 @@
             print 'Statistics:'
             print '    t in [%f, %f], len(t) == %d' \
-                  % (min(times.flat), max(times.flat), len(times.flat))
+                  % (num.min(times), num.max(times), len(times.flat))
 
     ##
@@ -6319 +6319 @@
             print 'Statistics:'
             print '    t in [%f, %f], len(t) == %d' \
-                  % (min(times.flat), max(times.flat), len(times.flat))
+                  % (num.min(times), num.max(times), len(times.flat))
 
     ##