From: heister Date: Wed, 27 Mar 2013 15:20:45 +0000 (+0000) Subject: remove code from TimerOutput that messes with the total time X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de5c7ac63ded8dafd4ecc6524f2b4779ca2ee369;p=dealii-svn.git 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 72a1f90da4..3bb7acff64 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -80,6 +80,12 @@ this function.
    +
  1. Changed: TimerOutput no longer assumes that sections are not nested +when outputting percentage and total run time. +
    +(Timo Heister, 2013/3/28) +
  2. +
  3. 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 a57f11d47c..a1be012b22 100644 --- 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::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