Changeset 8470 for trunk/anuga_core/source/anuga/utilities

Timestamp:

Jul 19, 2012, 6:01:19 PM (13 years ago)

Author:

steve

Message:

A small change to stats reporting in cg_solve

File:

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

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

@@ -13 +13 @@
         self.iter = None
         self.rTr = None
-        self.dt = None
+        self.dx = None
+        self.rTr0 = None
+        self.x = None
+        self.x0 = None
+
+    def __str__(self):
+        msg = ' iter %.5g rTr %.5g x %.5g dx %.5g rTr0 %.5g x0 %.5g' \
+              % (self.iter, self.rTr, self.x, self.dx, self.rTr0, self.x0)
+        return msg
+
 
 def conjugate_gradient(A, b, x0=None, imax=10000, tol=1.0e-8, atol=1.0e-14,
@@ -24 +33 @@
     vector.
     """
-    
+
+
     if x0 is None:
         x0 = num.zeros(b.shape, dtype=num.float)
@@ -66 +76 @@
    """
 
+    stats = Stats()
+
     b  = num.array(b, dtype=num.float)
     if len(b.shape) != 1:
@@ -75 +87 @@
         x0 = num.array(x0, dtype=num.float)
 
+
+    stats.x0 =  num.linalg.norm(x0)
 
     if iprint == None  or iprint == 0:
@@ -87 +101 @@
     rTr = num.dot(r, r)
     rTr0 = rTr
+
+    stats.rTr0 = rTr0
     
     #FIXME Let the iterations stop if starting with a small residual
@@ -119 +135 @@
     #print x
 
-    stats = Stats()
+    stats.x =  num.linalg.norm(x)
     stats.iter = i
     stats.rTr = rTr