Changeset 206

Timestamp:

Aug 23, 2004, 4:36:00 PM (20 years ago)

Author:

ole

Message:

Added set_values for funcs and constants.
Not yet tested!

File:

• inundation/ga/storm_surge/pyvolution/quantity.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -298 +298 @@
             
             
-    def set_values(self, values, location='vertices'):
+    def set_values(self, X, location='vertices'):
         """Set values for quantity
 
-        values: Compatible list or Numeric array (see below)
+        X: Compatible list, Numeric array (see below), constant or function
         location: Where values are to be stored.
                   Permissible options are: vertices, edges, centroid
@@ -312 +312 @@
         The values will be stored in elements following their
         internal ordering.
+
+        If values are described a function, it will be evaluated at specified points
 
         If selected location is vertices, values for centroid and edges
@@ -319 +321 @@
         """
 
-        #FIXME: Should take functions as argument as well
-        #FIXME: Should take constants as well
-        
+
+        #FIXME: Should do location erro check here only
+        
+
+        import types
+        
+        if callable(X):
+            #Use function specific method
+            self.set_function_values(X, location)            
+        elif type(X) in [types.FloatType, types.IntType, types.LongType]:
+            if location == 'vertices':
+                self.vertex_values[:] = X
+            elif location == 'edges':
+                self.edge_values[:] = X
+            elif location == 'centroids':
+                self.centroid_values[:] = X
+            else:
+                raise 'Invalid location: %s' %location                
+        else:
+            #Use array specific method
+            self.set_array_values(X, location)
+
+
+    def set_function_values(self, f, location='vertices'):
+        """Set values for quantity using specified function
+
+        f: x, y -> z Function where x, y and z are arrays
+        location: Where values are to be stored.
+                  Permissible options are: vertices, edges, centroid
+                  Default is "vertices"
+        """
+
+
+        if location == 'vertices':
+            V = self.domain.get_vertex_coordinates()
+
+            for i in range(3):
+                self.set_values(f(V[:,2*i], V[:,2*i+1]), location)
+        elif location == 'edges':
+            raise 'Not yet implemented'
+        elif location == 'centroids':
+            V = self.domain.centroids
+            self.set_values(f(V[:,0], V[:,1]), location)            
+        else:
+            raise 'Invalid location: %s' %location                            
+
+            
+    def set_array_values(self, values, location='vertices'):
+        """Set values for quantity
+
+        values: Numeric array
+        location: Where values are to be stored.
+                  Permissible options are: vertices, edges, centroid
+                  Default is "vertices"
+
+        In case of location == 'centroid' the dimension values must
+        be a list of a Numerical array of length N, N being the number
+        of elements in the mesh. Otherwise it must be of dimension Nx3
+
+        The values will be stored in elements following their
+        internal ordering.
+
+        If selected location is vertices, values for centroid and edges
+        will be assigned interpolated values.
+        In any other case, only values for the specified locations
+        will be assigned and the others will be left undefined.
+        """
+
         from Numeric import array, Float