Carpet: Measure M/h only for evolution, disregarding initialisation

1 files changed, 13 insertions, 3 deletions

diff --git a/Carpet/Carpet/src/Timing.cc b/Carpet/Carpet/src/Timing.cc
index f767f1ea5..6c4102733 100644
--- a/Carpet/Carpet/src/Timing.cc
+++ b/Carpet/Carpet/src/Timing.cc
@@ -136,9 +136,6 @@ namespace Carpet {
   {
     DECLARE_CCTK_ARGUMENTS;
     
-    initial_walltime = get_walltime();
-    initial_phystime = cctkGH->cctk_time;
-    
     * physical_time_per_hour = 0.0;
     
     * time_total         = 0.0;
@@ -171,6 +168,19 @@ namespace Carpet {
   
   
   
+  // Begin timing (to be called after initialisation, just before the
+  // main evolution begins)
+  void
+  BeginTiming (cGH const * const cctkGH)
+  {
+    DECLARE_CCTK_ARGUMENTS;
+    
+    initial_walltime = get_walltime();
+    initial_phystime = cctkGH->cctk_time;
+  }
+  
+  
+  
   // Take a step on the current refinement and multigrid level (to be
   // called when EVOL is scheduled)
   void