Changeset 7991

Timestamp:

Sep 2, 2010, 11:19:06 AM (14 years ago)

Author:

steve

Message:

Finally resolved conflicts between nariman and steve

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_culvert.py (modified) (1 diff)
• boyd_box_routine.py (modified) (2 diffs)
• culvert.py (modified) (2 diffs)
• culvert_routine.py (modified) (2 diffs)

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

@@ -20 +20 @@
                  manning,
                  enquiry_gap,
+                 use_velocity_head,
                  verbose=False):
 
-        culvert.Culvert.__init__(self, domain, end_points, width, height, apron, manning, enquiry_gap, verbose)
-        
+
+        culvert.Culvert.__init__(self,
+                                 domain,
+                                 end_points,
+                                 width,
+                                 height,
+                                 apron,
+                                 manning,
+                                 enquiry_gap,
+                                 use_velocity_head,
+                                 verbose)
+
+
         self.routine = boyd_box_routine.Boyd_box_routine(self)
 

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

@@ -87 +87 @@
             assert self.inflow.get_enquiry_specific_energy() >= 0.0, msg
 
+            if self.use_velocity_head :
+                driving_energy = self.inflow.get_enquiry_specific_energy()
+            else:
+                driving_energy = self.get_enquiry_height
+
             height = self.culvert_height
             width = self.culvert_width
             flow_width = self.culvert_width
 
-            Q_inlet_unsubmerged = 0.540*g**0.5*width*self.inflow.get_enquiry_specific_energy()**1.50 # Flow based on Inlet Ctrl Inlet Unsubmerged
-            Q_inlet_submerged = 0.702*g**0.5*width*height**0.89*self.inflow.get_enquiry_specific_energy()**0.61  # Flow based on Inlet Ctrl Inlet Submerged
+            Q_inlet_unsubmerged = 0.540*g**0.5*width*driving_energy**1.50 # Flow based on Inlet Ctrl Inlet Unsubmerged
+            Q_inlet_submerged = 0.702*g**0.5*width*height**0.89*driving_energy**0.61  # Flow based on Inlet Ctrl Inlet Submerged
 
             # FIXME(Ole): Are these functions really for inlet control?
@@ -122 +127 @@
                 case = 'INLET CTRL Culvert is open channel flow we will for now assume critical depth'
 
-            if self.delta_total_energy < self.inflow.get_enquiry_specific_energy():
+            if self.delta_total_energy < driving_energy:
                 # Calculate flows for outlet control
 

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

@@ -25 +25 @@
                  manning,
                  enquiry_gap,
+                 use_velocity_head,
                  verbose):
         
@@ -37 +38 @@
         
         self.enquiry_gap = enquiry_gap
+        self.use_velocity_head = use_velocity_head
         self.verbose=verbose
        

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

@@ -31 +31 @@
         self.manning = manning
         self.log_filename = None
+
+        self.use_velocity_head = True
+        
+
         
         self.determine_inflow()
@@ -50 +54 @@
         # Determine flow direction based on total energy difference
 
-        self.delta_total_energy = self.inlets[0].get_enquiry_total_energy() - self.inlets[1].get_enquiry_total_energy()
+        if self.use_velocity_head:
+            self.delta_total_energy = self.inlets[0].get_enquiry_total_energy() - self.inlets[1].get_enquiry_total_energy()
+        else:
+            self.delta_total_energy = self.inlets[0].get_enquiry_stage() - self.inlets[1].get_enquiry_stage()
+
 
         self.inflow  = self.inlets[0]