Changeset 5585

Timestamp:

Jul 30, 2008, 4:06:55 PM (16 years ago)

Author:

ole

Message:

Multibarrel culvert functionality.

Files:

• anuga_core/source/anuga/culvert_flows/culvert_class.py (modified) (6 diffs)
• anuga_core/source/anuga/culvert_flows/culvert_polygons.py (modified) (3 diffs)
• anuga_work/development/culvert_flow/culvert_boyd_channel.py (modified) (1 diff)

anuga_core/source/anuga/culvert_flows/culvert_class.py

@@ -4 +4 @@
 from anuga.utilities.polygon import inside_polygon
 from anuga.utilities.polygon import is_inside_polygon
+from anuga.utilities.polygon import plot_polygons
+
 
 
@@ -53 +55 @@
                  blockage_bottup=None,
                  culvert_routine=None,
+                 number_of_barrels=1,
                  verbose=False):
         
@@ -88 +91 @@
         assert self.culvert_type in ['circle', 'square', 'rectangle']
         
+        assert number_of_barrels >= 1
+        self.number_of_barrels = number_of_barrels
+        
+        
         # Set defaults
         if manning is None: manning = 0.012   # Set a Default Mannings Roughness for Pipe
@@ -118 +125 @@
                                     end_point1,
                                     width=width,   
-                                    height=height)
+                                    height=height,
+                                    number_of_barrels=number_of_barrels)
         
         if verbose is True:
@@ -128 +136 @@
             #               P['enquiry_polygon1']],
             #              figname='culvert_polygon_output')
+            #import sys; sys.exit()                           
 
 
@@ -362 +371 @@
         log_to_file(log_filename, s)
 
-        
+
+        # Calculate discharge for one barrel
         Q, barrel_velocity, culvert_outlet_depth = self.culvert_routine(self, inlet, outlet, delta_Et, g)
-        #####################################################
+        
+        # Adjust discharge for multiple barrels
+        Q *= self.number_of_barrels
+
+        # Compute barrel momentum
         barrel_momentum = barrel_velocity*culvert_outlet_depth
                 

anuga_core/source/anuga/culvert_flows/culvert_polygons.py

@@ -10 +10 @@
                             width, height=None,
                             enquiry_gap_factor=1.0,
-                            enquiry_shape_factor=2.0):
+                            enquiry_shape_factor=2.0,
+                            number_of_barrels=1):
     """Create polygons at the end of a culvert inlet and outlet.
     At either end two polygons will be created; one for the actual flow to pass through and one a little further away
@@ -26 +27 @@
                                (large value widens polygon but reduces height
                                to preserve same area as exchange polygon)
+        number_of_barrels - number of identical pipes.
         
     Output:
@@ -55 +57 @@
     length = sqrt(sum(vector**2))
 
+    # Adjust polygon width to number of barrels in this culvert
+    width *= number_of_barrels
+    
+    
     # Unit direction vector and normal 
     vector /= length

anuga_work/development/culvert_flow/culvert_boyd_channel.py

@@ -158 +158 @@
                        width=1.20,height=0.75,
                        culvert_routine=boyd_generalised_culvert_model,        
+                       number_of_barrels=2,
                        verbose=True)