Changeset 8035

Timestamp:

Oct 14, 2010, 5:39:04 PM (13 years ago)

Author:

habili

Message:

Started a unit test for the boyd box operator

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_operator.py (modified) (2 diffs)
• structure_operator.py (modified) (3 diffs)
• test_boyd_box_operator.py (added)

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

@@ -24 +24 @@
                  apron=None,
                  manning=0.013,
-                 enquiry_gap=0.2,
+                 enquiry_gap=0.0,
                  use_momentum_jet=True,
                  use_velocity_head=True,
@@ -184 +184 @@
                 Q = min(Q, Q_outlet_tailwater)
             else:
+                
                 pass
                 #FIXME(Ole): What about inlet control?

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

@@ -102 +102 @@
         timestep = self.domain.get_timestep()
         
-        self.__determine_inflow_outflow()
+        self.determine_inflow_outflow()
         
         Q, barrel_speed, outlet_depth = self.discharge_routine()
@@ -175 +175 @@
 
 
-    def __determine_inflow_outflow(self):
+    def determine_inflow_outflow(self):
         # Determine flow direction based on total energy difference
 
@@ -221 +221 @@
                              # direction of the culvert
 
-        gap = (1 + self.enquiry_gap)*h
+        gap = 1.5*h + self.enquiry_gap
 
         self.inlet_polygons = []