From ac740f73ceb839f16b914dabb940119cc2003917 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Sun, 2 Jul 2017 16:47:58 -0700
Subject: [PATCH] Works on Cori

---
 tests/solver/Test_dwf_mrhs_cg.cc | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/tests/solver/Test_dwf_mrhs_cg.cc b/tests/solver/Test_dwf_mrhs_cg.cc
index 72d8d8f4..b4880148 100644
--- a/tests/solver/Test_dwf_mrhs_cg.cc
+++ b/tests/solver/Test_dwf_mrhs_cg.cc
@@ -128,29 +128,36 @@ int main (int argc, char ** argv)
   {
     for(int n=0;n<nrhs;n++){
 
-      FGrid->Barrier();
+      std::stringstream filefn;
+      filefn << filef << "."<< n;
+
       std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
       std::cout << GridLogMessage << " Writing out record "<<n<<std::endl;
       std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
       ScidacWriter _ScidacWriter;
-      _ScidacWriter.open(filef);
+      _ScidacWriter.open(filefn.str());
       _ScidacWriter.writeScidacFieldRecord(src[n],record);
       _ScidacWriter.close();
+    }
       
-      FGrid->Barrier();
+    FGrid->Barrier();
 
-      std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
-      std::cout << GridLogMessage << " Reading back in the single process view "<<std::endl;
-      std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
+    std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
+    std::cout << GridLogMessage << " Reading back in the single process view "<<std::endl;
+    std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
       
+    for(int n=0;n<nrhs;n++){
+
+      std::stringstream filefn;
+      filefn << filef << "."<< n;
       if ( n==me ) { 
 	ScidacReader  _ScidacReader;
-	_ScidacReader.open(filef);
+	_ScidacReader.open(filefn.str());
 	_ScidacReader.readScidacFieldRecord(s_src,record);
 	_ScidacReader.close();
       }
-      FGrid->Barrier();
     }
+    FGrid->Barrier();
   }
 
 
@@ -185,7 +192,7 @@ int main (int argc, char ** argv)
   // Report how long they all took
   /////////////////////////////////////////////////////////////
   for(int r=0;r<nrhs;r++){
-    std::cout << " Rank "<<r<<" "<< iterations[r]<<" CG iterations"<<std::endl;
+    std::cout << GridLogMessage<<" Rank "<<r<<" "<< iterations[r]<<" CG iterations"<<std::endl;
   }
   Grid_finalize();
 }