Changeset 5899 for anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_neighbour_mesh.py

Timestamp:

Nov 6, 2008, 12:28:22 PM (15 years ago)

Author:

rwilson

Message:

Initial NumPy? changes (again!).

File:

• anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_neighbour_mesh.py (modified) (11 diffs)

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_neighbour_mesh.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Oct 28, 2008 by alter_code1.py
+
 #!/usr/bin/env python
 
@@ -13 +15 @@
 from mesh_factory import rectangular
 from anuga.config import epsilon
-from Numeric import allclose, array, Int
+#from numpy.oldnumeric import allclose, array, Int
+from numpy import allclose, array, int
 
 from anuga.coordinate_transforms.geo_reference import Geo_reference
@@ -698 +701 @@
         """
         from mesh_factory import rectangular
-        from Numeric import zeros, Float
+#        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
         #Create basic mesh
@@ -717 +721 @@
         from mesh_factory import rectangular
         #from mesh import Mesh
-        from Numeric import zeros, Float
+#        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
         #Create basic mesh
@@ -736 +741 @@
 
     def test_boundary_polygon_II(self):
-        from Numeric import zeros, Float
+#        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
         
 
@@ -775 +781 @@
         """
 
-        from Numeric import zeros, Float
+#        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
 
@@ -816 +823 @@
         """
 
-        from Numeric import zeros, Float
+#        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
 
@@ -864 +872 @@
         """
 
-        from Numeric import zeros, Float
+#        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
         from mesh_factory import rectangular        
 
@@ -907 +916 @@
         
         """
-        from Numeric import zeros, Float
+#        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
         
 
@@ -998 +1008 @@
                   [  52341.70703125,  38563.39453125]]
 
-        ##points = ensure_numeric(points, Int)/1000  # Simplify for ease of interpretation        
+        ##points = ensure_numeric(points, int)/1000  # Simplify for ease of interpretation        
 
         triangles = [[19, 0,15],
@@ -1101 +1111 @@
                   [  35406.3359375 ,  79332.9140625 ]]
 
-        scaled_points = ensure_numeric(points, Int)/1000  # Simplify for ease of interpretation
+        scaled_points = ensure_numeric(points, int)/1000  # Simplify for ease of interpretation
 
         triangles = [[ 0, 1, 2],