remove code from TimerOutput that messes with the total time

git-svn-id: https://svn.dealii.org/trunk@29077 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index 72a1f90da480d1c948978de58fe68803aa04036e..3bb7acff64ea3afa4c7b8d2cffe274eccaa3b1e3 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -80,6 +80,12 @@ this function.
 
 <ol>
 
+<li> Changed: TimerOutput no longer assumes that sections are not nested
+when outputting percentage and total run time.
+<br>
+(Timo Heister, 2013/3/28)
+</li>
+
 <li> New: MPI_InitFinalize can also initialize PETSc/Slepc when
 not compiling with MPI. This is now the preferred way to initialize
 MPI/PETSc/Slepc in all cases.

diff --git a/deal.II/source/base/timer.cc b/deal.II/source/base/timer.cc
index a57f11d47c7d7916056d645267082a72393f173c..a1be012b22d94cfd282bf3efd4fbe87b2d03d5ac 100644 (file)
--- a/deal.II/source/base/timer.cc
+++ b/deal.II/source/base/timer.cc
@@ -524,19 +524,6 @@ TimerOutput::print_summary () const
     {
       double total_wall_time = timer_all.wall_time();
 
-      // check that the sum of all times is
-      // less or equal than the total
-      // time. otherwise, we might have
-      // generated a lot of overhead in this
-      // function.
-      double check_time = 0.;
-      for (std::map<std::string, Section>::const_iterator
-           i = sections.begin(); i!=sections.end(); ++i)
-        check_time += i->second.total_wall_time;
-
-      if (check_time > total_wall_time)
-        total_wall_time = check_time;
-
       // now generate a nice table
       out_stream << "\n\n"
                  << "+---------------------------------------------+------------"
@@ -581,12 +568,6 @@ TimerOutput::print_summary () const
                  << "+---------------------------------+-----------+"
                  << "------------+------------+\n"
                  << std::endl;
-
-      if (check_time > total_wall_time)
-        out_stream << std::endl
-                   << "Note: The sum of counted times is larger than the total time.\n"
-                   << "(Timer function may have introduced too much overhead, or different\n"
-                   << "section timers may have run at the same time.)" << std::endl;
     }
 
   // restore previous precision and width