Changeset 6103 for anuga_core/source/anuga/culvert_flows/culvert_class.py

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.

File:

• anuga_core/source/anuga/culvert_flows/culvert_class.py (modified) (3 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])