Changeset 2726 for trunk

Timestamp:

08/21/2008 12:35:40 PM (5 months ago)

Author:

wd15

Message:

added a sign method to Variable and numerix in order for the ImplicitSourceTerm? to correctly calculate when the coefficient value changes sign during a simulation

Location:

trunk/fipy

Files:

• terms/implicitSourceTerm.py (modified) (2 diffs)
• terms/test.py (modified) (1 diff)
• tools/numerix.py (modified) (1 diff)
• variables/variable.py (modified) (1 diff)

trunk/fipy/terms/implicitSourceTerm.py

@@ -58 +58 @@
     """
     def _calcCoeffVectors(self, var, equation=None):
+        """
+        Test for a bug due to the sign operator not being updating
+        correctly.
+
+            >>> from fipy import *
+            >>> m = Grid1D(nx=1)
+            >>> v = CellVariable(mesh=m, value=1.)
+            >>> eq = TransientTerm() == ImplicitSourceTerm(v)
+            >>> eq.solve(v)
+            >>> print v
+            [ 2.]
+            >>> v.setValue(-1.)
+            >>> eq.solve(v)
+            >>> print v
+            [-0.5]
+            
+        """
+
         coeff = self._getGeomCoeff(var.getMesh())
         from fipy.tools.numerix import sign
@@ -67 +85 @@
             'new value': numerix.zeros(var.getMesh().getNumberOfCells(), 'd')
         }
+
+def _test(): 
+    import doctest
+    return doctest.testmod()
+    
+if __name__ == "__main__": 
+    _test() 

trunk/fipy/terms/test.py

@@ -57 +57 @@
             'equation',
             'upwindConvectionTerm',
-            'collectedDiffusionTerm'
+            'collectedDiffusionTerm',
+            'implicitSourceTerm'
         ), base = __name__)
 

trunk/fipy/tools/numerix.py

@@ -834 +834 @@
         return umath.ceil(arr)
 
+
+def sign(arr):
+    if _isPhysical(arr):
+        return arr.sign()
+    elif type(arr) is type(array((0))):
+        return NUMERIX.sign(arr)
+    else:
+        return umath.sign(arr)
+
 def exp(arr):
     r"""

trunk/fipy/variables/variable.py

@@ -1194 +1194 @@
     def ceil(self):
         return self._UnaryOperatorVariable(lambda a: numerix.ceil(a))
+
+    def sign(self):
+        return self._UnaryOperatorVariable(lambda a: numerix.sign(a), canInline=False)
         
     def conjugate(self):