Changeset 5450 for anuga_core

Timestamp:

Jun 30, 2008, 10:41:27 AM (17 years ago)

Author:

ole

Message:

Added exception is inlet_region for General flow does not contain any triangles.
An input check was also added.

Location:

anuga_core/source/anuga/shallow_water

Files:

• shallow_water_domain.py (modified) (3 diffs)
• test_shallow_water_domain.py (modified) (1 diff)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -1491 +1491 @@
                  verbose=False):
                      
-
+        if center is None:
+            msg = 'I got radius but no center.'        
+            assert radius is None, msg
+            
+        if radius is None:
+            msg += 'I got center but no radius.'        
+            assert center is None, msg
+            
+            
+                     
         from math import pi
 
@@ -1529 +1538 @@
             # Inlet is circular
             
+            inlet_region = 'center=%s, radius=%s' %(self.center, self.radius) 
+            
             self.exchange_indices = []
             for k in range(N):
@@ -1537 +1548 @@
         if self.polygon is not None:                    
             # Inlet is polygon
+            
+            inlet_region = 'polygon=%s' %(self.polygon) 
+                        
             self.exchange_indices = inside_polygon(points, self.polygon)
             
-
-            
+            
+        if self.exchange_indices is not None:
+            #print inlet_region
+        
+            if len(self.exchange_indices) == 0:
+                msg = 'No triangles have been identified in specified region: %s' %inlet_region
+                raise Exception, msg
 
 

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -2321 +2321 @@
         
 
+
+
+    def test_inflow_catch_too_few_triangles(self):
+        """test_inflow_catch_too_few_triangles
+        
+        Test that exception is thrown if no triangles are covered by the inflow area
+        """
+        from math import pi, cos, sin
+
+        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)
+
+        # Flat surface with 1m of water
+        domain.set_quantity('elevation', 0)
+        domain.set_quantity('stage', 1.0)
+        domain.set_quantity('friction', 0)
+
+        Br = Reflective_boundary(domain)
+        domain.set_boundary({'exterior': Br})
+
+        # Setup only one forcing term, constant inflow of 2 m^3/s on a circle affecting triangles #0 and #1 (bac and bce)
+
+        try:
+            Inflow(domain, rate=2.0, center=(1,1.1), radius=0.01)
+        except:
+            pass
+        else:
+            msg = 'Should have raised exception'
+            raise Exception, msg
+
+
+
+        
+        
 
     #####################################################