Changeset 8021

Timestamp:

Sep 17, 2010, 3:07:01 PM (14 years ago)

Author:

steve

Message:

Updating logging and printing stats

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/generic_domain.py (modified) (1 diff)
• structures/structure_operator.py (modified) (3 diffs)
• structures/test_Outlet_Ctrl.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -1874 +1874 @@
     ##
     # @brief print_timestepping_statistics.
-    # Goes through all fractional step operators and logs timestepping statistics
+    # Goes through all fractional step operators and prints timestepping statistics
     def print_operator_timestepping_statistics(self):
         for operator in self.fractional_step_operators:
             operator.print_timestepping_statistics()
+
+    ##
+    # @brief print_operator_statistics.
+    # Goes through all fractional step operators and prints operator statistics
+    def print_operator_statistics(self):
+        for operator in self.fractional_step_operators:
+            operator.print_statistics()
 
 

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

@@ -255 +255 @@
             
 
-    def structure_statistics(self):
+    def statistics(self):
 
 
@@ -289 +289 @@
 
 
-    def print_structure_statistics(self):
-
-        print self.structure_statistics()
+    def print_statistics(self):
+
+        print self.statistics()
 
 
@@ -315 +315 @@
         if self.logging:
             self.log_filename = self.label + '.log'
-            log_to_file(self.log_filename, self.structure_statistics(), mode='w')
+            log_to_file(self.log_filename, self.statistics(), mode='w')
             log_to_file(self.log_filename, 'time,discharge,velocity,driving_energy,delta_total_energy')
 

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

@@ -181 +181 @@
 
 
-#    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_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,