From 8bb11e5039a794683c118e0316fe5a7fed530c2a Mon Sep 17 00:00:00 2001
From: Chulwoo Jung <chulwoo@bnl.gov>
Date: Thu, 8 Mar 2018 23:02:19 -0500
Subject: [PATCH] Making tests compile

---
 tests/lanczos/Test_dwf_block_lanczos.cc       |  2 +-
 tests/lanczos/Test_dwf_compressed_lanczos.cc  |  1 +
 .../Test_dwf_compressed_lanczos_reorg.cc      |  4 +-
 tests/lanczos/Test_dwf_lanczos.cc             |  2 +-
 tests/solver/Test_dwf_mrhs_cg.cc              | 43 ++++++++++---------
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/tests/lanczos/Test_dwf_block_lanczos.cc b/tests/lanczos/Test_dwf_block_lanczos.cc
index be306846..06d8f46f 100644
--- a/tests/lanczos/Test_dwf_block_lanczos.cc
+++ b/tests/lanczos/Test_dwf_block_lanczos.cc
@@ -46,7 +46,7 @@ class CmdJobParams
     double M5;
     double mob_b;
     std::vector<ComplexD> omega;
-    std::vector<ComplexD> boundary_phase;
+    std::vector<Complex> boundary_phase;
     
     LanczosType Impl;
     int Nu;
diff --git a/tests/lanczos/Test_dwf_compressed_lanczos.cc b/tests/lanczos/Test_dwf_compressed_lanczos.cc
index 45690f05..92e9227a 100644
--- a/tests/lanczos/Test_dwf_compressed_lanczos.cc
+++ b/tests/lanczos/Test_dwf_compressed_lanczos.cc
@@ -22,6 +22,7 @@
 */
 #include <Grid/Grid.h>
 #include <Grid/algorithms/iterative/ImplicitlyRestartedLanczos.h>
+#include <Grid/parallelIO/IldgIO.h>
 /////////////////////////////////////////////////////////////////////////////
 // The following are now decoupled from the Lanczos and deal with grids.
 // Safe to replace functionality
diff --git a/tests/lanczos/Test_dwf_compressed_lanczos_reorg.cc b/tests/lanczos/Test_dwf_compressed_lanczos_reorg.cc
index 3dff4b90..270748cd 100644
--- a/tests/lanczos/Test_dwf_compressed_lanczos_reorg.cc
+++ b/tests/lanczos/Test_dwf_compressed_lanczos_reorg.cc
@@ -33,6 +33,8 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #include <Grid/Grid.h>
 #include <Grid/algorithms/iterative/ImplicitlyRestartedLanczos.h>
 #include <Grid/algorithms/iterative/LocalCoherenceLanczos.h>
+#include <Grid/parallelIO/IldgIOtypes.h>
+#include <Grid/parallelIO/IldgIO.h>
 
 using namespace std;
 using namespace Grid;
