Changeset 6103

Timestamp:

Dec 24, 2008, 12:40:42 PM (15 years ago)

Author:

ole

Message:

Fixed situation where delta_w is larger than what is specified in
rating curve.

Location:

anuga_core/source/anuga/culvert_flows

Files:

• culvert_class.py (modified) (3 diffs)
• test_culvert_class.py (modified) (4 diffs)

anuga_core/source/anuga/culvert_flows/culvert_class.py

@@ -18 +18 @@
 # FIXME(Ole): Write in C and reuse this function by similar code in interpolate.py
 def interpolate_linearly(x, xvec, yvec):
-         
-    # Find appropriate slot            
+
+    # Check bounds
+    if x < xvec[0]: 
+        msg = 'Value provided = %.2f, interpolation minimum = %.2f.' %(x, xvec[0])
+        raise Below_interval, msg
+        
+    if x > xvec[-1]: 
+        msg = 'Value provided = %.2f, interpolation maximum = %.2f.' %(x, xvec[-1])
+        raise Above_interval, msg        
+        
+        
+    # Find appropriate slot within bounds            
     i = 0
     while x > xvec[i]: i += 1
 
-    if i == 0: 
-        msg = 'Value provided = %.2f, interpolation minimum = %.2f.' %(x, xvec[0])
-        raise Below_interval, msg
-        
-    if i == len(xvec): 
-        msg = 'Value provided = %.2f, interpolation maximum = %.2f.' %(x, xvec[-1])
-        raise Above_interval, msg        
-        
     
     x0 = xvec[i-1]
@@ -305 +307 @@
                 stage = dq['stage'].get_values(location='centroids',
                                                indices=[self.enquiry_indices[i]])
-
-                    
+                
                 # Store current average stage and depth with each opening object
                 opening.depth = stage - opening.elevation
@@ -332 +333 @@
             else:
                 # Calculate discharge for one barrel and set inlet.rate and outlet.rate
+                
                 try:
                     Q = interpolate_linearly(delta_w, self.rating_curve[:,0], self.rating_curve[:,1]) 

anuga_core/source/anuga/culvert_flows/test_culvert_class.py

@@ -19 +19 @@
      
 from math import pi,pow,sqrt
-from Numeric import choose, greater, ones, sin, exp, cosh, allclose
+from Numeric import choose, greater, ones, sin, cos, exp, cosh, allclose
 
 
@@ -31 +31 @@
 
 
-    def test_that_culvert_runs(self):
-        """test_that_culvert_runs
-        
-        This test only exercises the culvert - there is no quantitative 
-        diagnostics yet
+    def test_that_culvert_runs_rating(self):
+        """test_that_culvert_runs_rating
+        
+        This test exercises the culvert and checks values outside rating curve
+        are dealt with       
         """
 
@@ -112 +112 @@
         Br = Reflective_boundary(domain)              # Solid reflective wall
         Bo = Dirichlet_boundary([-5, 0, 0])           # Outflow
-        Btus = Time_boundary(domain, lambda t: [0.0+ 1.25*(1+sin(2*pi*(t-4)/10)), 0.0, 0.0])
-        Btds = Time_boundary(domain, lambda t: [0.0+ 0.75*(1+sin(2*pi*(t-4)/20)), 0.0, 0.0])
+        
+        # Upstream and downstream conditions that will exceed the rating curve
+        # I.e produce delta_h outside the range [0, 10] specified in the the 
+        # file example_rating_curve.csv
+        Btus = Time_boundary(domain, lambda t: [100*sin(2*pi*(t-4)/10), 0.0, 0.0])
+        Btds = Time_boundary(domain, lambda t: [-5*(cos(2*pi*(t-4)/20)), 0.0, 0.0])
         domain.set_boundary({'left': Btus, 'right': Btds, 'top': Br, 'bottom': Br})
 
@@ -427 +431 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Culvert, 'test_predicted_flow')
+    #suite = unittest.makeSuite(Test_Culvert, 'test_that_culvert_runs_rating')
     suite = unittest.makeSuite(Test_Culvert, 'test')
     runner = unittest.TextTestRunner()