Changeset 7868 for anuga_work/development/2010-projects/anuga_1d/base/test_quantity_1d.py

Timestamp:

Jun 22, 2010, 5:30:32 PM (13 years ago)

Author:

steve

Message:

Added in some more c based limiters

File:

• anuga_work/development/2010-projects/anuga_1d/base/test_quantity_1d.py (modified) (4 diffs)

anuga_work/development/2010-projects/anuga_1d/base/test_quantity_1d.py

@@ -376 +376 @@
 
         assert allclose(a, [ 3., 1., 0.5, 3., 3.5, 0.5])
-        
+
+        quantity.beta = 2.0
+        quantity.limiter = "minmod_kurganov"
         quantity.extrapolate_second_order()
 
@@ -405 +407 @@
 
         #Work out the others
-
+        quantity.beta = 2.0
+        quantity.limiter = "minmod_kurganov"
         quantity.extrapolate_second_order()
         
@@ -496 +499 @@
 
 
+
+
+    def test_limit_minmod(self):
+        quantity = Quantity(self.domain4)
+
+        #Create a deliberate overshoot (e.g. from gradient computation)
+        quantity.set_values([[0,0], [2,10], [9,13], [12,14]])
+
+        #Limit
+        quantity.limiter = 'minmod'
+        quantity.limit_range()
+
+
+
+
+        assert allclose(quantity.vertex_values, [[ -2.4,   2.4],
+                                                 [  2.4,   9.6],
+                                                 [ 10.6,  11.4],
+                                                 [ 11.4,  14.6]] )
+
+        from anuga_1d.base.quantity_ext import limit_minmod_ext
+
+        quantity.set_values([[0,0], [2,10], [9,13], [12,14]])
+
+        limit_minmod_ext(quantity)
+
+
+
+
+        assert allclose(quantity.vertex_values, [[ -2.4,   2.4],
+                                                 [  2.4,   9.6],
+                                                 [ 10.6,  11.4],
+                                                 [ 11.4,  14.6]] )
+
+
+
+    def test_limit_minmod_kurganov(self):
+        quantity = Quantity(self.domain4)
+
+        #Create a deliberate overshoot (e.g. from gradient computation)
+        quantity.set_values([[0,0], [2,10], [9,13], [12,14]])
+
+        #Limit
+        quantity.limiter = 'minmod_kurganov'
+        quantity.beta = 0.5
+        quantity.limit_range()
+
+
+        #print quantity.vertex_values
+
+        assert allclose(quantity.vertex_values, [[ -2.4,   2.4],
+                                                 [  4.2,   7.8],
+                                                 [ 10.8,  11.2],
+                                                 [ 11.4,  14.6]])
+
+        from anuga_1d.base.quantity_ext import limit_minmod_kurganov_ext
+
+        quantity.set_values([[0,0], [2,10], [9,13], [12,14]])
+
+        limit_minmod_kurganov_ext(quantity)
+
+
+        #print quantity.vertex_values
+
+
+    def test_limit_vanleer(self):
+        quantity = Quantity(self.domain4)
+
+        #Create a deliberate overshoot (e.g. from gradient computation)
+        quantity.set_values([[0,0], [2,10], [9,13], [12,14]])
+
+        #Limit
+        quantity.set_limiter('vanleer')
+        quantity.limit_range()
+
+
+        #print quantity.vertex_values
+
+        assert allclose(quantity.vertex_values, [[ -2.4,          2.4       ],
+                                                 [  2.32653061,   9.67346939],
+                                                 [ 10.39393939,  11.60606061],
+                                                 [ 11.4,         14.6       ]] )
+
+        from anuga_1d.base.quantity_ext import limit_vanleer_ext
+
+        quantity.set_values([[0,0], [2,10], [9,13], [12,14]])
+
+        limit_vanleer_ext(quantity)
+
+
+        #print quantity.vertex_values
+
+        assert allclose(quantity.vertex_values, [[ -2.4,          2.4       ],
+                                                 [  2.32653061,   9.67346939],
+                                                 [ 10.39393939,  11.60606061],
+                                                 [ 11.4,         14.6       ]] )
+#
 
     def test_find_qmax_qmin(self):
@@ -542 +642 @@
 
         #Extrapolate
+        quantity.beta = 2.0
+        quantity.limiter = "minmod_kurganov"
         quantity.extrapolate_second_order()