Changeset 8027

Timestamp:

Sep 30, 2010, 10:01:46 AM (13 years ago)

Author:

habili

Message:

Added control case text to print_timestepping_statistics

Location:

trunk/anuga_core/source/anuga/structures

Files:

• boyd_box_operator.py (modified) (6 diffs)
• boyd_pipe_operator.py (modified) (6 diffs)
• structure_operator.py (modified) (1 diff)

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

@@ -73 +73 @@
         self.discharge = 0.0
         self.velocity = 0.0
+        
+        self.case = 'N/A'
 
     
@@ -117 +119 @@
                     perimeter= 2.0*dcrit+width
                 outlet_culvert_depth = dcrit
-                case = 'Inlet unsubmerged Box Acts as Weir'
+                self.case = 'Inlet unsubmerged Box Acts as Weir'
             else: # Inlet Submerged but check internal culvert flow depth
                 Q = Q_inlet_submerged
@@ -129 +131 @@
                     perimeter= 2.0*dcrit+width
                 outlet_culvert_depth = dcrit
-                case = 'Inlet submerged Box Acts as Orifice'
+                self.case = 'Inlet submerged Box Acts as Orifice'
 
             dcrit = (Q**2/anuga.g/width**2)**0.333333
@@ -138 +140 @@
                 flow_area = width*height  # Cross sectional area of flow in the culvert
                 perimeter = 2*(width+height)
-                case = 'Inlet CTRL Outlet unsubmerged PIPE PART FULL'
+                self.case = 'Inlet CTRL Outlet unsubmerged PIPE PART FULL'
             else:
                 flow_area = width * outlet_culvert_depth
                 perimeter = width+2*outlet_culvert_depth
-                case = 'INLET CTRL Culvert is open channel flow we will for now assume critical depth'
+                self.case = 'INLET CTRL Culvert is open channel flow we will for now assume critical depth'
             # Initial Estimate of Flow for Outlet Control using energy slope 
             #( may need to include Culvert Bed Slope Comparison)
@@ -158 +160 @@
                     flow_area=width*height       # Cross sectional area of flow in the culvert
                     perimeter=2.0*(width+height)
-                    case = 'Outlet submerged'
+                    self.case = 'Outlet submerged'
                 else:   # Here really should use the Culvert Slope to calculate Actual Culvert Depth & Velocity
                     dcrit = (Q**2/anuga.g/width**2)**0.333333
@@ -166 +168 @@
                         flow_area=width*height
                         perimeter=2.0*(width+height)
-                        case = 'Outlet is Flowing Full'
+                        self.case = 'Outlet is Flowing Full'
                     else:
                         flow_area=width*outlet_culvert_depth
                         perimeter=(width+2.0*outlet_culvert_depth)
-                        case = 'Outlet is open channel flow'
+                        self.case = 'Outlet is open channel flow'
 
                 hyd_rad = flow_area/perimeter

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

@@ -71 +71 @@
         self.velocity = 0.0
         
+        self.case = 'N/A'
+        
     
     def discharge_routine(self):
@@ -140 +142 @@
                 perimeter = diameter * math.pi
                 flow_width= diameter
-                case = 'Inlet CTRL Outlet submerged Circular PIPE FULL'
+                self.case = 'Inlet CTRL Outlet submerged Circular PIPE FULL'
                 if local_debug == 'true':
                     anuga.log.critical('Inlet CTRL Outlet submerged Circular '
@@ -151 +153 @@
                 flow_width= diameter*math.sin(alpha/2.0)
                 perimeter = alpha*diameter/2.0
-                case = 'INLET CTRL Culvert is open channel flow we will for now assume critical depth'
+                self.case = 'INLET CTRL Culvert is open channel flow we will for now assume critical depth'
                 if local_debug =='true':
                     anuga.log.critical('INLET CTRL Culvert is open channel flow '
@@ -167 +169 @@
                     perimeter = diameter * math.pi
                     flow_width= diameter
-                    case = 'Outlet submerged'
+                    self.case = 'Outlet submerged'
                     if local_debug =='true':
                         anuga.log.critical('Outlet submerged')
@@ -183 +185 @@
                         perimeter = diameter * math.pi
                         flow_width= diameter
-                        case = 'Outlet unsubmerged PIPE FULL'
+                        self.case = 'Outlet unsubmerged PIPE FULL'
                         if local_debug =='true':
                             anuga.log.critical('Outlet unsubmerged PIPE FULL')
@@ -191 +193 @@
                         flow_width= diameter*math.sin(alpha/2.0)
                         perimeter = alpha*diameter/2.0
-                        case = 'Outlet is open channel flow we will for now assume critical depth'
+                        self.case = 'Outlet is open channel flow we will for now assume critical depth'
                         if local_debug == 'true':
                             anuga.log.critical('Q Outlet Depth and ALPHA = %s, %s, %s'

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

@@ -307 +307 @@
         message += 'Inlet Driving Energy %.2f\n' % self.driving_energy
         message += 'Delta Total Energy %.2f\n' % self.delta_total_energy
+        message += 'Control at this instant: %s\n' % self.case
 
         print message