From 16ebbfff2991b5bbaee5d2fa337dce0540ebb978 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Tue, 27 Feb 2018 18:45:23 +0000
Subject: [PATCH] Hadrons: Schur convention globally defined through a macro

---
 extras/Hadrons/Global.hpp                           | 12 ++++++++++++
 .../Modules/MSolver/LocalCoherenceLanczos.hpp       |  8 ++++----
 extras/Hadrons/Modules/MSolver/RBPrecCG.hpp         | 13 ++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp
index 7f60ebcb..675a97c2 100644
--- a/extras/Hadrons/Global.hpp
+++ b/extras/Hadrons/Global.hpp
@@ -181,6 +181,18 @@ typedef XmlWriter ResultWriter;
 #define RESULT_FILE_NAME(name) \
 name + "." + std::to_string(vm().getTrajectory()) + "." + resultFileExt
 
+// default Schur convention
+
+#ifndef HADRONS_DEFAULT_SCHUR 
+#define HADRONS_DEFAULT_SCHUR DiagMooee
+#endif
+#define _HADRONS_SCHUR_OP_(conv) Schur##conv##Operator
+#define HADRONS_SCHUR_OP(conv) _HADRONS_SCHUR_OP_(conv)
+#define HADRONS_DEFAULT_SCHUR_OP HADRONS_SCHUR_OP(HADRONS_DEFAULT_SCHUR)
+#define _HADRONS_SCHUR_SOLVE_(conv) SchurRedBlack##conv##Solve
+#define HADRONS_SCHUR_SOLVE(conv) _HADRONS_SCHUR_SOLVE_(conv)
+#define HADRONS_DEFAULT_SCHUR_SOLVE HADRONS_SCHUR_SOLVE(HADRONS_DEFAULT_SCHUR)
+
 END_HADRONS_NAMESPACE
 
 #include <Grid/Hadrons/Exceptions.hpp>
diff --git a/extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp b/extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp
index a41a7839..387b9455 100644
--- a/extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp
+++ b/extras/Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp
@@ -60,10 +60,10 @@ class TLocalCoherenceLanczos: public Module<LocalCoherenceLanczosPar>
 {
 public:
     FERM_TYPE_ALIASES(FImpl,);
-    typedef LCL<FImpl, nBasis>                         LCL;
-    typedef FineEigenPack<FImpl>                       FineEigenPack;
-    typedef CoarseEigenPack<FImpl, nBasis>             CoarseEigenPack; 
-    typedef SchurDiagMooeeOperator<FMat, FermionField> SchurFMat;
+    typedef LCL<FImpl, nBasis>                           LCL;
+    typedef FineEigenPack<FImpl>                         FineEigenPack;
+    typedef CoarseEigenPack<FImpl, nBasis>               CoarseEigenPack; 
+    typedef HADRONS_DEFAULT_SCHUR_OP<FMat, FermionField> SchurFMat;
 public:
     // constructor
     TLocalCoherenceLanczos(const std::string name);
diff --git a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp
index 54c0f2d8..77ce6cd4 100644
--- a/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp
+++ b/extras/Hadrons/Modules/MSolver/RBPrecCG.hpp
@@ -43,9 +43,10 @@ BEGIN_MODULE_NAMESPACE(MSolver)
 class RBPrecCGPar: Serializable
 {
 public:
-    GRID_SERIALIZABLE_CLASS_MEMBERS(RBPrecCGPar,
-                                    std::string, action,
-                                    double     , residual);
+    GRID_SERIALIZABLE_CLASS_MEMBERS(RBPrecCGPar ,
+                                    std::string    , action,
+                                    unsigned int   , maxIteration,
+                                    double         , residual);
 };
 
 template <typename FImpl>
@@ -117,14 +118,16 @@ void TRBPrecCG<FImpl>::setup(void)
     auto &mat   = envGet(FMat, par().action);
     auto solver = [&mat, this](FermionField &sol, const FermionField &source)
     {
-        ConjugateGradient<FermionField>           cg(par().residual, 10000);
-        SchurRedBlackDiagMooeeSolve<FermionField> schurSolver(cg);
+        ConjugateGradient<FermionField>           cg(par().residual, 
+                                                     par().maxIteration);
+        HADRONS_DEFAULT_SCHUR_SOLVE<FermionField> schurSolver(cg);
         
         schurSolver(mat, source, sol);
     };
     envCreate(SolverFn, getName(), Ls, solver);
 }
 
+
 // execution ///////////////////////////////////////////////////////////////////
 template <typename FImpl>
 void TRBPrecCG<FImpl>::execute(void)