Changeset 7208 for branches/numpy

Timestamp:

Jun 17, 2009, 4:52:03 PM (16 years ago)

Author:

rwilson

Message:

Fixed problems with back-merge.

Location:

branches/numpy/anuga

Files:

• geospatial_data/test_geospatial_data.py (modified) (1 diff)
• shallow_water/tsunami_okada.py (modified) (1 diff)
• utilities/interp.py (modified) (1 diff)

branches/numpy/anuga/geospatial_data/test_geospatial_data.py

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

branches/numpy/anuga/shallow_water/tsunami_okada.py

@@ -215 +215 @@
             yrec=x
             for i in range(0,len(zrec[0])):
-                if (num.all(zrec[0][i]==yrec) and num.all(zrec[1][i]==xrec)):
+                if (num.any(zrec[0][i]==yrec) and num.any(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 as MA
+    import numpy.ma MA
     import numpy as N
     from where_close import where_close