Changeset 7989 for trunk/anuga_core/source/anuga

Timestamp:

Sep 2, 2010, 11:12:53 AM (14 years ago)

Author:

steve

Message:

Hopefully merged Narimans mannings and Steve velocity and momentum switches

File:

• trunk/anuga_core/source/anuga/structures/culvert_operator.py (modified) (4 diffs)

trunk/anuga_core/source/anuga/structures/culvert_operator.py

@@ -25 +25 @@
                  manning=0.013,
                  enquiry_gap=0.2,
+                 use_momentum_jet=True,
+                 use_velocity_head=True,
                  verbose=False):
         
@@ -43 +45 @@
         self.enquiry_gap = enquiry_gap
         self.verbose = verbose
+
+        self.use_momentum_jet = use_momentum_jet
+        self.use_velocity_head= use_velocity_head
        
         self.culvert = Boyd_box_culvert(self.domain,
@@ -51 +56 @@
                                         self.manning,
                                         self.enquiry_gap,
+                                        self.use_velocity_head,
                                         self.verbose)
         
@@ -110 +116 @@
 
             
-            outflow_extra_height = Q*timestep_star/outflow.get_area()
-            outflow_direction = - outflow.outward_culvert_vector
-            outflow_extra_momentum = outflow_extra_height*barrel_speed*outflow_direction
-            
-
-            gain = outflow_extra_height*outflow.get_area()
-            
-            #print Q, Q*timestep, barrel_speed, outlet_depth, Qstar, factor, timestep_star
-            #print '  ', loss, gain
-
-
-            new_outflow_height = outflow.get_average_height() + outflow_extra_height
-            new_outflow_xmom = outflow.get_average_xmom() + outflow_extra_momentum[0]
-            new_outflow_ymom = outflow.get_average_ymom() + outflow_extra_momentum[1]
-
-            outflow.set_heights(new_outflow_height)
-
-            outflow.set_xmoms(barrel_speed*new_outflow_height*outflow_direction[0])
-            outflow.set_ymoms(barrel_speed*new_outflow_height*outflow_direction[1])
-
-            #outflow.set_xmoms(new_outflow_xmom)
-            #outflow.set_ymoms(new_outflow_ymom)
-            
-            #print '   outflow volume ',outflow.get_total_water_volume()
+        outflow_extra_height = Q*timestep_star/outflow.get_area()
+        outflow_direction = - outflow.outward_culvert_vector
+        outflow_extra_momentum = outflow_extra_height*barrel_speed*outflow_direction
+            
+
+        gain = outflow_extra_height*outflow.get_area()
+            
+        #print Q, Q*timestep, barrel_speed, outlet_depth, Qstar, factor, timestep_star
+        #print '  ', loss, gain
+
+
+
+        new_outflow_height = outflow.get_average_height() + outflow_extra_height
+
+
+        if self.use_momentum_jet :
+            # FIXME (SR) Review momentum to account for possible hydraulic jumps at outlet
+            #new_outflow_xmom = outflow.get_average_xmom() + outflow_extra_momentum[0]
+            #new_outflow_ymom = outflow.get_average_ymom() + outflow_extra_momentum[1]
+
+            new_outflow_xmom = barrel_speed*new_outflow_height*outflow_direction[0]
+            new_outflow_ymom = barrel_speed*new_outflow_height*outflow_direction[1]
+
+        else:
+            #new_outflow_xmom = outflow.get_average_xmom()
+            #new_outflow_ymom = outflow.get_average_ymom()
+
+            new_outflow_xmom = 0.0
+            new_outflow_ymom = 0.0
+
+
+        outflow.set_heights(new_outflow_height)
+        outflow.set_xmoms(new_outflow_xmom)
+        outflow.set_ymoms(new_outflow_ymom)
+
+
+            
+        #print '   outflow volume ',outflow.get_total_water_volume()
 
     def print_stats(self):