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

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/test_domain.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Oct 28, 2008 by alter_code1.py
+
 #!/usr/bin/env python
 
@@ -6 +8 @@
 from domain import *
 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
 
 
@@ -64 +67 @@
 
 
-        assert domain.get_conserved_quantities(0, edge=1) == 0.
+        assert alltrue(domain.get_conserved_quantities(0, edge=1) == 0.)
 
 
@@ -536 +539 @@
 
         sem = array([1.,1.,1.,1.])/array([1, 2, 3, 4])
-        denom = ones(4, Float)-domain.timestep*sem
+        denom = ones(4, float)-domain.timestep*sem
 
 #        x = array([1, 2, 3, 4]) + array( [.4,.3,.2,.1] )
@@ -610 +613 @@
         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
@@ -627 +631 @@
         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
@@ -670 +675 @@
         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