Changeset 2680 for trunk

Timestamp:

07/14/2008 03:16:24 PM (6 months ago)

Author:

wd15

Message:

added sensible tolerance normalization

Files:

• trunk/fipy/solvers/pysparse/linearLUSolver.py (modified) (2 diffs)

trunk/fipy/solvers/pysparse/linearLUSolver.py

@@ -89 +89 @@
         LU = superlu.factorize(L._getMatrix().to_csr())
 
+        error0 = numerix.sqrt(numerix.sum((L * x - b)**2))
+
         for iteration in range(self.iterations):
             errorVector = L * x - b
-            tol = max(numerix.absolute(errorVector*maxdiag))
-            # Multiplied by maxdiag so that it is equal to the residual seen externally
 
-            if tol <= self.tolerance:
+            if (numerix.sqrt(numerix.sum(errorVector**2)) / error0)  <= self.tolerance:
                 break
 
@@ -100 +100 @@
             LU.solve(errorVector, xError)
             x[:] = x - xError
-
-            #tol = max(numerix.absolute(xError))
-            # Old termination condition was based on the correction made to x