Changeset 7984 for trunk/anuga_core/source/anuga/structures/culvert_operator.py

Timestamp:

Sep 1, 2010, 6:11:25 PM (13 years ago)

Author:

steve

Message:

Added enquiry points to culverts

File:

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

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

@@ -22 +22 @@
                  width,
                  height=None,
+                 apron=None,
+                 enquiry_gap=0.2,
                  verbose=False):
         
         self.domain = domain
         self.domain.set_fractional_step_operator(self)
-        end_points = [end_point0, end_point1]
+        self.end_points = [end_point0, end_point1]
         
         if height is None:
             height = width
 
-        self.width = width
+        if apron is None:
+            apron = width
+
+        self.width  = width
         self.height = height
+        self.apron  = apron
+        self.enquiry_gap = enquiry_gap
+        self.verbose = verbose
        
-        self.culvert = Boyd_box_culvert(self.domain, end_points, self.width, self.height)
-        print self.culvert
+        self.culvert = Boyd_box_culvert(self.domain,
+                                        self.end_points,
+                                        self.width,
+                                        self.height,
+                                        self.apron,
+                                        self.enquiry_gap,
+                                        self.verbose)
+        
         self.routine = self.culvert.routine
-        print self.routine
-        self.inlets = self.culvert.get_inlets()
-   
-        self.print_stats()
+
+        self.inlets  = self.culvert.get_inlets()
+
+        if self.verbose:
+            self.print_stats()
 
 
@@ -48 +63 @@
         
         Q, barrel_speed, outlet_depth = self.routine()
+
 
         inflow  = self.routine.get_inflow()
@@ -54 +70 @@
 
         old_inflow_height = inflow.get_average_height()
-                old_inflow_xmom = inflow.get_average_xmom()
-                old_inflow_ymom = inflow.get_average_ymom()
-                
-                if old_inflow_height > 0.0 :
-                        Qstar = Q/old_inflow_height/inflow.get_area()
-                else:
-                        Qstar = 0.0
-
-                factor = 1.0/(1.0 + Qstar*timestep)
-
-                
-                
-                new_inflow_height = old_inflow_height*factor
-                new_inflow_xmom = old_inflow_xmom*factor
-                new_inflow_ymom = old_inflow_ymom*factor
+        old_inflow_xmom = inflow.get_average_xmom()
+        old_inflow_ymom = inflow.get_average_ymom()
+                
+        if old_inflow_height > 0.0 :
+            Qstar = Q/old_inflow_height
+        else:
+            Qstar = 0.0
+
+        factor = 1.0/(1.0 + Qstar*timestep/inflow.get_area())
+
+                
+                
+        new_inflow_height = old_inflow_height*factor
+        new_inflow_xmom = old_inflow_xmom*factor
+        new_inflow_ymom = old_inflow_ymom*factor
                 
 
         inflow.set_heights(new_inflow_height)
+
+        #inflow.set_xmoms(Q/inflow.get_area())
+        #inflow.set_ymoms(0.0)
+
+
         inflow.set_xmoms(new_inflow_xmom)
         inflow.set_ymoms(new_inflow_ymom)
 
-                
-                # set outflow
-                if old_inflow_height > 0.0 :
-                        timestep_star = timestep*new_inflow_height/old_inflow_height
-                else:
-                        timestep_star = 0.0
-                
-                print Q, barrel_speed, outlet_depth, Qstar, factor, timestep_star
-                
+
+        loss = (old_inflow_height - new_inflow_height)*inflow.get_area()
+
+                
+        # set outflow
+        if old_inflow_height > 0.0 :
+            timestep_star = timestep*new_inflow_height/old_inflow_height
+        else:
+            timestep_star = 0.0
+
                 
         outflow_extra_height = Q*timestep_star/outflow.get_area()
@@ -90 +112 @@
                 
 
-        outflow.set_heights(outflow.get_average_height() + outflow_extra_height)
-        outflow.set_xmoms(outflow.get_average_xmom() + outflow_extra_momentum[0] )
-        outflow.set_ymoms(outflow.get_average_ymom() + outflow_extra_momentum[1] )
+        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()
 
     def print_stats(self):
@@ -99 +137 @@
         print 'Generic Culvert Operator'
         print '====================================='
+
+        print 'Culvert'
+        print self.culvert
+
+        print 'Culvert Routine'
+        print self.routine
         
         for i, inlet in enumerate(self.inlets):