Changeset 5899 for anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_general_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_general_mesh.py (modified) (11 diffs)

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_general_mesh.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Oct 28, 2008 by alter_code1.py
+
 #!/usr/bin/env python
 
@@ -7 +9 @@
 
 from anuga.config import epsilon
-from Numeric import allclose, array, ones, Float
+##from numpy.oldnumeric import allclose, array, ones, Float, alltrue
+from numpy import allclose, array, ones, float, alltrue
 from general_mesh import General_mesh
 from anuga.coordinate_transforms.geo_reference import Geo_reference
@@ -23 +26 @@
     def test_get_vertex_coordinates(self):
         from mesh_factory import rectangular
-        from Numeric import zeros, Float
+##        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
         #Create basic mesh
@@ -86 +90 @@
         """
         from mesh_factory import rectangular
-        from Numeric import zeros, Float
+##        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
         #Create basic mesh
@@ -114 +119 @@
         """
         from mesh_factory import rectangular
-        from Numeric import zeros, Float
+##        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
         #Create basic mesh
@@ -130 +136 @@
         """
         from mesh_factory import rectangular
-        from Numeric import zeros, Float, array
+##        from numpy.oldnumeric import zeros, Float, array
+        from numpy import zeros, float, array
 
         a = [0.0, 0.0]
@@ -204 +211 @@
         # One node
         L = domain.get_triangles_and_vertices_per_node(node=2)
+        print 'L=%s' % str(L)
         assert allclose(L[0], [0, 2])
         assert allclose(L[1], [1, 1])
@@ -224 +232 @@
         from mesh_factory import rectangular
         from shallow_water import Domain
-        from Numeric import zeros, Float
+##        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
         #Create basic mesh
@@ -239 +248 @@
         from mesh_factory import rectangular
         from shallow_water import Domain
-        from Numeric import zeros, Float
+##        from numpy.oldnumeric import zeros, Float
+        from numpy import zeros, float
 
         #Create basic mesh
@@ -283 +293 @@
                        geo_reference = geo)
         node = domain.get_node(2)        
-        self.assertEqual(c, node)
+        self.assertTrue(alltrue(c == node))
         
         node = domain.get_node(2, absolute=True)     
-        self.assertEqual(nodes_absolute[2], node)
+        self.assertTrue(alltrue(nodes_absolute[2] == node))
         
         node = domain.get_node(2, absolute=True)     
-        self.assertEqual(nodes_absolute[2], node)
+        self.assertTrue(alltrue(nodes_absolute[2] == node))
         
 
@@ -333 +343 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_General_Mesh,'test') 
-    #suite = unittest.makeSuite(Test_General_Mesh,'test_get_node')    
     runner = unittest.TextTestRunner()
     runner.run(suite)