Changeset 1924 for inundation/pyvolution/domain.py

Timestamp:

Oct 14, 2005, 1:32:41 PM (19 years ago)

Author:

ole

Message:

Implemented arbitrary expressions in set_quantity using functionality from changeset:1916

File:

• inundation/pyvolution/domain.py (modified) (2 diffs)

inundation/pyvolution/domain.py

@@ -143 +143 @@
 
     def set_quantity(self, name, *args, **kwargs):
-                     #X,
-                     #location = 'vertices',
-                     #indices = None):
         """Set values for named quantity
 
-        name: Name of quantity
-        X: Compatible list, Numeric array, const or function (see below)
-        location: Where values are to be stored.
-                  Permissible options are: vertices, edges, centroids
-
-        In case of location == 'centroids' the dimension values must
-        be a list of a Numerical array of length N, N being the number
-        of elements. Otherwise it must be of dimension Nx3.
-
-        Indices is the set of element ids that the operation applies to
-
-        The values will be stored in elements following their
-        internal ordering.
-
-        #FIXME (Ole): I suggest the following interface
-        set_quantity(name, X, location, region)
-        where
-            name: Name of quantity
-            X:
-              -Compatible list,
-              -Numeric array,
-              -const or function (see below)
-              -another quantity Q or an expression of the form
-              a*Q+b, where a is a scalar or a compatible array or a quantity
-              Q is a quantity
-              b is either a scalar, a quantity or a compatible array
-              pts file
-            location: Where values are to be stored.
-                      Permissible options are: vertices, edges, centroid
-            region: Identify subset of triangles. Permissible values are
-                    - tag name (refers to tagged region)
-                    - indices (refers to specific triangles)
-                    - polygon (identifies region)
-
-            This should work for all values of X
-
-
+
+        One keyword argument is documented here:
+        expression = None, # Arbitrary expression
+
+        expression:
+          Arbitrary expression involving quantity names
+
+        See Quantity.set_values for further documentation.
         """
 
         #FIXME (Ole): Allow new quantities
+
         
         #from quantity import Quantity, Conserved_quantity
@@ -197 +166 @@
         ##    self.quantities[name] = Quantity(self)
 
-        #Set value
-        #FIXME: use **kwargs
-        #self.quantities[name].set_values(X,
-        #                                 location = location,
-        #                                 indices = indices)
+
+        #Do the expression stuff
+        if kwargs.has_key('expression'):
+            expression = kwargs['expression']
+            del kwargs['expression']            
+
+            Q = create_quantity_from_expression(self, expression)
+
+            kwargs['quantity'] = Q
+
+            
+            
+
         self.quantities[name].set_values(*args, **kwargs)