From 3e990c9d0ac1d0546126140a798391e65d6e1cad Mon Sep 17 00:00:00 2001
From: Guido Cossu <guido.cossu@ed.ac.uk>
Date: Sat, 22 Oct 2016 13:26:43 +0100
Subject: [PATCH] Reverting the broadcast change

---
 lib/lattice/Lattice_rng.h | 4 ++--
 lib/parallelIO/BinaryIO.h | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/lattice/Lattice_rng.h b/lib/lattice/Lattice_rng.h
index ae61224a..52dd627f 100644
--- a/lib/lattice/Lattice_rng.h
+++ b/lib/lattice/Lattice_rng.h
@@ -130,14 +130,14 @@ namespace Grid {
       ss<<_generators[gen];
       ss.seekg(0,ss.beg);
       for(int i=0;i<RngStateCount;i++){
-  ss>>saved[i];
+      	ss>>saved[i];
       }
     }
     void SetState(std::vector<RngStateType> & saved,int gen){
       assert(saved.size()==RngStateCount);
       std::stringstream ss;
       for(int i=0;i<RngStateCount;i++){
-  ss<< saved[i]<<" ";
+        ss<< saved[i]<<" ";
       }
       ss.seekg(0,ss.beg);
       ss>>_generators[gen];
diff --git a/lib/parallelIO/BinaryIO.h b/lib/parallelIO/BinaryIO.h
index 8b2d9223..75e732ad 100644
--- a/lib/parallelIO/BinaryIO.h
+++ b/lib/parallelIO/BinaryIO.h
@@ -348,12 +348,12 @@ class BinaryIO {
       grid->GlobalIndexToGlobalCoor(gidx, gcoor);
       grid->GlobalCoorToRankIndex(rank, o_idx, i_idx, gcoor);
       int l_idx = parallel.generator_idx(o_idx, i_idx);
+      std::cout << GridLogDebug << "l_idx "<< l_idx << " o_idx " << o_idx << " i_idx " << i_idx << std::endl;
 
       if (rank == grid->ThisRank()) {
         parallel.GetState(saved, l_idx);
-
-        grid->Broadcast(rank, (void *)&saved[0], bytes);
       }
+      grid->Broadcast(rank, (void *)&saved[0], bytes);
 
       if (grid->IsBoss()) {
         Uint32Checksum((uint32_t *)&saved[0], bytes, csum);
@@ -419,14 +419,13 @@ class BinaryIO {
       grid->GlobalIndexToGlobalCoor(gidx,gcoor);
       grid->GlobalCoorToRankIndex(rank,o_idx,i_idx,gcoor);
       int l_idx=parallel.generator_idx(o_idx,i_idx);
+      std::cout << GridLogDebug << "l_idx "<< l_idx << " o_idx " << o_idx << " i_idx " << i_idx << std::endl;
 
       if ( grid->IsBoss() ) {
         fin.read((char *)&saved[0],bytes);
         Uint32Checksum((uint32_t *)&saved[0],bytes,csum);
-
-
-        grid->Broadcast(0,(void *)&saved[0],bytes);
       }
+      grid->Broadcast(0,(void *)&saved[0],bytes);
 
       if( rank == grid->ThisRank() ){
         parallel.SetState(saved,l_idx);