Changeset 7848 for trunk/anuga_core/source/anuga/utilities/cg_solve.py

Timestamp:

Jun 16, 2010, 2:50:06 PM (13 years ago)

Author:

steve

Message:

Changed the logging levels in log.py so that the information about openning the
file ./anuga.log is now only an info log as opposed to critical log. I.e. by default
doesn't write to the console.

File:

• trunk/anuga_core/source/anuga/utilities/cg_solve.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/utilities/cg_solve.py

@@ -8 +8 @@
 
 
-def conjugate_gradient(A,b,x0=None,imax=10000,tol=1.0e-8,iprint=0):
+def conjugate_gradient(A,b,x0=None,imax=10000,tol=1.0e-8,iprint=None):
     """
     Try to solve linear equation Ax = b using
@@ -33 +33 @@
     return x0
     
-def _conjugate_gradient(A,b,x0=None,imax=10000,tol=1.0e-8,iprint=0):
+def _conjugate_gradient(A,b,x0=None,imax=10000,tol=1.0e-8,iprint=None):
    """
    Try to solve linear equation Ax = b using
@@ -62 +62 @@
 
    #FIXME: Should test using None
-   if iprint == 0:
+   if iprint == None  or iprint == 0:
       iprint = imax
 
@@ -72 +72 @@
    rTr0 = rTr
 
+   #FIXME Let the iterations stop if starting with a small residual
    while (i<imax and rTr>tol**2*rTr0):
        q = A*d