Changeset 461

Timestamp:

Oct 28, 2004, 4:38:42 PM (20 years ago)

Author:

duncan

Message:

quantity.set_values update

Location:

inundation/ga/storm_surge/pyvolution

Files:

• quantity.py (modified) (3 diffs)
• test_quantity.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -79 +79 @@
             
             
-    def set_values(self, X, location='vertices'):
+    def set_values(self, X, location='vertices', indexes = None):
         """Set values for quantity
 
@@ -125 +125 @@
         else:
             #Use array specific method
-            self.set_array_values(X, location)
+            self.set_array_values(X, location, indexes = indexes)
 
         if location == 'vertices':
@@ -161 +161 @@
                   Permissible options are: vertices, edges, centroid
                   Default is "vertices"
-
+        
+        indexes - if this action is carried out on a subset of elements
+        The element indexes are specified here.
+        
         In case of location == 'centroid' the dimension values must
         be a list of a Numerical array of length N, N being the number

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -656 +656 @@
         value = [7]
         indexes = [1]
-        quantity.set_array_values(value,
+        quantity.set_values(value,
                                   location = 'centroids',
                                   indexes = indexes)
@@ -663 +663 @@
         
         value = [[15,20,25]]
-        quantity.set_array_values(value, indexes = indexes)
+        quantity.set_values(value, indexes = indexes)
         #print "1 quantity.vertex_values",quantity.vertex_values
         assert allclose(quantity.vertex_values[1], value[0])
 
         values = [10,100,50]
-        quantity.set_array_values(values, indexes = [0,1,5])
+        quantity.set_values(values, indexes = [0,1,5])
         #print "2 quantity.vertex_values",quantity.vertex_values
         assert allclose(quantity.vertex_values[0], [10,10,10])
@@ -677 +677 @@
        
         values = [[31,30,29],[400,400,400],[1000,999,998]]
-        quantity.set_array_values(values, indexes = [3,3,5])
+        quantity.set_values(values, indexes = [3,3,5])
         quantity.interpolate()
         assert allclose(quantity.centroid_values, [10,100,3,400,5,999])