Changeset 5421 for anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

Timestamp:

Jun 24, 2008, 3:23:41 PM (15 years ago)

Author:

ole

Message:

Changed timestepping_statistics to output real time seconds as well
Also comments and formatting

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py (modified) (4 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -32 +32 @@
 
 import types
+from time import time as walltime
 
 
@@ -192 +193 @@
         # FIXME: Maybe have separate orders for h-limiter and w-limiter?
         # Or maybe get rid of order altogether and use beta_w and beta_h
+        # FIXME (Ole): In any case, this should appear in the config file - not here
         self.set_default_order(1)
 
@@ -213 +215 @@
         self.flux_timestep = 0.0
 
+        self.last_walltime = walltime()
+        
         # Monitoring
         self.quantities_to_be_monitored = None
@@ -671 +675 @@
 
         msg = ''
+        #if self.min_timestep == self.max_timestep:
+        #    msg += 'Time = %.4f, delta t = %.8f, steps=%d (%d)'\
+        #           %(self.time, self.min_timestep, self.number_of_steps,
+        #             self.number_of_first_order_steps)
+        #elif self.min_timestep > self.max_timestep:
+        #    msg += 'Time = %.4f, steps=%d (%d)'\
+        #           %(self.time, self.number_of_steps,
+        #             self.number_of_first_order_steps)
+        #else:
+        #    msg += 'Time = %.4f, delta t in [%.8f, %.8f], steps=%d (%d)'\
+        #           %(self.time, self.min_timestep,
+        #             self.max_timestep, self.number_of_steps,
+        #             self.number_of_first_order_steps)
+                     
+                     
         if self.min_timestep == self.max_timestep:
-            msg += 'Time = %.4f, delta t = %.8f, steps=%d (%d)'\
-                   %(self.time, self.min_timestep, self.number_of_steps,
-                     self.number_of_first_order_steps)
+            msg += 'Time = %.4f, delta t = %.8f, steps=%d'\
+                   %(self.time, self.min_timestep, self.number_of_steps)
         elif self.min_timestep > self.max_timestep:
-            msg += 'Time = %.4f, steps=%d (%d)'\
-                   %(self.time, self.number_of_steps,
-                     self.number_of_first_order_steps)
+            msg += 'Time = %.4f, steps=%d'\
+                   %(self.time, self.number_of_steps)
         else:
-            msg += 'Time = %.4f, delta t in [%.8f, %.8f], steps=%d (%d)'\
+            msg += 'Time = %.4f, delta t in [%.8f, %.8f], steps=%d'\
                    %(self.time, self.min_timestep,
-                     self.max_timestep, self.number_of_steps,
-                     self.number_of_first_order_steps)
-
+                     self.max_timestep, self.number_of_steps)
+                                          
+        msg += ' (%ds)' %(walltime() - self.last_walltime)    
+        self.last_walltime = walltime()            
+        
         if track_speeds is True:
             msg += '\n'