Changeset 6651

Timestamp:

Mar 28, 2009, 11:03:51 AM (16 years ago)

Author:

ole

Message:

Fixed the remaining unit tests up after having changed the definition of exchange_area in general_forcing. The first bits were done in changeset:6636

File:

• anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py (modified) (7 diffs)

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -2567 +2567 @@
                      polygon = [[1,1], [2,1], [2,2], [1,2]])
 
-        assert num.allclose(R.exchange_area, 1)
+        assert num.allclose(R.exchange_area, 2)
         
         domain.forcing_terms.append(R)
@@ -2734 +2734 @@
                      polygon=rainfall_poly)
 
-        assert num.allclose(R.exchange_area, 1)
+        assert num.allclose(R.exchange_area, 2)
         
         domain.forcing_terms.append(R)
@@ -2807 +2807 @@
                      default_rate=5.0)
 
-        assert num.allclose(R.exchange_area, 1)
+        assert num.allclose(R.exchange_area, 2)
         
         domain.forcing_terms.append(R)
@@ -2882 +2882 @@
                      default_rate=5.0)
 
-        assert num.allclose(R.exchange_area, 1)
+        assert num.allclose(R.exchange_area, 2)
         
         domain.forcing_terms.append(R)
@@ -2924 +2924 @@
         # Setup only one forcing term, constant inflow of 2 m^3/s on a circle affecting triangles #0 and #1 (bac and bce)
         domain.forcing_terms = []
-        domain.forcing_terms.append( Inflow(domain, rate=2.0, center=(1,1), radius=1) )
-
+        
+        I = Inflow(domain, rate=2.0, center=(1,1), radius=1)
+        domain.forcing_terms.append(I)        
         domain.compute_forcing_terms()
-        #print domain.quantities['stage'].explicit_update
-        
-        assert num.allclose(domain.quantities['stage'].explicit_update[1], 2.0/pi)
-        assert num.allclose(domain.quantities['stage'].explicit_update[0], 2.0/pi)
+        
+        A = I.exchange_area
+        assert num.allclose(A, 4) # Two triangles        
+        
+        assert num.allclose(domain.quantities['stage'].explicit_update[1], 2.0/A)
+        assert num.allclose(domain.quantities['stage'].explicit_update[0], 2.0/A)
         assert num.allclose(domain.quantities['stage'].explicit_update[2:], 0)        
 
@@ -2961 +2964 @@
         # Setup only one forcing term, time dependent inflow of 2 m^3/s on a circle affecting triangles #0 and #1 (bac and bce)
         domain.forcing_terms = []
-        domain.forcing_terms.append( Inflow(domain, rate=lambda t: 2., center=(1,1), radius=1) )
-
-        domain.compute_forcing_terms()
-        
-        assert num.allclose(domain.quantities['stage'].explicit_update[1], 2.0/pi)
-        assert num.allclose(domain.quantities['stage'].explicit_update[0], 2.0/pi)
+        I = Inflow(domain, rate=lambda t: 2., center=(1,1), radius=1)
+        domain.forcing_terms.append(I)
+        
+        domain.compute_forcing_terms()        
+
+        A = I.exchange_area
+        assert num.allclose(A, 4) # Two triangles
+        
+        assert num.allclose(domain.quantities['stage'].explicit_update[1], 2.0/A)
+        assert num.allclose(domain.quantities['stage'].explicit_update[0], 2.0/A)
         assert num.allclose(domain.quantities['stage'].explicit_update[2:], 0)        
         
@@ -6876 +6883 @@
         
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Shallow_Water, 'test_inflow_using_flowline')
+    #suite = unittest.makeSuite(Test_Shallow_Water, 'test_inflow_using_flowline')
+    suite = unittest.makeSuite(Test_Shallow_Water, 'test')    
     runner = unittest.TextTestRunner(verbosity=1)    
     runner.run(suite)