Changeset 1928

Timestamp:

Oct 14, 2005, 5:08:29 PM (19 years ago)

Author:

ole

Message:

Made create_quantity_from_expression a method

Location:

inundation/pyvolution

Files:

• domain.py (modified) (4 diffs)
• quantity.py (modified) (1 diff)
• test_domain.py (modified) (2 diffs)

inundation/pyvolution/domain.py

@@ -155 +155 @@
         """
 
-        #FIXME (Ole): Allow new quantities
-
-        
+        #FIXME (Ole): Allow new quantities here
         #from quantity import Quantity, Conserved_quantity
-
         #Create appropriate quantity object
         ##if name in self.conserved_quantities:
@@ -172 +169 @@
             del kwargs['expression']            
 
-            Q = create_quantity_from_expression(self, expression)
-
+            Q = self.create_quantity_from_expression(expression)
             kwargs['quantity'] = Q
 
-            
-            
-
+
+        #Assign values    
         self.quantities[name].set_values(*args, **kwargs)
 
@@ -200 +195 @@
 
 
+    def create_quantity_from_expression(self, expression):
+        """Create new quantity from other quantities using arbitrary expression
+
+        Combine existing quantities in domain using expression and return
+        result as a new quantity.
+
+        Note, the new quantity could e.g. be used in set_quantity
+
+        Valid expressions are limited to operators defined in class Quantity
+
+        Example:
+      
+    
+        """
+
+        from util import apply_expression_to_dictionary
+        return apply_expression_to_dictionary(expression, self.quantities)
+    
 
 
@@ -707 +720 @@
 
 
-def create_quantity_from_expression(domain, expression):
-    """Create new quantity from other quantities using arbitrary expression
-
-    Combine existing quantities in domain using expression and return
-    result as a new quantity.
-
-    Note, the new quantity could e.g. be used in set_quantity
-
-    Valid expressions are limited to operators defined in class Quantity
-
-    Example:
-      
-    
-    """
-
-    from util import apply_expression_to_dictionary
-    return apply_expression_to_dictionary(expression, domain.quantities)
-    
 
 

inundation/pyvolution/quantity.py

@@ -255 +255 @@
         msg = 'Exactly one of the arguments '+\
               'numeric, quantity, function, points, or filename '+\
-              'must be present. L = %s' %str(L)
+              'must be present.'
         assert L.count(None) == len(L)-1, msg
 

inundation/pyvolution/test_domain.py

@@ -177 +177 @@
 
         expression = 'stage - elevation'
-        Q = create_quantity_from_expression(domain, expression)
+        Q = domain.create_quantity_from_expression(expression)
 
         assert allclose(Q.vertex_values, [[2,3,4], [6,6,6],
@@ -183 +183 @@
 
         expression = '(xmomentum*xmomentum + ymomentum*ymomentum)**0.5'
-        Q = create_quantity_from_expression(domain, expression)
+        Q = domain.create_quantity_from_expression(expression)
 
         X = domain.quantities['xmomentum'].vertex_values