Changeset 2605 for trunk

Timestamp:

06/19/2008 06:02:50 PM (7 months ago)

Author:

wd15

Message:

sweep now calculates the L2 residual normalized by the L2 norm of the b vector

Location:

trunk

Files:

• examples/convection/robin.py (modified) (1 diff)
• fipy/terms/term.py (modified) (1 diff)

trunk/examples/convection/robin.py

@@ -122 +122 @@
 
     >>> res = 1e+10
-    >>> while res > 1e-3:
+    >>> while res > 1e-5:
     ...     res = eq.sweep(var=C, boundaryConditions=BCs)
     ...     if __name__ == '__main__':

trunk/fipy/terms/term.py

@@ -83 +83 @@
     def _calcResidual(self, var, matrix, RHSvector):
 
-        return abs(self._calcResidualVector(var, matrix, RHSvector)).max()
+        L2norm = numerix.sqrt(numerix.sum(self._calcResidualVector(var, matrix, RHSvector)**2))
+        RHSL2norm = numerix.sqrt(numerix.sum(RHSvector**2))
+        
+        if RHSL2norm == 0:
+            return L2norm
+        else:
+            return L2norm / RHSL2norm 
+
+##        return abs(self._calcResidualVector(var, matrix, RHSvector)).max()
 
     def __buildMatrix(self, var, SparseMatrix, boundaryConditions, dt):