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

Timestamp:

Aug 23, 2004, 2:45:42 PM (21 years ago)

Author:

ole

Message:

Finished and tested gradient and limiters
Added forcing terms (not tested yet)

File:

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

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -148 +148 @@
         quantity = Quantity(self.mesh4)
 
-        #Set up for a gradient of (1,0)
-        quantity.set_values([2.0/3, 4.0/3, 8.0/3, 2.0/3],
+        #Set up for a gradient of (3,0) at mid triangle 
+        quantity.set_values([2.0, 4.0, 8.0, 2.0],
                             location = 'centroids')
         
         #Gradients
-        quantity.compute_gradients()
-
-        #FIXME:
-
-        #HERTIL
-        
-        #Gradient of fitted pwl surface    
-        #a, b = compute_gradient(v2.id)
-
-        #assert a == 1.0
-        #assert b == 0.0
-
-
-        #And now for the second order stuff        
-        # - the full second order extrapolation
-        #domain.order = 2
-        #domain.limiter = dummy_limiter
-        #distribute_to_vertices_and_edges(domain)       
-    
-        #assert v2.conserved_quantities_vertex0 == 0.0
-        #assert v2.conserved_quantities_vertex1 == 2.0        
-        #assert v2.conserved_quantities_vertex2 == 2.0        
+        a, b = quantity.compute_gradients()
+
+
+        #gradient bewteen t0 and t1 is undefined as det==0
+        assert a[0] == 0.0
+        assert b[0] == 0.0
+        #The others are OK
+        for i in range(1,4):
+            assert a[i] == 3.0
+            assert b[i] == 0.0
+
+
+        quantity.second_order_extrapolator()
+        
+        assert allclose(quantity.vertex_values, [[2., 2.,  2.],
+                                                 [0., 6.,  6.],
+                                                 [6., 6., 12.],
+                                                 [0., 0.,  6.]])
 
 
@@ -355 +351 @@
 
 
-    def test_first_order_limiter(self):
+    def test_first_order_extrapolator(self):
         quantity = Quantity(self.mesh4)
 
@@ -363 +359 @@
 
         #Extrapolate
-        quantity.first_order_limiter()
+        quantity.first_order_extrapolator()
 
         #Check vertices but not edge values
@@ -370 +366 @@
 
 
-    def test_second_order_limiter(self):
-        quantity = Quantity(self.mesh4)
-
-        #Create a deliberate overshoot (e.g. from gradient computation)
-        quantity.set_values([[0,3,3], [6,2,2], [3,8,5], [3,5,8]])
-
-        #Limit and extrapolate
-        quantity.second_order_limiter()
+    def test_second_order_extrapolator(self):
+        quantity = Quantity(self.mesh4)
+
+        #Set up for a gradient of (3,0) at mid triangle 
+        quantity.set_values([2.0, 4.0, 8.0, 2.0],
+                            location = 'centroids')
+        
+
+
+        quantity.second_order_extrapolator()
+        quantity.limiter()
 
 
         #Assert that central triangle is limited by neighbours
-        assert quantity.vertex_values[1,0] <= quantity.vertex_values[2,2]
-        assert quantity.vertex_values[1,0] <= quantity.vertex_values[3,1]
-        
-        assert quantity.vertex_values[1,1] <= quantity.vertex_values[3,0]
+        assert quantity.vertex_values[1,0] >= quantity.vertex_values[0,0]
+        assert quantity.vertex_values[1,0] >= quantity.vertex_values[3,1]
+        
+        assert quantity.vertex_values[1,1] <= quantity.vertex_values[2,1]
         assert quantity.vertex_values[1,1] >= quantity.vertex_values[0,2]
         
         assert quantity.vertex_values[1,2] <= quantity.vertex_values[2,0]
-        assert quantity.vertex_values[1,2] >= quantity.vertex_values[0,1]
+        assert quantity.vertex_values[1,2] >= quantity.vertex_values[3,1]
 
         
@@ -398 +397 @@
         
         
-        #Check vertices but not edge values
-        #assert allclose(quantity.vertex_values,
-        #                [[1,1,1], [2,2,2], [3,3,3], [4, 4, 4]])
+
+        
+
+    def test_limiter(self):        
+        quantity = Quantity(self.mesh4)
+
+        #Create a deliberate overshoot (e.g. from gradient computation)
+        quantity.set_values([[3,0,3], [2,2,6], [5,3,8], [8,3,5]])
+
+
+        #Limit
+        quantity.limiter()
+
+        #Assert that central triangle is limited by neighbours
+        assert quantity.vertex_values[1,0] >= quantity.vertex_values[0,0]
+        assert quantity.vertex_values[1,0] <= quantity.vertex_values[3,1]
+        
+        assert quantity.vertex_values[1,1] <= quantity.vertex_values[2,1]
+        assert quantity.vertex_values[1,1] >= quantity.vertex_values[0,2]
+        
+        assert quantity.vertex_values[1,2] <= quantity.vertex_values[2,0]
+        assert quantity.vertex_values[1,2] <= quantity.vertex_values[3,1]
+
+
+        
+        #Assert that quantities are conserved
+        from Numeric import sum
+        for k in range(quantity.centroid_values.shape[0]):
+            assert allclose (quantity.centroid_values[k],
+                             sum(quantity.vertex_values[k,:])/3)
+        
 
 
@@ -412 +439 @@
 
         #Extrapolate
-        quantity.distribute_to_vertices_and_edges(order=1)
+        quantity.first_order_extrapolator()
+
+        #Interpolate
+        quantity.interpolate_from_vertices_to_edges()        
 
         assert allclose(quantity.vertex_values,