Changeset 5889 for anuga_core/source_numpy_conversion/anuga/utilities/cg_solve.py

Timestamp:

Nov 5, 2008, 9:15:55 AM (16 years ago)

Author:

rwilson

Message:

NumPy? conversion

File:

• anuga_core/source_numpy_conversion/anuga/utilities/cg_solve.py (modified) (3 diffs)

anuga_core/source_numpy_conversion/anuga/utilities/cg_solve.py

@@ +1 @@
+
 import exceptions
 class VectorShapeError(exceptions.Exception): pass
 class ConvergenceError(exceptions.Exception): pass
 
-from Numeric import dot, array, Float, zeros
+##from numpy.oldnumeric import dot, array, Float, zeros
+from numpy import dot, array, float, zeros
    
 import logging, logging.config
@@ -24 +26 @@
     
     if x0 is None:
-        x0 = zeros(b.shape, typecode=Float)
+        x0 = zeros(b.shape, dtype=float)
     else:
-        x0 = array(x0, typecode=Float)
+        x0 = array(x0, dtype=float)
 
-    b  = array(b, typecode=Float)
+    b  = array(b, dtype=float)
     if len(b.shape) != 1 :
        
@@ -57 +59 @@
 
 
-   b  = array(b, typecode=Float)
+   b  = array(b, dtype=float)
    if len(b.shape) != 1 :
       raise VectorShapeError, 'input vector should consist of only one column'
 
    if x0 is None:
-      x0 = zeros(b.shape, typecode=Float)
+      x0 = zeros(b.shape, dtype=float)
    else:
-      x0 = array(x0, typecode=Float)
+      x0 = array(x0, dtype=float)