Changeset 344

Timestamp:

Sep 24, 2004, 12:49:31 PM (21 years ago)

Author:

ole

Message:

Added possibility for setting unique vertex values to general interface

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

@@ -181 +181 @@
         N = self.centroid_values.shape[0]
         
-        msg = 'Number of values must match number of elements'
-        assert values.shape[0] == N, msg
-        
         if location == 'centroids':
             assert len(values.shape) == 1, 'Values array must be 1d'
+
+            msg = 'Number of values must match number of elements'
+            assert values.shape[0] == N, msg
+            
             self.centroid_values = values                        
         elif location == 'edges':
             assert len(values.shape) == 2, 'Values array must be 2d'
+
+            msg = 'Number of values must match number of elements'
+            assert values.shape[0] == N, msg
+            
             msg = 'Array must be N x 3'            
             assert values.shape[1] == 3, msg
@@ -194 +199 @@
             self.edge_values = values
         else:
-            assert len(values.shape) == 2, 'Values array must be 2d'
-            msg = 'Array must be N x 3'            
-            assert values.shape[1] == 3, msg
-            
-            self.vertex_values = values
+            if len(values.shape) == 1:
+                #Values are being specified once for each unique vertex
+                msg = 'Number of values must mact number of vertices'
+                assert values.shape[0] == self.domain.coordinates.shape[0], msg
+
+                self.set_vertex_values(values)
+            elif len(values.shape) == 2:
+                #Vertex values are given as a triplet for each triangle
+                msg = 'Number of values must match number of elements'
+                assert values.shape[0] == N, msg
+                
+                msg = 'Array must be N x 3'            
+                assert values.shape[1] == 3, msg
+                self.vertex_values = values            
+            else:    
+                msg = 'Values array must be 1d or 2d'
+                raise msg
+                
 
 

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -215 +215 @@
                                                [3.5, 4.5, 3.],
                                                [2.5, 3.5, 2]])
+
+
+
+
+    def test_set_vertex_values_using_general_interface(self):
+        quantity = Quantity(self.mesh4)
+
+
+        quantity.set_values([0,1,2,3,4,5])
+
+
+        assert allclose(quantity.vertex_values,
+                        [[1,0,2], [1,2,4], [4,2,5], [3,1,4]])
+        
+        assert allclose(quantity.centroid_values, [1., 7./3, 11./3, 8./3]) #Centroid
+        
+        assert allclose(quantity.edge_values, [[1., 1.5, 0.5],
+                                               [3., 2.5, 1.5],
+                                               [3.5, 4.5, 3.],
+                                               [2.5, 3.5, 2]])
+