From: wolf Date: Thu, 30 Mar 2000 13:15:17 +0000 (+0000) Subject: Remove full_time from Timer class. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6013a2329081cfde5e349119f7274ce23bcdd62a;p=dealii-svn.git Remove full_time from Timer class. git-svn-id: https://svn.dealii.org/trunk@2645 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/timer.h b/deal.II/base/include/base/timer.h index 31f75b2b3c..2476258816 100644 --- a/deal.II/base/include/base/timer.h +++ b/deal.II/base/include/base/timer.h @@ -109,15 +109,6 @@ class Timer * running. */ bool running; - - /** - * Return #cumulative_time# plus the - * number of overflows times the number - * of seconds per overflow. Do not include - * the time since the last overflow - * occured. - */ - double full_time () const; }; diff --git a/deal.II/base/source/timer.cc b/deal.II/base/source/timer.cc index c87e0bd688..0482171de2 100644 --- a/deal.II/base/source/timer.cc +++ b/deal.II/base/source/timer.cc @@ -46,7 +46,7 @@ double Timer::stop () const double dtime = usage.ru_utime.tv_sec + 1.e-6 * usage.ru_utime.tv_usec; cumulative_time += dtime - start_time; } - return full_time (); + return cumulative_time; } @@ -58,10 +58,10 @@ double Timer::operator() () const getrusage (RUSAGE_SELF, &usage); const double dtime = usage.ru_utime.tv_sec + 1.e-6 * usage.ru_utime.tv_usec; - return dtime - start_time + full_time(); + return dtime - start_time + cumulative_time; } else - return full_time(); + return cumulative_time; } @@ -72,7 +72,3 @@ void Timer::reset () } -double Timer::full_time () const -{ - return cumulative_time; -}