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

anuga_core/source_numpy_conversion/anuga/abstract_2d_finite_volumes/generic_boundary_conditions.py

@@ +1 @@
+## Automatically adapted for numpy.oldnumeric Oct 28, 2008 by alter_code1.py
+
 """boundary.py - Classes for implementing boundary conditions
 """
@@ -67 +69 @@
             raise Exception, msg
 
-        from Numeric import array, Float
-        self.conserved_quantities=array(conserved_quantities).astype(Float)
+#        from numpy.oldnumeric import array, Float
+        from numpy import array, float
+        self.conserved_quantities=array(conserved_quantities).astype(float)
 
     def __repr__(self):
@@ -97 +100 @@
 
 
-        from Numeric import array, Float
+#        from numpy.oldnumeric import array, Float
+        from numpy import array, float
         try:
-            q = array(q).astype(Float)
+            q = array(q).astype(float)
         except:
             msg = 'Return value from time boundary function could '
@@ -136 +140 @@
     def __init__(self, filename, domain):
         import time
-        from Numeric import array
+#        from numpy.oldnumeric import array
+        from numpy import array
         from anuga.config import time_format
         from anuga.abstract_2d_finite_volumes.util import File_function
@@ -206 +211 @@
 
         import time
-        from Numeric import array, zeros, Float
+#        from numpy.oldnumeric import array, zeros, Float
+        from numpy import array, zeros, float
         from anuga.config import time_format
         from anuga.abstract_2d_finite_volumes.util import file_function
@@ -222 +228 @@
 
         if verbose: print 'Find midpoint coordinates of entire boundary'
-        self.midpoint_coordinates = zeros( (len(domain.boundary), 2), Float)
+        self.midpoint_coordinates = zeros( (len(domain.boundary), 2), float)
         boundary_keys = domain.boundary.keys()