Changeset 6636

Timestamp:

Mar 27, 2009, 9:01:11 AM (16 years ago)

Author:

ole

Message:

Fixed a few unit tests up after having changed the definition of exchange_area in general_forcing

Location:

anuga_core/source/anuga/shallow_water

Files:

• shallow_water_domain.py (modified) (3 diffs)
• test_shallow_water_domain.py (modified) (8 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1745 +1745 @@
 
         # Update area if applicable
-        self.exchange_area = None        
         if center is not None and radius is not None:
             assert len(center) == 2
@@ -1816 +1815 @@
             
             
-        if self.exchange_indices is not None:
-            #print inlet_region
-        
+        if self.exchange_indices is None:
+            self.exchange_area = polygon_area(bounding_polygon)
+        else:    
             if len(self.exchange_indices) == 0:
                 msg = 'No triangles have been identified in '
@@ -1824 +1823 @@
                 raise Exception, msg
 
-
-
-        # Compute exchange area as the sum of areas of triangles identified
-        # by circle or polygon
-        self.exchange_area = 0.0
-        for i in self.exchange_indices:
-            self.exchange_area += domain.areas[i]
+            # Compute exchange area as the sum of areas of triangles identified
+            # by circle or polygon
+            self.exchange_area = 0.0
+            for i in self.exchange_indices:
+                self.exchange_area += domain.areas[i]
             
 

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -2529 +2529 @@
         # Setup only one forcing term, constant rainfall
         domain.forcing_terms = []
-        domain.forcing_terms.append( Rainfall(domain, rate=2.0) )
+        domain.forcing_terms.append(Rainfall(domain, rate=2.0))
 
         domain.compute_forcing_terms()
@@ -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)
@@ -2923 +2923 @@
 
         # Setup only one forcing term, constant inflow of 2 m^3/s on a circle affecting triangles #0 and #1 (bac and bce)
+
+        I = Inflow(domain, rate=2.0, center=(1,1), radius=1)
         domain.forcing_terms = []
-        domain.forcing_terms.append( 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)
+        
+        ref_dw = 2.0/I.exchange_area
+        
+        assert num.allclose(domain.quantities['stage'].explicit_update[1], ref_dw)
+        assert num.allclose(domain.quantities['stage'].explicit_update[0], ref_dw)
         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) )
+        I = Inflow(domain, rate=lambda t: 2., center=(1,1), radius=1)
+        domain.forcing_terms.append(I)
 
         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)
+        ref_dw = 2.0/I.exchange_area
+
+        assert num.allclose(domain.quantities['stage'].explicit_update[1], ref_dw)
+        assert num.allclose(domain.quantities['stage'].explicit_update[0], ref_dw)
         assert num.allclose(domain.quantities['stage'].explicit_update[2:], 0)        
         
@@ -6845 +6851 @@
         
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Shallow_Water, 'test_inflow_using_flowline')
+    suite = unittest.makeSuite(Test_Shallow_Water, 'test_time')
     runner = unittest.TextTestRunner(verbosity=1)    
     runner.run(suite)