Changeset 218

Timestamp:

Aug 25, 2004, 4:43:44 AM (21 years ago)

Author:

ole

Message:

Made more tests of distribute based on data generated from previous pyvolution version (pyvolution2).
All tests passed.

Location:

inundation/ga/storm_surge/pyvolution

Files:

• domain.py (modified) (1 diff)
• test_shallow_water.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/domain.py

@@ -137 +137 @@
     def set_quantity(self, name, X, location='vertices'):
         """Set values for named quantity
-
+        
         name: Name of quantity
         X: Compatible list, Numeric array, const or function (see below)

inundation/ga/storm_surge/pyvolution/test_shallow_water.py

@@ -659 +659 @@
 
     #####################################################    
+    def test_distribute_basic(self):
+        #Using test data generated by pyvolution-2 
+        #Assuming no friction and flat bed (0.0)
+        
+        a = [0.0, 0.0]
+        b = [0.0, 2.0]
+        c = [2.0, 0.0]
+        d = [0.0, 4.0]
+        e = [2.0, 2.0]
+        f = [4.0, 0.0]
+
+        points = [a, b, c, d, e, f]
+        #bac, bce, ecf, dbe
+        vertices = [ [1,0,2], [1,2,4], [4,2,5], [3,1,4]]
+        
+        domain = Domain(points, vertices)
+        
+        val0 = 2.
+        val1 = 4.
+        val2 = 8.
+        val3 = 2.
+
+        domain.set_quantity('level', [val0, val1, val2, val3], 'centroids')
+        L = domain.quantities['level'].vertex_values
+        
+        #First order
+        domain.order = 1        
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], val1)
+        
+        #Second order
+        domain.order = 2        
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], [2.2, 4.9, 4.9])
+                
+
+        
+    def test_distribute_away_from_bed(self):            
+        #Using test data generated by pyvolution-2 
+        #Assuming no friction and flat bed (0.0)
+        
+        a = [0.0, 0.0]
+        b = [0.0, 2.0]
+        c = [2.0, 0.0]
+        d = [0.0, 4.0]
+        e = [2.0, 2.0]
+        f = [4.0, 0.0]
+
+        points = [a, b, c, d, e, f]
+        #bac, bce, ecf, dbe
+        vertices = [ [1,0,2], [1,2,4], [4,2,5], [3,1,4]]
+        
+        domain = Domain(points, vertices)
+        L = domain.quantities['level'].vertex_values    
+        
+        def level(x,y):
+            return x**2
+        
+        domain.set_quantity('level', level, 'centroids')
+        
+        a, b = domain.quantities['level'].compute_gradients()           
+        assert allclose(a[1], 3.33333334)
+        assert allclose(b[1], 0.0)
+        
+        domain.order = 1
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], 1.77777778)
+        
+        domain.order = 2
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], [0.57777777, 2.37777778, 2.37777778])     
+
+
+        
+    def test_distribute_away_from_bed1(self):           
+        #Using test data generated by pyvolution-2 
+        #Assuming no friction and flat bed (0.0)
+        
+        a = [0.0, 0.0]
+        b = [0.0, 2.0]
+        c = [2.0, 0.0]
+        d = [0.0, 4.0]
+        e = [2.0, 2.0]
+        f = [4.0, 0.0]
+
+        points = [a, b, c, d, e, f]
+        #bac, bce, ecf, dbe
+        vertices = [ [1,0,2], [1,2,4], [4,2,5], [3,1,4]]
+        
+        domain = Domain(points, vertices)
+        L = domain.quantities['level'].vertex_values    
+        
+        def level(x,y):
+            return x**4+y**2
+        
+        domain.set_quantity('level', level, 'centroids')
+        #print domain.quantities['level'].centroid_values               
+        
+        a, b = domain.quantities['level'].compute_gradients()           
+        assert allclose(a[1], 25.18518519)
+        assert allclose(b[1], 3.33333333)
+        
+        domain.order = 1
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], 4.9382716)
+        
+        domain.order = 2
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], [1.07160494, 6.46058131, 7.28262855])     
+
+    
+    
     def test_distribute_near_bed(self):
-        #Assuming no friction
-
-        from config import g
-        
+        #Using test data generated by pyvolution-2 
+        #Assuming no friction and flat bed (0.0)
+
         a = [0.0, 0.0]
         b = [0.0, 2.0]
@@ -676 +787 @@
         
         domain = Domain(points, vertices)
-        domain.order = 2
-
-        #Set up for a gradient of (10,0) at mid triangle         
+
+
+        #Set up for a gradient of (3,0) at mid triangle         
         def slope(x, y):
             return 10*x
@@ -689 +800 @@
         domain.set_quantity('level', level, 'centroids')
 
+        #print domain.quantities['elevation'].centroid_values   
+        #print domain.quantities['level'].centroid_values
+        
         E = domain.quantities['elevation'].vertex_values
         L = domain.quantities['level'].vertex_values
 
         #print E
+        domain.order = 1        
         domain.distribute_to_vertices_and_edges()
-        #print L
-
-        #FIXME: HERTIL 24/8/4. Write similar test using pyvolution2 and
-        #get test data from that
-
+        assert allclose(L[1], [0.19999999, 20.05, 20.05])
+
+        domain.order = 2        
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], [0.1, 20.1, 20.1])
+
+    def test_distribute_near_bed1(self):
+        #Using test data generated by pyvolution-2 
+        #Assuming no friction and flat bed (0.0)
+
+        a = [0.0, 0.0]
+        b = [0.0, 2.0]
+        c = [2.0, 0.0]
+        d = [0.0, 4.0]
+        e = [2.0, 2.0]
+        f = [4.0, 0.0]
+
+        points = [a, b, c, d, e, f]
+        #bac, bce, ecf, dbe
+        vertices = [ [1,0,2], [1,2,4], [4,2,5], [3,1,4]]
+        
+        domain = Domain(points, vertices)
+
+
+        #Set up for a gradient of (3,0) at mid triangle         
+        def slope(x, y):
+            return x**4+y**2
+
+        h = 0.1
+        def level(x,y):
+            return slope(x,y)+h
+
+        domain.set_quantity('elevation', slope)
+        domain.set_quantity('level', level)
+
+        #print domain.quantities['elevation'].centroid_values   
+        #print domain.quantities['level'].centroid_values
+        
+        E = domain.quantities['elevation'].vertex_values
+        L = domain.quantities['level'].vertex_values
+
+        #print E
+        domain.order = 1        
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], [4.19999999, 16.07142857, 20.02857143])
+
+        domain.order = 2        
+        domain.distribute_to_vertices_and_edges()
+        assert allclose(L[1], [4.1, 16.1, 20.1])
+
+#FIXME: Make version with variable height!!!!!!!!
         
     def test_second_order_flat_bed_onestep(self):