Changeset 6689 for branches/numpy/anuga/culvert_flows/culvert_routines.py

Timestamp:

Apr 1, 2009, 3:19:07 PM (16 years ago)

Author:

rwilson

Message:

Back-merge from Numeric trunk to numpy branch.

File:

• branches/numpy/anuga/culvert_flows/culvert_routines.py (modified) (5 diffs)

branches/numpy/anuga/culvert_flows/culvert_routines.py

@@ -28 +28 @@
                                    manning=0.0,
                                    sum_loss=0.0,
+                                   max_velocity=10.0,
                                    log_filename=None):
 
@@ -47 +48 @@
 
 
-    if inlet_depth > 0.01:
+    if inlet_depth > 0.1: #this value was 0.01:
         # Water has risen above inlet
         
@@ -116 +117 @@
 
                 # Outlet control velocity using tail water
-                culvert_velocity = sqrt(delta_total_energy/((sum_loss/2*g)+(manning**2*culvert_length)/hyd_rad**1.33333)) 
+                culvert_velocity = sqrt(delta_total_energy/((sum_loss/2/g)+(manning**2*culvert_length)/hyd_rad**1.33333)) 
                 Q_outlet_tailwater = flow_area * culvert_velocity
                 
@@ -183 +184 @@
 
                 # Outlet control velocity using tail water
-                culvert_velocity = sqrt(delta_total_energy/((sum_loss/2*g)+(manning**2*culvert_length)/hyd_rad**1.33333)) 
+                culvert_velocity = sqrt(delta_total_energy/((sum_loss/2/g)+(manning**2*culvert_length)/hyd_rad**1.33333)) 
                 Q_outlet_tailwater = flow_area * culvert_velocity
 
@@ -216 +217 @@
     else: # inlet_depth < 0.01:
         Q = barrel_velocity = outlet_culvert_depth = 0.0
+    # Temporary flow limit
+    if barrel_velocity > max_velocity:
+        if log_filename is not None:                            
+            s = 'Barrel velocity was reduced from = %f m/s to %f m/s' % (barrel_velocity, max_velocity)
+            log_to_file(log_filename, s)
+        
+        barrel_velocity = max_velocity
+        Q = flow_area * barrel_velocity
+        
+        
+
         
     return Q, barrel_velocity, outlet_culvert_depth