]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
more TimerOutput changes
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 20 Mar 2013 15:22:34 +0000 (15:22 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 20 Mar 2013 15:22:34 +0000 (15:22 +0000)
git-svn-id: https://svn.dealii.org/trunk@28957 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/news/changes.h
deal.II/include/deal.II/base/timer.h
deal.II/source/base/timer.cc

index d5d9d8d10d2bc532a509676c23596dd8a2e49302..120da077a68b4398f31a75a0d30544b6abd1b862 100644 (file)
@@ -69,7 +69,9 @@ this function.
 
 <ol>
 
-<li> Added TimerOutput::reset to remove the collected information so far.
+<li> Added TimerOutput::reset to remove the collected information so far and
+added a new frequency TimerOutput::never to only output information if
+triggered by print_summary().
 <br>
 (Timo Heister, 2013/03/20)
 
index 5d1cdfc1b354c10b823e08af65171bd6e90a752a..9450b20a6d9c1cdf658d9247fd2cf75561ed0f29 100644 (file)
@@ -323,9 +323,9 @@ public:
   /**
    * Sets whether to generate output every
    * time we exit a section, just in the
-   * end, or both.
+   * end, both, or never.
    */
-  enum OutputFrequency {every_call, summary, every_call_and_summary}
+  enum OutputFrequency {every_call, summary, every_call_and_summary, never}
   output_frequency;
 
   /**
index c6d905beae00ccc66c6f151713c4e6f124994675..fa306f48a8d507cc130b5203e61a69554f8f1e2c 100644 (file)
@@ -328,7 +328,8 @@ TimerOutput::~TimerOutput()
   while (active_sections.size() > 0)
     leave_subsection();
 
-  if (output_frequency != every_call && output_is_enabled == true)
+  if ( (output_frequency == summary || output_frequency == every_call_and_summary)
+      && output_is_enabled == true)
     print_summary();
 }
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.