Changeset 8876

Timestamp:

May 27, 2013, 7:38:13 PM (11 years ago)

Author:

steve

Message:

Sequential code to mimick get_enquiry code in parallel structure

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_operator.py (modified) (2 diffs)
• inlet_enquiry.py (modified) (2 diffs)
• structure_operator.py (modified) (1 diff)

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

@@ -103 +103 @@
             outlet_culvert_depth = 0.0
             self.case = "Culvert blocked"
+            self.inflow  = self.inlets[0]
+            self.outflow = self.inlets[1]
             return Q, barrel_velocity, outlet_culvert_depth
 
@@ -267 +269 @@
         #FIXME(Ole): What about inlet control?
 
-    culv_froude=math.sqrt(Q**2*flow_width/(anuga.g*flow_area**3))
+    if  flow_area <= 0.0 :
+        culv_froude = 0.0
+    else:
+        culv_froude=math.sqrt(Q**2*flow_width/(anuga.g*flow_area**3))
+        
     if local_debug:
         anuga.log.critical('FLOW AREA = %s' % str(flow_area))

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

@@ -102 +102 @@
 
             depth = self.get_enquiry_water_depth()
-            u = self.get_enquiry_xmom()/(depth + velocity_protection/depth)
-            v = self.get_enquiry_ymom()/(depth + velocity_protection/depth)
+            u = depth*self.get_enquiry_xmom()/(depth**2 + velocity_protection)
+            v = depth*self.get_enquiry_ymom()/(depth**2 + velocity_protection)
 
             return u, v
@@ -111 +111 @@
 
             depth = self.get_enquiry_water_depth()
-            return self.get_enquiry_xmom()/(depth + velocity_protection/depth)
+            return depth*self.get_enquiry_xmom()/(depth**2 + velocity_protection)
 
     def get_enquiry_yvelocity(self):
 
             depth = self.get_enquiry_water_depth()
-            return self.get_enquiry_ymom()/(depth + velocity_protection/depth)
+            return depth*self.get_enquiry_ymom()/(depth**2 + velocity_protection)
 
 

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

@@ -457 +457 @@
 
         return self.apron
+
+
+    def get_master_proc(self):
+
+        return 0
+
+
+
+    #--------------------------------------------------------
+    # Set of enquiry functions so that in the sequential and paralle case
+    # we can get equiry info fron the master Proc
+    #---------------------------------------------------------
+
+    def get_enquiry_stages(self):
+
+        enq0 = self.inlets[0].get_enquiry_stage()
+        enq1 = self.inlets[1].get_enquiry_stage()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_depths(self):
+
+        enq0 = self.inlets[0].get_enquiry_depth()
+        enq1 = self.inlets[1].get_enquiry_depth()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_positions(self):
+
+        enq0 = self.inlets[0].get_enquiry_position()
+        enq1 = self.inlets[1].get_enquiry_position()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_xmoms(self):
+
+        enq0 = self.inlets[0].get_enquiry_xmom()
+        enq1 = self.inlets[1].get_enquiry_xmom()
+
+        return [enq0, enq1]
+
+    def get_enquiry_ymoms(self):
+
+        enq0 = self.inlets[0].get_enquiry_ymom()
+        enq1 = self.inlets[1].get_enquiry_ymom()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_elevations(self):
+
+        enq0 = self.inlets[0].get_enquiry_elevation()
+        enq1 = self.inlets[1].get_enquiry_elevation()
+
+        return [enq0, enq1]
+
+
+
+    def get_enquiry_water_depths(self):
+
+        enq0 = self.inlets[0].get_enquiry_water_depth()
+        enq1 = self.inlets[1].get_enquiry_water_depth()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_invert_elevations(self):
+
+        enq0 = self.inlets[0].get_enquiry_invert_elevation()
+        enq1 = self.inlets[1].get_enquiry_invert_elevation()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_velocitys(self):
+
+        enq0 = self.inlets[0].get_enquiry_velocity()
+        enq1 = self.inlets[1].get_enquiry_velocity()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_xvelocitys(self):
+
+        enq0 = self.inlets[0].get_enquiry_xvelocity()
+        enq1 = self.inlets[1].get_enquiry_xvelocity()
+
+        return [enq0, enq1]
+
+    def get_enquiry_yvelocitys(self):
+
+        enq0 = self.inlets[0].get_enquiry_yvelocity()
+        enq1 = self.inlets[1].get_enquiry_yvelocity()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_speeds(self):
+
+        enq0 = self.inlets[0].get_enquiry_speed()
+        enq1 = self.inlets[1].get_enquiry_speed()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_velocity_heads(self):
+
+        enq0 = self.inlets[0].get_enquiry_velocity_head()
+        enq1 = self.inlets[1].get_enquiry_velocity_head()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_total_energys(self):
+
+        enq0 = self.inlets[0].get_enquiry_total_energy()
+        enq1 = self.inlets[1].get_enquiry_total_energy()
+
+        return [enq0, enq1]
+
+
+    def get_enquiry_specific_energys(self):
+
+        enq0 = self.inlets[0].get_enquiry_specific_energy()
+        enq1 = self.inlets[1].get_enquiry_specific_energy()
+
+        return [enq0, enq1]
+