Changeset 7207

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

Files:

• abstract_2d_finite_volumes/general_mesh.py (modified) (1 diff)
• abstract_2d_finite_volumes/quantity.py (modified) (1 diff)
• geospatial_data/test_geospatial_data.py (modified) (1 diff)
• pmesh/test_mesh_interface.py (modified) (1 diff)
• shallow_water/data_manager.py (modified) (3 diffs)
• shallow_water/shallow_water_domain.py (modified) (1 diff)
• shallow_water/tsunami_okada.py (modified) (1 diff)
• utilities/interp.py (modified) (1 diff)

branches/numpy/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -194 +194 @@
             self.edgelengths[i, :] = [l0, l1, l2]
 
-        # Build structure listing which trianglse belong to which node.
+        # Build structure listing which triangles belong to which node.
         if verbose: print 'Building inverted triangle structure'
         self.build_inverted_triangle_structure()

branches/numpy/anuga/abstract_2d_finite_volumes/quantity.py

@@ -1187 +1187 @@
         import types
 
-        msg = 'Indices must be a list, array or None'
+        msg = "'indices' must be a list, array or None"
         assert isinstance(indices, (NoneType, list, num.ndarray)), msg
 

branches/numpy/anuga/geospatial_data/test_geospatial_data.py

@@ -1721 +1721 @@
 
             P = G1.get_data_points(absolute=False)
-            expected = [[425835., 137518.]]
+            expected = [[982420., 28233.]]
             msg = 'expected=%s, but\nP=%s' % (str(expected), str(P))
             assert num.allclose(P, expected), msg

branches/numpy/anuga/pmesh/test_mesh_interface.py

@@ -76 +76 @@
                                           polygon_absolute, closed=False),
                         msg)
-#                        'FAILED!')
 
         # Assuming the order of the region points is known.

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

branches/numpy/anuga/utilities/interp.py

@@ -138 +138 @@
     """
     import arrayfns
-    import numpy.ma MA
+    import numpy.ma as MA
     import numpy as N
     from where_close import where_close