Changeset 8861

Timestamp:

May 9, 2013, 12:34:07 PM (12 years ago)

Author:

steve

Message:

Will take 0.0 as a height

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_operator.py (modified) (1 diff)
• run_gate_operator.py (modified) (3 diffs)
• structure_operator.py (modified) (1 diff)

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

@@ -93 +93 @@
         local_debug = False
 
+        if self.culvert_height <= 0.0:
+            Q = 0.0
+            barrel_velocity = 0.0
+            outlet_culvert_depth = 0.0
+            self.case = "Culvert blocked"
+            return Q, barrel_velocity, outlet_culvert_depth
+
+
+
         if self.use_velocity_head:
             self.delta_total_energy = \

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

@@ -93 +93 @@
                             losses=1.5,
                             width=1.5,
+                            height = 10.0,
                             apron=5.0,
                             use_momentum_jet=True,
@@ -98 +99 @@
                             manning=0.013,
                             verbose=False)
-
-
-gate.set_culvert_height(10.0)
 
 line = [[0.0, 5.0], [0.0, 10.0]]
@@ -128 +126 @@
     domain.write_time()
 
+    if num.allclose(t, 10.0):
+        gate.set_culvert_height(0.0)
 
-    if num.allclose(t, 10.0):
-        gate.set_culvert_height(0.000001)
+    Q, velocity, depth = gate.discharge_routine()
 
     print gate.inlets[0].get_enquiry_stage()
     print gate.inlets[1].get_enquiry_stage()
+    print gate.get_culvert_height()
 
-    Q, velocity, depth = gate.discharge_routine()
-
-    print gate.culvert_height
     print Q
     print velocity
     print depth
         
-
-    #if domain.get_time() > 150.5 and domain.get_time() < 151.5 :
-        #Bi = anuga.Dirichlet_boundary([0.0, 0.0, 0.0])
-        #domain.set_boundary({'left': Bi, 'right': Br, 'top': Br, 'bottom': Br})
-
-    #delta_w = culvert.inlet.stage - culvert.outlet.stage
+    gate.print_timestepping_statistics()
     
-    #if delta_w > max_delta_w: max_delta_w = delta_w
-    #if delta_w < min_delta_w: min_delta_w = delta_w
-
-    #print domain.volumetric_balance_statistics()
-    
-    pass
-
-## Check that extreme values in rating curve have been exceeded
-## so that we know that condition has been exercised
-#assert min_delta_w < 0
-#assert max_delta_w > 10        
 
 
-#os.remove('Test_culvert.sww')
+
+

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

@@ -193 +193 @@
             #new_outflow_xmom = outflow.get_average_xmom() + outflow_extra_momentum[0]
             #new_outflow_ymom = outflow.get_average_ymom() + outflow_extra_momentum[1]
-
             new_outflow_xmom = barrel_speed*new_outflow_depth*outflow_direction[0]
             new_outflow_ymom = barrel_speed*new_outflow_depth*outflow_direction[1]