Changeset 2545 for inundation-numpy-branch/utilities/numerical_tools.py

Timestamp:

Mar 14, 2006, 4:37:49 PM (19 years ago)

Author:

ole

Message:

Got utilities to compile and pass all tests using numpy

File:

• inundation-numpy-branch/utilities/numerical_tools.py (modified) (3 diffs)

inundation-numpy-branch/utilities/numerical_tools.py

@@ -8 +8 @@
 #(this should move to somewhere central)
 try:
-    from scipy import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate    
+    from numpy import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate    
 except:
-    print 'Could not find scipy - using Numeric'
+    print 'Could not find numpy - using Numeric'
     from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate    
     
@@ -181 +181 @@
     else:
         if type(A) == ArrayType:
-            if A.typecode == typecode:
+            if A.dtype.char == typecode:
                 return array(A)  #FIXME: Shouldn't this just return A?
             else:
@@ -242 +242 @@
 #Initialise module
 
-from utilities import compile
+#from utilities import compile
+import compile
 if compile.can_use_C_extension('util_ext.c'):
     from util_ext import gradient, gradient2