Changeset 8097 for trunk/anuga_core/source/anuga/structures/boyd_pipe_operator.py

Timestamp:

Dec 8, 2010, 1:54:41 PM (13 years ago)

Author:

habili

Message:

Updating of code and test case

File:

• trunk/anuga_core/source/anuga/structures/boyd_pipe_operator.py (modified) (3 diffs)

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

@@ -38 +38 @@
                                           enquiry_points,
                                           width=diameter,
-                                          depth=None,
+                                          height=None,
                                           apron=apron,
                                           manning=manning,
@@ -73 +73 @@
         self.case = 'N/A'
         
-
-    def __determine_inflow_outflow(self):
-        # Determine flow direction based on total energy difference
-
+    def discharge_routine(self):
+
+        #self.__determine_inflow_outflow()
+
+        local_debug ='false'
+        
         if self.use_velocity_head:
             self.delta_total_energy = self.inlets[0].get_enquiry_total_energy() - self.inlets[1].get_enquiry_total_energy()
@@ -90 +92 @@
             self.delta_total_energy = -self.delta_total_energy
 
-    def discharge_routine(self):
-
-        self.__determine_inflow_outflow()
-
-        local_debug ='false'
-        
-        #import pdb
-        #pdb.set_trace()
-        
         if self.inflow.get_enquiry_depth() > 0.01: #this value was 0.01: Remember this needs to be compared to the Invert Lvl
             if local_debug =='true':