Changeset 5948 for anuga_core/source_numpy_conversion/anuga/utilities/numerical_tools.py

Timestamp:

Nov 12, 2008, 12:14:33 PM (15 years ago)

Author:

rwilson

Message:

More NumPy? changes.

File:

• anuga_core/source_numpy_conversion/anuga/utilities/numerical_tools.py (modified) (6 diffs)

anuga_core/source_numpy_conversion/anuga/utilities/numerical_tools.py

@@ -7 +7 @@
 from warnings import warn
 
-##from numpy import ndarray, array, sum, inner, ravel, sqrt, searchsorted, sort, concatenate, float, arange
 import numpy
+
+from anuga.config import Float
 
 # Getting an infinite number to use when using Numeric
@@ -79 +80 @@
         v2 = [1.0, 0.0] # Unit vector along the x-axis
         
-    v1 = ensure_numeric(v1, numpy.float)
-    v2 = ensure_numeric(v2, numpy.float)    
+    v1 = ensure_numeric(v1, Float)
+    v2 = ensure_numeric(v2, Float)    
     
     # Normalise
@@ -130 +131 @@
     """
     
-    return numpy.array([-v[1], v[0]], numpy.float)
+    return numpy.array([-v[1], v[0]], Float)
 
     
@@ -252 +253 @@
 
     if typecode is None:
-##NumPy        if isinstance(A, ArrayType):
         if type(A) == numpy.ndarray:
             return A
@@ -258 +258 @@
             return numpy.array(A)
     else:
-##NumPy        if isinstance(A, ArrayType):
         if type(A) == numpy.ndarray:
-##NumPy            if A.typecode == typecode:
             if A.dtype == typecode:
                 return numpy.array(A)  #FIXME: Shouldn't this just return A?
@@ -267 +265 @@
         else:
             import types                            ##
-            from numpy import str                   ##
             if isinstance(A, types.StringType):     ##
-                return numpy.array(A, dtype=int)          ##
+                return numpy.array(A, dtype=int)    ##
             return numpy.array(A, typecode)