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 31f75b2b3c7e578d8e5a778cf58bc1bc7fbcbe3a..2476258816795acf78218efb1d8a19a6e39f3d2e 100644 (file)
--- 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 c87e0bd688625e2d714ae92bc7880b031630cfcf..0482171de2c7b6fcfcd382667752fa8ba2d31b36 100644 (file)
--- 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;
-}