Changeset 590 for inundation/ga/storm_surge/pyvolution/test_quantity.py

Timestamp:

Nov 18, 2004, 4:57:29 PM (20 years ago)

Author:

duncan

Message:

set_function_values now handles a subset of triangles. Old and new code.

File:

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

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -184 +184 @@
 
         quantity.set_values(f, location = 'vertices')
+        #print "quantity.vertex_values",quantity.vertex_values
         assert allclose(quantity.vertex_values,
                         [[2,0,2], [2,2,4], [4,2,4], [4,2,4]])        
@@ -677 +678 @@
         assert allclose(quantity.vertex_values[1], value[0])
 
+        # FIXMEDSG this seems wrong -DSG
+        # It's right.  The values is an array, indexed by the element id's
+        # given in indexes.  It sets values per triangle.
         values = [10,100,50]
-        quantity.set_values(values, indexes = [0,1,5])
+        quantity.set_values(values, indexes = [0,1,5]) # , location = 'centroids'
         #print "2 quantity.vertex_values",quantity.vertex_values
         assert allclose(quantity.vertex_values[0], [10,10,10])
         assert allclose(quantity.vertex_values[5], [50,50,50])
-        quantity.interpolate()
+        #quantity.interpolate()
         #print "quantity.centroid_values",quantity.centroid_values
         assert allclose(quantity.centroid_values, [10,100,3,4,5,50])
-       
+
         values = [[31,30,29],[400,400,400],[1000,999,998]]
         quantity.set_values(values, indexes = [3,3,5])
@@ -691 +695 @@
         assert allclose(quantity.centroid_values, [10,100,3,400,5,999])
 
+        values = [[1,1,1],[2,2,2],[3,3,3],
+                                    [4,4,4],[5,5,5],[6,6,6]]
+        quantity.set_values(values)
+        
+        # testing the standard set values by vertex
+        # indexed by vertex_id in general_mesh.coordinates
+        values = [0,1,2,3,4,5,6,7]
+        
+        quantity.set_values(values)
+        #print "1 quantity.vertex_values",quantity.vertex_values
+        assert allclose(quantity.vertex_values,[[ 4.,  5.,  0.],
+                                                [ 1.,  0.,  5.],
+                                                [ 5.,  6.,  1.],
+                                                [ 2.,  1.,  6.],
+                                                [ 6.,  7.,  2.],
+                                                [ 3.,  2.,  7.]])
         
     def test_getting_some_vertex_values(self):