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

Timestamp:

Aug 24, 2004, 4:11:25 PM (21 years ago)

Author:

ole

Message:

Testing

File:

• inundation/ga/storm_surge/pyvolution/test_quantity.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -217 +217 @@
 
 
-#     def test_second_order_extrapolation2(self):
-
-#         initialise_consecutive_datastructure(points=6+4, elements=4)                
-        
-#         a = Point (0.0, 0.0)
-#         b = Point (0.0, 2.0)
-#         c = Point (2.0, 0.0)
-#         d = Point (0.0, 4.0)
-#         e = Point (2.0, 2.0)
-#         f = Point (4.0, 0.0)
-
-#         #Set up for a gradient of (3,1), f(x) = 3x+y
-#         v1 = Volume(b,a,c,array([2.0+2.0/3,0,0]))        
-#         v2 = Volume(b,c,e,array([4.0+4.0/3,0,0]))
-#         v3 = Volume(e,c,f,array([8.0+2.0/3,0,0]))
-#         v4 = Volume(d,b,e,array([2.0+8.0/3,0,0]))
-
-#         #Setup neighbour structure
-#         domain = Domain([v1,v2,v3,v4])
-#         domain.precompute()
-#       domain.check_integrity()
-        
-#         #Lets's check first order first, hey
-#       domain.order = 1
-#       domain.limiter = dummy_limiter
-#         distribute_to_vertices_and_edges(domain)              
-        
-#         assert allclose(v2.conserved_quantities_vertex0,
-#                         v2.conserved_quantities_centroid)
-#         assert allclose(v2.conserved_quantities_vertex1,
-#                         v2.conserved_quantities_centroid)
-#         assert allclose(v2.conserved_quantities_vertex2,
-#                         v2.conserved_quantities_centroid)                
-
-
-#         #Flux across right edge of volume 1
-#         #Outward pointing normal vector
-#         from shallow_water import flux_using_stage as flux_function
-#         normals = Volume.normals
-        
-#         normal = Vector.coordinates[normals[1][2]]
-#         ql = Volume.conserved_quantities_face2[1]
-#         qr = Volume.conserved_quantities_face1[0]
-#         fl = array([0.,0.])
-#         fr = array([0.,0.])
-#         flux0, max_speed = flux_function(normal, ql, qr, fl, fr)
-
-#         #print flux0, max_speed        
-
-#         #print
-#         #print v1.conserved_quantities_face0,\
-#         #      v2.conserved_quantities_face0,\
-#         #      v3.conserved_quantities_face0,\
-#         #      v4.conserved_quantities_face0              
-#         #print
-#         #edgelengths = Volume.geometric[:,2:]
-#         #print
-#         #print
-        
-#         from python_versions import compute_flux
-#         compute_flux(domain, 100)
-#         F1 = Volume.explicit_update
-
-#         from domain import compute_flux
-#         compute_flux(domain, 100)
-#         F2 = Volume.explicit_update        
-
-#         assert allclose(F1, F2)
-        
-#         #print F1
-#         #print F2
-        
-
-
-#         #Gradient of fitted pwl surface    
-#       a, b = compute_gradient(v2.id)  
-
-#         assert abs(a[0] - 3.0) < epsilon
-#         assert abs(b[0] - 1.0) < epsilon
-#         #assert qmin[0] == 2.0 + 2.0/3
-#         #assert qmax[0] == 8.0 + 2.0/3                
-
-#         #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 allclose(v2.conserved_quantities_vertex0[0], 2.0)
-#         assert allclose(v2.conserved_quantities_vertex1[0], 6.0)        
-#         assert allclose(v2.conserved_quantities_vertex2[0], 8.0)
-
+    def test_second_order_extrapolation2(self):
+        quantity = Quantity(self.mesh4)
+
+        #Set up for a gradient of (3,1), f(x) = 3x+y
+        quantity.set_values([2.0+2.0/3, 4.0+4.0/3, 8.0+2.0/3, 2.0+8.0/3],
+                            location = 'centroids')
+        
+        #Gradients
+        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 allclose(a[i], 3.0)
+            assert allclose(b[i], 1.0)
+
+
+        quantity.extrapolate_second_order()
+
+        assert allclose(quantity.vertex_values[1,0], 2.0)
+        assert allclose(quantity.vertex_values[1,1], 6.0)        
+        assert allclose(quantity.vertex_values[1,2], 8.0)