Changeset 438 for inundation/ga/storm_surge/pyvolution/cg_solve.py

Timestamp:

Oct 21, 2004, 11:54:49 PM (20 years ago)

Author:

steve

Message:

CG tests

File:

• inundation/ga/storm_surge/pyvolution/cg_solve.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/cg_solve.py

@@ -1 +1 @@
 import exceptions
-class VectorShapeError(exceptions.Exception):
-   """
-   Setup Exception for routine conjugate_gradient
-   """
-   def __init__(self,args=None):
-      self.args = args
-
-
-
+class VectorShapeError(exceptions.Exception): pass
 
 
 def conjugate_gradient(A,b,x0,imax=2000,tol=1.0e-8,iprint=0):
-   #
-   # Try to solve linear equation Ax = b using
-   # conjugate gradient method
-   #
-   # Input
-   # A: matrix or function which applies a matrix, assumed symmetric
-   # b: right hand side
-   # x0: inital guess
-   # imax: max number of iterations
-   # tol: tolerance used for residual
-   #
-   # Output
-   # x: approximate solution
-   # i: number of iterations
-   #
+   """
+   Try to solve linear equation Ax = b using
+   conjugate gradient method
+   
+   Input
+   A: matrix or function which applies a matrix, assumed symmetric
+   b: right hand side
+   x0: inital guess
+   imax: max number of iterations
+   tol: tolerance used for residual
+   
+   Output
+   x: approximate solution
+   """
 
    #if nargin<3
@@ -37 +28 @@
    b  = asarray(b, typecode=Float)
    x0 = asarray(x0, typecode=Float)
+   #A = asarray(A, typecode=Float)
 
-   print "A shape",A.shape[0]
-   print "b shape",len(b.shape)
-   print "x0 shape",x0.shape[0]
+   #print "A shape",A.shape
+   #print "b shape",len(b.shape)
+   #print "x0 shape",x0.shape[0]
 
    if len(b.shape) != 1 :