From c33997058605f27f15bb4d3caf6859da38f50149 Mon Sep 17 00:00:00 2001
From: Ian Hinder <ian.hinder@aei.mpg.de>
Date: Wed, 23 Oct 2013 17:04:17 +0200
Subject: CarpetInterp2: Add a barrier after interpolating

---
 Carpet/CarpetInterp2/param.ccl      |  2 +-
 Carpet/CarpetInterp2/src/fasterp.cc | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Carpet/CarpetInterp2/param.ccl b/Carpet/CarpetInterp2/param.ccl
index 5c624daa2..b5d1a85a0 100644
--- a/Carpet/CarpetInterp2/param.ccl
+++ b/Carpet/CarpetInterp2/param.ccl
@@ -8,7 +8,7 @@ BOOLEAN veryverbose "Produce debugging output" STEERABLE=always
 {
 } "no"
 
-BOOLEAN interp_barrier "Wait for all processes before interpolating" STEERABLE=always
+BOOLEAN interp_barrier "Wait for all processes before and after interpolating" STEERABLE=always
 {
 } "no"
 
diff --git a/Carpet/CarpetInterp2/src/fasterp.cc b/Carpet/CarpetInterp2/src/fasterp.cc
index 3d3ac530a..12c8c6678 100644
--- a/Carpet/CarpetInterp2/src/fasterp.cc
+++ b/Carpet/CarpetInterp2/src/fasterp.cc
@@ -1622,7 +1622,7 @@ namespace CarpetInterp2 {
 
     if (interp_barrier)
     {
-      static Timers::Timer barrier_timer ("Barrier");
+      static Timers::Timer barrier_timer ("PreBarrier",0,true);
       barrier_timer.start();
       CCTK_Barrier(cctkGH);
       barrier_timer.stop();
@@ -1825,6 +1825,15 @@ namespace CarpetInterp2 {
 #endif
     
     waitall_is_timer.stop();
+
+    if (interp_barrier)
+    {
+      static Timers::Timer barrier_timer ("PostBarrier",0,true);
+      barrier_timer.start();
+      CCTK_Barrier(cctkGH);
+      barrier_timer.stop();
+    }
+
     if (verbose) CCTK_INFO ("Done.");
   }
   
-- 
cgit v1.2.3