Changeset 2727 for trunk

Timestamp:

08/21/2008 12:37:16 PM (5 months ago)

Author:

wd15

Message:

added a residualFn argument to justResidualVector in term to enable customization of the returned residual

Files:

• trunk/fipy/terms/term.py (modified) (2 diffs)

trunk/fipy/terms/term.py

@@ -191 +191 @@
         return residual
 
-    def justResidualVector(self, var, solver=None, boundaryConditions=(), dt=1., underRelaxation=None):
+    def justResidualVector(self, var, solver=None, boundaryConditions=(), dt=1., underRelaxation=None, residualFn=None):
         r"""
         Builds and the `Term`'s linear system once. This method
@@ -207 +207 @@
         """
         solver, matrix, RHSvector = self._prepareLinearSystem(var, solver, boundaryConditions, dt)
+
+        print 'RHSvector',RHSvector
         
         if underRelaxation is not None:
             matrix, RHSvector = self._applyUnderRelaxation(matrix, var, RHSvector, underRelaxation)
 
-        return self._calcResidualVector(var, matrix, RHSvector)
+        residualFn = residualFn or self._calcResidual
+        residual = residualFn(var, matrix, RHSvector)
+        
+        return residual
 
     def _verifyCoeffType(self, var):