Changeset 2825 for trunk

Timestamp:

11/18/2008 05:08:38 PM (7 weeks ago)

Author:

guyer

Message:

It makes more sense for the copy of an OperatorVariable to be a plain Variable (of appropriate class)

Location:

trunk

Files:

• FiPy.egg-info/SOURCES.txt (modified) (2 diffs)
• fipy/variables/cellVariable.py (modified) (1 diff)
• fipy/variables/faceVariable.py (modified) (1 diff)
• fipy/variables/modularVariable.py (modified) (1 diff)
• fipy/variables/operatorVariable.py (modified) (1 diff)
• fipy/variables/variable.py (modified) (1 diff)

trunk/FiPy.egg-info/SOURCES.txt

@@ -22 +22 @@
 documentation/TALKS.txt
 documentation/TODOLIST.txt
-documentation/VERSION.txt
 documentation/VKML.txt
 documentation/figures/NIST_right2line.pdf
@@ -31 +30 @@
 documentation/manual/fipy.bst
 documentation/manual/fipy.dbj
-documentation/manual/fipy.pdf
 documentation/manual/fipy.sty
 documentation/manual/fipy.tex

trunk/fipy/variables/cellVariable.py

@@ -132 +132 @@
     def copy(self):
         
-        return self.__class__(
-            mesh = self.mesh, 
-            name = self.name + "_old", 
-            value = self.getValue(),
-            hasOld = 0)
+        return self._getArithmeticBaseClass()(mesh=self.mesh, 
+                                              name=self.name + "_old", 
+                                              value=self.getValue(),
+                                              hasOld=False)
             
     def __call__(self, points=None, order=0):

trunk/fipy/variables/faceVariable.py

@@ -60 +60 @@
 
     def copy(self):
-        return self.__class__(mesh = self.mesh, 
-                              name = self.name + "_copy", 
-                              value = self.getValue())
+        return self._getArithmeticBaseClass()(mesh=self.mesh, 
+                                              name=self.name + "_copy", 
+                                              value=self.getValue())
 
     def getDivergence(self):

trunk/fipy/variables/modularVariable.py

@@ -208 +208 @@
         return self._BinaryOperatorVariable(lambda a,b: b-a, other, canInline=False)
 
+    def _getArithmeticBaseClass(self, other=None):
+        """
+        Given `self` and `other`, return the desired base
+        class for an operation result.
+        """
+        if other is None:
+            return ModularVariable
+            
+        return CellVariable._getArithmeticBaseClass(self, other)
+
 
 def _test(): 

trunk/fipy/variables/operatorVariable.py

@@ -191 +191 @@
             return name
             
-        def copy(self):
-            return self.__class__(
-                op = self.op,
-                var = self.var,
-                opShape = self.opShape,
-                canInline = self.canInline)
- 
         def getShape(self):
             if self.opShape is not None:

trunk/fipy/variables/variable.py

@@ -221 +221 @@
             
         """
-        return Variable(value=self)
+        return self._getArithmeticBaseClass()(value=self)