From dd1f5dd966f7346d583be9451e833597c09e122c Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Thu, 4 Jun 2015 06:02:00 +0100
Subject: [PATCH] CG Tests work for wilson kernel cont frac zolo and tanh

---
 .../fermion/OverlapWilsonContfracTanhFermion.h       | 12 ++++++------
 .../fermion/OverlapWilsonContfracZolotarevFermion.h  |  6 +++---
 tests/Test_contfrac_cg.cc                            | 12 +++++++++---
 tests/Test_contfrac_even_odd.cc                      | 11 ++++++++---
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/lib/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h b/lib/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h
index 4865f169..ed0c24dc 100644
--- a/lib/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h
+++ b/lib/qcd/action/fermion/OverlapWilsonContfracTanhFermion.h
@@ -1,5 +1,5 @@
-#ifndef OVERLAP_WILSON_CAYLEY_TANH_FERMION_H
-#define OVERLAP_WILSON_CAYLEY_TANH_FERMION_H
+#ifndef OVERLAP_WILSON_CONTFRAC_TANH_FERMION_H
+#define OVERLAP_WILSON_CONTFRAC_TANH_FERMION_H
 
 #include <Grid.h>
 
@@ -23,10 +23,10 @@ namespace Grid {
       
       // b+c=scale, b-c = 0 <=> b =c = scale/2
       ContinuedFractionFermion5D(_Umu,
-		    FiveDimGrid,
-		    FiveDimRedBlackGrid,
-		    FourDimGrid,
-		    FourDimRedBlackGrid,_mass)
+				 FiveDimGrid,
+				 FiveDimRedBlackGrid,
+				 FourDimGrid,
+				 FourDimRedBlackGrid,_mass,_M5)
 	{
 	  assert((Ls&0x1)==1); // Odd Ls required
 	  int nrational=Ls-1;// Even rational order
diff --git a/lib/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h b/lib/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h
index 7478c062..caf01133 100644
--- a/lib/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h
+++ b/lib/qcd/action/fermion/OverlapWilsonContfracZolotarevFermion.h
@@ -1,5 +1,5 @@
-#ifndef OVERLAP_WILSON_CAYLEY_TANH_FERMION_H
-#define OVERLAP_WILSON_CAYLEY_TANH_FERMION_H
+#ifndef OVERLAP_WILSON_CONTFRAC_ZOLOTAREV_FERMION_H
+#define OVERLAP_WILSON_CONTFRAC_ZOLOTAREV_FERMION_H
 
 #include <Grid.h>
 
@@ -26,7 +26,7 @@ namespace Grid {
 				 FiveDimGrid,
 				 FiveDimRedBlackGrid,
 				 FourDimGrid,
-				 FourDimRedBlackGrid,_mass)
+				 FourDimRedBlackGrid,_mass,_M5)
 	{
 	  assert((Ls&0x1)==1); // Odd Ls required
 
diff --git a/tests/Test_contfrac_cg.cc b/tests/Test_contfrac_cg.cc
index 7fa0d6fc..83475254 100644
--- a/tests/Test_contfrac_cg.cc
+++ b/tests/Test_contfrac_cg.cc
@@ -72,9 +72,15 @@ int main (int argc, char ** argv)
 
   RealD mass=0.1;
   RealD M5  =1.8;
-  std::cout <<"ContinuedFractionFermion test"<<std::endl;
-  ContinuedFractionFermion5D Dcf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5);
-  TestCGinversions<ContinuedFractionFermion5D>(Dcf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5);
+
+
+  std::cout <<"OverlapWilsonContFracTanhFermion  test"<<std::endl;
+  OverlapWilsonContFracTanhFermion Dcf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0);
+  TestCGinversions<OverlapWilsonContFracTanhFermion>(Dcf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5);
+
+  std::cout <<"OverlapWilsonContFracZolotarevFermion  test"<<std::endl;
+  OverlapWilsonContFracZolotarevFermion Dcfz(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,0.1,6.0);
+  TestCGinversions<OverlapWilsonContFracZolotarevFermion>(Dcfz,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5);
 
   Grid_finalize();
 }
diff --git a/tests/Test_contfrac_even_odd.cc b/tests/Test_contfrac_even_odd.cc
index 801bd955..e13c1189 100644
--- a/tests/Test_contfrac_even_odd.cc
+++ b/tests/Test_contfrac_even_odd.cc
@@ -48,9 +48,14 @@ int main (int argc, char ** argv)
 
   RealD mass=0.1;
   RealD M5  =1.8;
-  std::cout <<"ContinuedFractionFermion test"<<std::endl;
-  ContinuedFractionFermion5D Dcf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5);
-  TestWhat<ContinuedFractionFermion5D>(Dcf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5);
+
+  std::cout <<"OverlapWilsonContFracTanhFermion  test"<<std::endl;
+  OverlapWilsonContFracTanhFermion Dcf(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,1.0);
+  TestWhat<OverlapWilsonContFracTanhFermion>(Dcf,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5);
+
+  std::cout <<"OverlapWilsonContFracZolotarevFermion  test"<<std::endl;
+  OverlapWilsonContFracZolotarevFermion Dcfz(Umu,*FGrid,*FrbGrid,*UGrid,*UrbGrid,mass,M5,0.1,6.0);
+  TestWhat<OverlapWilsonContFracZolotarevFermion>(Dcfz,FGrid,FrbGrid,UGrid,UrbGrid,mass,M5,&RNG4,&RNG5);
 
   Grid_finalize();
 }