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

Timestamp:

Aug 24, 2004, 12:10:48 PM (21 years ago)

Author:

ole

Message:

testing of set_value and a bit of name changing

File:

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

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -145 +145 @@
 
 
+    def test_set_values_const(self):
+        quantity = Quantity(self.mesh4)
+
+        quantity.set_values(1.0, location = 'vertices')
+        assert allclose(quantity.vertex_values,
+                        [[1,1,1], [1,1,1], [1,1,1], [1, 1, 1]])
+        assert allclose(quantity.centroid_values, [1, 1, 1, 1]) #Centroid
+        assert allclose(quantity.edge_values, [[1, 1, 1],
+                                               [1, 1, 1],
+                                               [1, 1, 1],
+                                               [1, 1, 1]])
+
+
+        quantity.set_values(2.0, location = 'centroids')
+        assert allclose(quantity.centroid_values, [2, 2, 2, 2])
+
+        quantity.set_values(3.0, location = 'edges')
+        assert allclose(quantity.edge_values, [[3, 3, 3],
+                                               [3, 3, 3],
+                                               [3, 3, 3],
+                                               [3, 3, 3]])        
+
+
+    def test_set_values_func(self):
+        quantity = Quantity(self.mesh4)
+
+        def f(x, y):
+            return x+y
+
+        quantity.set_values(f, location = 'vertices')
+        assert allclose(quantity.vertex_values,
+                        [[2,0,2], [2,2,4], [4,2,4], [4,2,4]])        
+        assert allclose(quantity.centroid_values,
+                        [4.0/3, 8.0/3, 10.0/3, 10.0/3])
+        assert allclose(quantity.edge_values,
+                        [[1,2,1], [3,3,2], [3,4,3], [3,4,3]])                
+
+        
+        quantity.set_values(f, location = 'centroids')
+        assert allclose(quantity.centroid_values,
+                        [4.0/3, 8.0/3, 10.0/3, 10.0/3])        
+
+
     def test_gradient(self):
         quantity = Quantity(self.mesh4)
@@ -165 +208 @@
 
 
-        quantity.second_order_extrapolator()
+        quantity.extrapolate_second_order()
         
         assert allclose(quantity.vertex_values, [[2., 2.,  2.],
@@ -359 +402 @@
 
         #Extrapolate
-        quantity.first_order_extrapolator()
+        quantity.extrapolate_first_order()
 
         #Check vertices but not edge values
@@ -375 +418 @@
 
 
-        quantity.second_order_extrapolator()
-        quantity.limiter()
+        quantity.extrapolate_second_order()
+        quantity.limit()
 
 
@@ -408 +451 @@
 
         #Limit
-        quantity.limiter()
+        quantity.limit()
 
         #Assert that central triangle is limited by neighbours
@@ -439 +482 @@
 
         #Extrapolate
-        quantity.first_order_extrapolator()
+        quantity.extrapolate_first_order()
 
         #Interpolate