Changeset 7845

Timestamp:

Jun 15, 2010, 10:59:36 PM (14 years ago)

Author:

steve

Message:

 

Location:

trunk/anuga_core/source/anuga/utilities

Files:

• . (modified) (1 prop)
• cg_solve.py (modified) (2 diffs)

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

@@ -4 +4 @@
 
 import numpy as num
-   
-import logging, logging.config
-logger = logging.getLogger('cg_solve')
-logger.setLevel(logging.WARNING)
 
-try:
-    logging.config.fileConfig('log.ini')
-except:
-    pass
+import anuga.utilities.log as log
+
 
 def conjugate_gradient(A,b,x0=None,imax=10000,tol=1.0e-8,iprint=0):
@@ -93 +87 @@
        i = i+1
        if i%iprint == 0 :
-          logger.info('i = %g rTr = %20.15e' %(i,rTr))
+          log.info('i = %g rTr = %20.15e' %(i,rTr))
 
        if i==imax:
-            logger.warning('max number of iterations attained')
+            log.warning('max number of iterations attained')
             msg = 'Conjugate gradient solver did not converge: rTr==%20.15e' %rTr
             raise ConvergenceError, msg