Changeset 8020

Timestamp:

Sep 16, 2010, 5:06:07 PM (14 years ago)

Author:

steve

Message:

Fixed bug with log_to_file on boyd_box_operator

Location:

trunk/anuga_core/source/anuga/structures

Files:

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

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

@@ -87 +87 @@
             # Water has risen above inlet
 
-            if self.log_filename is not None:
-                s = 'Specific energy  = %f m' % self.inflow.get_enquiry_specific_energy()
-                log_to_file(self.log_filename, s)
 
             msg = 'Specific energy at inlet is negative'
@@ -177 +174 @@
                 hyd_rad = flow_area/perimeter
 
-                if self.log_filename is not None:
-                    s = 'hydraulic radius at outlet = %f' % hyd_rad
-                    log_to_file(self.log_filename, s)
+
 
                 # Final Outlet control velocity using tail water
@@ -185 +180 @@
                 Q_outlet_tailwater = flow_area * culvert_velocity
 
-                if self.log_filename is not None:
-                    s = 'Q_outlet_tailwater = %.6f' % Q_outlet_tailwater
-                    log_to_file(self.log_filename, s)
                 Q = min(Q, Q_outlet_tailwater)
             else:

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

@@ -303 +303 @@
         message += 'Velocity  [m/s]: %.2f\n' % self.velocity
         message += 'Inlet Driving Energy %.2f\n' % self.driving_energy
-        message += 'delta total energy %.2f\n' % self.delta_total_energy
+        message += 'Delta Total Energy %.2f\n' % self.delta_total_energy
 
         print message

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

@@ -26 +26 @@
 #from anuga.culvert_flows.culvert_class import Culvert_flow
 from anuga.structures.boyd_pipe_operator import Boyd_pipe_operator
+from anuga.structures.boyd_box_operator import Boyd_box_operator
 #from anuga.culvert_flows.culvert_routines import weir_orifice_channel_culvert_model
 from math import pi,pow,sqrt
@@ -140 +141 @@
 # Setup CULVERT INLETS and OUTLETS in Current Topography
 #------------------------------------------------------------------------------
-print 'DEFINING any Structures if Required'
+print 'Defining Structures'
 
 #  DEFINE CULVERT INLET AND OUTLETS
@@ -166 +167 @@
     ep1 = [50.0, y]
     losses = {'inlet':0.5, 'outlet':1, 'bend':0, 'grate':0, 'pier': 0, 'other': 0}
-    culverts.append(Boyd_pipe_operator(domain,
+#    culverts.append(Boyd_pipe_operator(domain,
+#                            end_point0=ep0,
+#                            end_point1=ep1,
+#                            losses=losses,
+#                            diameter=1.5, #culvert_width, #3.658,
+#                            apron=6.0,
+#                            use_momentum_jet=True,
+#                            use_velocity_head=True,
+#                            manning=0.013,
+#                            logging=True,
+#                            label='culvert',
+#                            verbose=False))
+
+
+#    Boyd_pipe_operator(domain,
+#                            end_point0=ep0,
+#                            end_point1=ep1,
+#                            losses=losses,
+#                            diameter=1.5, #culvert_width, #3.658,
+#                            apron=6.0,
+#                            use_momentum_jet=True,
+#                            use_velocity_head=True,
+#                            manning=0.013,
+#                            logging=True,
+#                            label='pipe_culvert',
+#                            verbose=False)
+
+    Boyd_box_operator(domain,
                             end_point0=ep0,
                             end_point1=ep1,
                             losses=losses,
-                            diameter=1.5, #culvert_width, #3.658,
+                            width=culvert_width,
+                            height=10.0,
                             apron=6.0,
                             use_momentum_jet=True,
@@ -176 +205 @@
                             manning=0.013,
                             logging=True,
-                            verbose=False))
+                            label='box_culvert',
+                            verbose=False)