@@ -57,7 +59,7 @@ public:
   void checkpointFine(std::string evecs_file,std::string evals_file)
   {
     assert(this->subspace.size()==nbasis);
-    emptyUserRecord record;
+    Grid::emptyUserRecord record;
     Grid::QCD::ScidacWriter WR;
     WR.open(evecs_file);
     for(int k=0;k<nbasis;k++) {
diff --git a/tests/lanczos/Test_dwf_lanczos.cc b/tests/lanczos/Test_dwf_lanczos.cc
index 8f00d68b..bdcb97b1 100644
--- a/tests/lanczos/Test_dwf_lanczos.cc
+++ b/tests/lanczos/Test_dwf_lanczos.cc
@@ -84,7 +84,7 @@ int main (int argc, char ** argv)
 
   std::vector<double> Coeffs { 0.,-1.};
   Polynomial<FermionField> PolyX(Coeffs);
-  Chebyshev<FermionField> Cheb(0.2,5.5,11);
+  Chebyshev<FermionField> Cheby(0.2,5.5,11);
 
   FunctionHermOp<FermionField> OpCheby(Cheby,HermOp);
      PlainHermOp<FermionField> Op     (HermOp);
diff --git a/tests/solver/Test_dwf_mrhs_cg.cc b/tests/solver/Test_dwf_mrhs_cg.cc
index 207e1331..c754c3f1 100644
--- a/tests/solver/Test_dwf_mrhs_cg.cc
+++ b/tests/solver/Test_dwf_mrhs_cg.cc
@@ -26,17 +26,18 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
     *************************************************************************************/
     /*  END LEGAL */
 #include <Grid/Grid.h>
+#include <Grid/parallelIO/IldgIOtypes.h>
 #include <Grid/algorithms/iterative/BlockConjugateGradient.h>
 
-using namespace std;
+//using namespace std;
 using namespace Grid;
 using namespace Grid::QCD;
 
 int main (int argc, char ** argv)
 {
-  typedef typename DomainWallFermionR::FermionField FermionField; 
-  typedef typename DomainWallFermionR::ComplexField ComplexField; 
-  typename DomainWallFermionR::ImplParams params; 
+  typedef typename Grid::QCD::DomainWallFermionR::FermionField FermionField; 
+  typedef typename Grid::QCD::DomainWallFermionR::ComplexField ComplexField; 
+  typename Grid::QCD::DomainWallFermionR::ImplParams params; 
 
   const int Ls=4;
 
@@ -102,7 +103,7 @@ int main (int argc, char ** argv)
   std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
   std::cout << GridLogMessage << " Writing out in parallel view "<<std::endl;
   std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
-  emptyUserRecord record;
+//  Grid::emptyUserRecord record;
   std::string file("./scratch.scidac");
   std::string filef("./scratch.scidac.ferm");
 
@@ -114,21 +115,21 @@ int main (int argc, char ** argv)
 
   {
     FGrid->Barrier();
-    ScidacWriter _ScidacWriter;
-    _ScidacWriter.open(file);
+//    ScidacWriter _ScidacWriter;
+//    _ScidacWriter.open(file);
     std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
     std::cout << GridLogMessage << " Writing out gauge field "<<std::endl;
     std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
-    _ScidacWriter.writeScidacFieldRecord(Umu,record);
-    _ScidacWriter.close();
+//    _ScidacWriter.writeScidacFieldRecord(Umu,record);
+//    _ScidacWriter.close();
     FGrid->Barrier();
     std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
     std::cout << GridLogMessage << " Reading in gauge field "<<std::endl;
     std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
-    ScidacReader  _ScidacReader;
-    _ScidacReader.open(file);
-    _ScidacReader.readScidacFieldRecord(s_Umu,record);
-    _ScidacReader.close();
+//    ScidacReader  _ScidacReader;
+//    _ScidacReader.open(file);
+//    _ScidacReader.readScidacFieldRecord(s_Umu,record);
+//    _ScidacReader.close();
     FGrid->Barrier();
     std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
     std::cout << GridLogMessage << " Read in gauge field "<<std::endl;
@@ -144,10 +145,10 @@ int main (int argc, char ** argv)
       std::cout << GridLogMessage << "****************************************************************** "<<std::endl;
 
       std::stringstream filefn;      filefn << filef << "."<< n;
-      ScidacWriter _ScidacWriter;
-      _ScidacWriter.open(filefn.str());
-      _ScidacWriter.writeScidacFieldRecord(src[n],record);
-      _ScidacWriter.close();
+//      ScidacWriter _ScidacWriter;
+//      _ScidacWriter.open(filefn.str());
+//      _ScidacWriter.writeScidacFieldRecord(src[n],record);
+//      _ScidacWriter.close();
     }
       
     FGrid->Barrier();
@@ -159,10 +160,10 @@ int main (int argc, char ** argv)
     for(int n=0;n<nrhs;n++){
       if ( n==me ) { 
 	std::stringstream filefn;	filefn << filef << "."<< n;
-	ScidacReader  _ScidacReader;
-	_ScidacReader.open(filefn.str());
-	_ScidacReader.readScidacFieldRecord(s_src,record);
-	_ScidacReader.close();
+//	ScidacReader  _ScidacReader;
+//	_ScidacReader.open(filefn.str());
+//	_ScidacReader.readScidacFieldRecord(s_src,record);
+//	_ScidacReader.close();
       }
     }
     FGrid->Barrier();