Changeset 517

Timestamp:

Nov 10, 2004, 1:43:43 PM (20 years ago)

Author:

duncan

Message:

set_values can now work over a list of triangles, if values are given. This doesn't support functions yet.

Location:

inundation/ga/storm_surge/pyvolution

Files:

• quantity.py (modified) (2 diffs)
• test_quantity.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -117 +117 @@
         elif type(X) in [types.FloatType, types.IntType, types.LongType]:
             if location == 'centroids':
-                self.centroid_values[:] = X
+                if (indexes ==  None):
+                    self.centroid_values[:] = X
+                else:
+                    #Brute force
+                    for i in range(len(indexes)):
+                        self.centroid_values[i,:] = X
+                        
             elif location == 'edges':
-                self.edge_values[:] = X
+                if (indexes ==  None):
+                    self.edge_values[:] = X
+                else:
+                    #Brute force
+                    for i in range(len(indexes)):
+                        self.edge_values[i,:] = X
             else:
-                self.vertex_values[:] = X                
+                if (indexes ==  None):
+                    self.vertex_values[:] = X
+                else:
+                    #Brute force
+                    for i in range(len(indexes)):
+                        self.vertex_values[i,:] = X     
 
         else:
@@ -225 +241 @@
                 else:
                     for element_index, value in map(None, indexes, values): 
-                        self.vertex_values[element_index, 0] = value
-                        self.vertex_values[element_index, 1] = value
-                        self.vertex_values[element_index, 2] = value
+                        self.vertex_values[element_index, :] = value
+                        
             elif len(values.shape) == 2:
                 #Vertex values are given as a triplet for each triangle

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -649 +649 @@
         
     def test_setting_some_vertex_values(self):
-
+        """
+        set values based on triangle lists.
+        """
         from mesh_factory import rectangular
         from shallow_water import Domain