Changeset 5538 for anuga_work/development/anuga_1d

Timestamp:

Jul 19, 2008, 8:40:31 PM (17 years ago)

Author:

steve

Message:

 

File:

• anuga_work/development/anuga_1d/test_shallow_water.py (modified) (2 diffs)

anuga_work/development/anuga_1d/test_shallow_water.py

@@ -11 +11 @@
 class Test_Shallow_Water(unittest.TestCase):
     def setUp(self):
-        self.points1 = [0.0, 1.0, 2.0, 3.0]
+        self.points = [0.0, 1.0, 2.0, 3.0]
         self.vertex_values = [[1.0,2.0],[4.0,5.0],[-1.0,2.0]]
-
-
-        pass
         
     def tearDown(self):
@@ -23 +20 @@
 
     def test_creation(self):
-
-
-        D1 = Domain(self.points1)
-
-        assert allclose(D1.centroids, [0.5, 1.5, 2.5])
-
+        domain = Domain(self.points)
+        assert allclose(domain.centroids, [0.5, 1.5, 2.5])
 
     def test_compute_fluxes(self):
+        """
+        Compare shallow_water_domain flux calculation against a previous
+        Python implementation (defined in this file)
+        """
+        domain = Domain(self.points)
+        domain.set_quantity('stage',2.0)
+        domain.set_boundary({'exterior' : Reflective_boundary(domain)})
+
+        stage_ud, xmom_ud = compute_fluxes_python(domain)
         
+        domain.compute_fluxes()
 
-        D1 = Domain(self.points1)
-        D1.set_quantity('stage',2.0)
-        D1.set_boundary({'exterior' : Reflective_boundary(D1)})
+        #print doamin.quantities['xmomentum'].explicit_update
+        #print compute_fluxes_python(domain)
 
-        stage_ud, xmom_ud = compute_fluxes_python(D1)
-        
-        D1.compute_fluxes()
-
-        #print D1.quantities['xmomentum'].explicit_update
-        #print compute_fluxes_python(D1)
-
-        assert allclose( D1.quantities['stage'].explicit_update, stage_ud )
-        assert allclose( D1.quantities['xmomentum'].explicit_update, xmom_ud )
+        assert allclose( domain.quantities['stage'].explicit_update, stage_ud )
+        assert allclose( domain.quantities['xmomentum'].explicit_update, xmom_ud )