Changeset 8097

Timestamp:

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

Author:

habili

Message:

Updating of code and test case

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_pipe_operator.py (modified) (3 diffs)
• testing_culvert.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':

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

@@ -41 +41 @@
                                                len2=width)
 domain = anuga.Domain(points, vertices, boundary)   
+domain.set_starttime(10)
 domain.set_name('Test_culvert')                 # Output name
 domain.set_default_order(2)
@@ -88 +89 @@
 filename=os.path.join(path, 'example_rating_curve.csv')
 
-
+end_point0 = num.array([9.0, 2.5])
+end_point1 = num.array([13.0, 2.5])
 
 Boyd_pipe_operator(domain,
-                            end_point0=[9.0, 2.5],
-                            end_point1=[13.0, 2.5],
-                            losses=1.5,
-                            diameter=1.5,
-                            apron=5.0,
-                            use_momentum_jet=True,
-                            use_velocity_head=False,
-                            manning=0.013,
-                            verbose=False)
+                    #end_point0=[9.0, 2.5],
+                    #end_point1=[13.0, 2.5],
+                    #exchange_line0=[[9.0, 1.75],[9.0, 3.25]],
+                    #exchange_line1=[[13.0, 1.75],[13.0, 3.25]],
+                    losses=1.5,
+                    end_points=[end_point0, end_point1],
+                    diameter=1.5,
+                    apron=0.5,
+                    use_momentum_jet=True, 
+                    use_velocity_head=False,
+                    manning=0.013,
+                    verbose=False)
 
 
@@ -135 +140 @@
 #min_delta_w = sys.maxint 
 #max_delta_w = -min_delta_w
-for t in domain.evolve(yieldstep = 1.0, finaltime = 200):
+for t in domain.evolve(yieldstep=1.0, finaltime=50.0):
     domain.write_time()
 
-    #if domain.get_time() > 150.5 and domain.get_time() < 151.5 :
+    #if domain.get_time() > 150.5 and domain.ge t_time() < 151.5 :
         #Bi = anuga.Dirichlet_boundary([0.0, 0.0, 0.0])
         #domain.set_boundary({'left': Bi, 'right': Br, 'top': Br, 'bottom': Br})