Changeset 7998

Timestamp:

Sep 3, 2010, 12:20:38 PM (14 years ago)

Author:

habili

Message:

deal with boyd pipes

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_pipe_operator.py (added)
• structure_operator.py (modified) (1 diff)
• test_Outlet_Ctrl.py (modified) (3 diffs)

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

@@ -199 +199 @@
         
         
+    def get_culvert_diameter(self):
+    
+            return self.width
+        
+        
     def get_culvert_height(self):
     

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

@@ -25 +25 @@
 
 #from anuga.culvert_flows.culvert_class import Culvert_flow
-from anuga.structures.boyd_box_operator import Boyd_box_operator
+from anuga.structures.boyd_pipe_operator import Boyd_pipe_operator
 #from anuga.culvert_flows.culvert_routines import weir_orifice_channel_culvert_model
 from math import pi,pow,sqrt
@@ -165 +165 @@
     ep0 = [40.0, y]
     ep1 = [50.0, y]
-    losses = {'inlet':1, 'outlet':1, 'bend':1, 'grate':1, 'pier': 1, 'other': 1}
-    culverts.append(Boyd_box_operator(domain,
+    losses = {'inlet':0.5, 'outlet':1, 'bend':0, 'grate':0, 'pier': 0, 'other': 0}
+    culverts.append(Boyd_pipe_operator(domain,
                             end_point0=ep0,
                             end_point1=ep1,
-                            losses,
-                            width=3.658, #culvert_width, #3.658,
-                            height=3.658,
+                            losses=losses,
+                            diameter=1.5, #culvert_width, #3.658,
                             apron=6.0,
                             use_momentum_jet=True,
@@ -178 +177 @@
                             verbose=False))
 
-
-
-losses = {'inlet':1, 'outlet':1, 'bend':1, 'grate':1, 'pier': 1, 'other': 1}
-culvert2 = Culvert_operator(domain,
-                            end_point0=[40.0, 62.5],
-                            end_point1=[50.0, 62.5],
-                            losses,
-                            width=25.0,
-                            height=10.0,
-                            apron=5.0,
-                            manning=0.013,
-                            verbose=False)
+                       
+
+#losses = {'inlet':1, 'outlet':1, 'bend':1, 'grate':1, 'pier': 1, 'other': 1}
+#culvert2 = Culvert_operator(domain,
+                            #end_point0=[40.0, 62.5],
+                            #end_point1=[50.0, 62.5],
+                            #losses,
+                            #width=25.0,
+                            #height=10.0,
+                            #apron=5.0,
+                            #manning=0.013,
+                            #verbose=False)