Changeset 1150

Timestamp:

Mar 28, 2005, 11:20:14 PM (20 years ago)

Author:

steve

Message:

Added logging to cg_solve.py

Location:

inundation/ga/storm_surge/pyvolution

Files:

• cg_solve.py (modified) (6 diffs)
• log.ini (added)
• pyvolution.ini (modified) (1 diff)
• pyvolution.zbi (modified) (previous)
• test_advection.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/cg_solve.py

@@ -1 +1 @@
 import exceptions
 class VectorShapeError(exceptions.Exception): pass
+
+import logging, logging.config
+logger = logging.getLogger('cg_solve')
+
+logging.config.fileConfig('log.ini')
+
+#logger.setLevel(logging.DEBUG)
+
+
+
 
 
@@ -7 +17 @@
    Try to solve linear equation Ax = b using
    conjugate gradient method
-   
+
    Input
    A: matrix or function which applies a matrix, assumed symmetric
@@ -15 +25 @@
    imax: max number of iterations
    tol: tolerance used for residual
-   
+
    Output
    x: approximate solution
@@ -21 +31 @@
 
    from Numeric import dot, array, Float, zeros
-   
+
    b  = array(b, typecode=Float)
    if len(b.shape) != 1 :
@@ -28 +38 @@
    if x0 is None:
       x0 = zeros(b.shape, typecode=Float)
-   else:   
+   else:
       x0 = array(x0, typecode=Float)
-      
+
 
    #FIXME: Should test using None
    if iprint == 0:
       iprint = imax
-      
+
    i=1
    x = x0
@@ -58 +68 @@
        i = i+1
        if i%iprint == 0 :
-          pass
-          #FIXME: Should depend on verbosity 
-          #print 'i = %g rTr = %20.15e'% (i,rTr)
+          logger.info('i = %g rTr = %20.15e'% (i,rTr))
 
-   #FIXME: Should this raise an exception?       
+   #FIXME: Should this raise an exception?
    if i==imax:
      print 'max number of iterations attained'
 
    return x
-
-

inundation/ga/storm_surge/pyvolution/pyvolution.ini

@@ -1 +1 @@
 [Files MRU]
-0=c:\home\projects\python-fvm\pyvolution\cg_solve.py.html
-1=c:\home\projects\python-fvm\pyvolution\pyvolution.zpi
-2=c:\program files\zfw\readme.txt
+0=c:\home\projects\python-fvm\pyvolution\least_squares.py
+1=c:\home\projects\python-fvm\pyvolution\cg_solve.py.html
+2=c:\home\projects\python-fvm\pyvolution\pyvolution.zpi
+3=c:\program files\zfw\readme.txt

inundation/ga/storm_surge/pyvolution/test_advection.py

@@ -133 +133 @@
 
         #Populate boundary array with dirichlet conditions.
-        domain.neighbours = array([[1,-1,-2], [0,-3,-4]])
+        domain.neighbours = array([[1,-1,-2], [0,-3,-4]])
         domain.set_quantity('stage', [1.0, 0.0], 'centroids')
-        domain.distribute_to_vertices_and_edges()
+        domain.distribute_to_vertices_and_edges()
 
-        domain.compute_fluxes()
+        domain.compute_fluxes()
 
         X = domain.quantities['stage'].explicit_update