From 7fe3974c0ae856b45a21ba1fcf63270b91953992 Mon Sep 17 00:00:00 2001
From: fionnoh <fionnoh@gmail.com>
Date: Thu, 28 Jun 2018 16:14:49 +0100
Subject: [PATCH] Included eigenPacks and action as references, not inputs, of
 A2A module. They now now longer need to be parameters in the meson field
 modules.

---
 extras/Hadrons/Modules/MSolver/A2AVectors.hpp | 50 +++++++++++++------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/extras/Hadrons/Modules/MSolver/A2AVectors.hpp b/extras/Hadrons/Modules/MSolver/A2AVectors.hpp
index 4db90eef..c98243e6 100644
--- a/extras/Hadrons/Modules/MSolver/A2AVectors.hpp
+++ b/extras/Hadrons/Modules/MSolver/A2AVectors.hpp
@@ -4,6 +4,7 @@
 #include <Grid/Hadrons/Global.hpp>
 #include <Grid/Hadrons/Module.hpp>
 #include <Grid/Hadrons/ModuleFactory.hpp>
+#include <Grid/Hadrons/Solver.hpp>
 #include <Grid/Hadrons/EigenPack.hpp>
 #include <Grid/Hadrons/AllToAllVectors.hpp>
 
@@ -23,7 +24,7 @@ public:
                                   int, N,
                                   std::vector<std::string>, sources,
                                   std::string, action,
-                                  std::string, eigenpack,
+                                  std::string, eigenPack,
                                   std::string, solver);
 };
 
@@ -37,7 +38,7 @@ class TA2AVectors : public Module<A2AVectorsPar>
     typedef FermionEigenPack<FImpl> EPack;
     typedef CoarseFermionEigenPack<FImpl, nBasis> CoarseEPack;
 
-    typedef A2AModesSchurDiagTwo<typename FImpl::FermionField, FMat> A2ABase;
+    typedef A2AModesSchurDiagTwo<typename FImpl::FermionField, FMat, Solver> A2ABase;
 
   public:
     // constructor
@@ -46,6 +47,7 @@ class TA2AVectors : public Module<A2AVectorsPar>
     virtual ~TA2AVectors(void) {};
     // dependency relation
     virtual std::vector<std::string> getInput(void);
+    virtual std::vector<std::string> getReference(void);
     virtual std::vector<std::string> getOutput(void);
     // setup
     virtual void setup(void);
@@ -54,7 +56,7 @@ class TA2AVectors : public Module<A2AVectorsPar>
 
   private:
     unsigned int Ls_;
-    std::string retName_;
+    std::string className_;
 };
 
 MODULE_REGISTER_TMP(A2AVectors, ARG(TA2AVectors<FIMPL, HADRONS_DEFAULT_LANCZOS_NBASIS>), MSolver);
@@ -67,14 +69,17 @@ MODULE_REGISTER_TMP(ZA2AVectors, ARG(TA2AVectors<ZFIMPL, HADRONS_DEFAULT_LANCZOS
 template <typename FImpl, int nBasis>
 TA2AVectors<FImpl, nBasis>::TA2AVectors(const std::string name)
 : Module<A2AVectorsPar>(name)
-, retName_ (name + "_ret")
+, className_ (name + "_class")
 {}
 
 // dependencies/products ///////////////////////////////////////////////////////
 template <typename FImpl, int nBasis>
 std::vector<std::string> TA2AVectors<FImpl, nBasis>::getInput(void)
 {
-    std::vector<std::string> in = {par().action, par().solver, par().solver + "_subtract"};
+    int Nl = par().Nl;
+    std::string sub_string = "";
+    if (Nl > 0) sub_string = "_subtract";
+    std::vector<std::string> in = {par().solver + sub_string};
 
     int n = par().sources.size();
 
@@ -86,10 +91,23 @@ std::vector<std::string> TA2AVectors<FImpl, nBasis>::getInput(void)
     return in;
 }
 
+template <typename FImpl, int nBasis>
+std::vector<std::string> TA2AVectors<FImpl, nBasis>::getReference(void)
+{
+    std::vector<std::string> ref = {par().action};
+
+    if (!par().eigenPack.empty())
+    {
+        ref.push_back(par().eigenPack);
+    }
+
+    return ref;
+}
+
 template <typename FImpl, int nBasis>
 std::vector<std::string> TA2AVectors<FImpl, nBasis>::getOutput(void)
 {
-    std::vector<std::string> out = {getName(), retName_};
+    std::vector<std::string> out = {getName(), className_};
 
     return out;
 }
@@ -106,7 +124,7 @@ void TA2AVectors<FImpl, nBasis>::setup(void)
 
     std::string sub_string = "";
     if (Nl > 0) sub_string = "_subtract";
-    auto &solver = envGet(SolverFn, par().solver + sub_string);
+    auto &solver = envGet(Solver, par().solver + sub_string);
     Ls_ = env().getObjectLs(par().solver + sub_string);
 
     auto &action = envGet(FMat, par().action);
@@ -121,10 +139,10 @@ void TA2AVectors<FImpl, nBasis>::setup(void)
     if (Nl > 0)
     {
         // Low modes
-        auto &epack = envGet(EPack, par().eigenpack);
+        auto &epack = envGet(EPack, par().eigenPack);
 
         LOG(Message) << "Creating a2a vectors " << getName() <<
-                     " using eigenpack '" << par().eigenpack << "' ("
+                     " using eigenpack '" << par().eigenPack << "' ("
                      << epack.evec.size() << " modes)" <<
                      " and " << Nh << " high modes." << std::endl;
         evec = &epack.evec;
@@ -135,7 +153,7 @@ void TA2AVectors<FImpl, nBasis>::setup(void)
         LOG(Message) << "Creating a2a vectors " << getName() <<
                      " using " << Nh << " high modes only." << std::endl;
     }
-    envCreate(A2ABase, retName_, Ls_,
+    envCreate(A2ABase, className_, Ls_,
                      evec, eval,
                      action,
                      solver,
@@ -158,7 +176,7 @@ void TA2AVectors<FImpl, nBasis>::execute(void)
     if (Nl > 0) sub_string = "_subtract";
     Ls_ = env().getObjectLs(par().solver + sub_string);
 
-    auto &a2areturn = envGet(A2ABase, retName_);
+    auto &a2areturn = envGet(A2ABase, className_);
 
     // High modes
     auto sources = par().sources;
@@ -168,8 +186,6 @@ void TA2AVectors<FImpl, nBasis>::execute(void)
     envGetTmp(FermionField, tmp);
     envGetTmp(FermionField, tmp2);
 
-    // TODO: At the moment weighting only applies to the 4d->5d source path
-    // similar to how the 5d and 4d srcs are passed in, this needs more work to be less brittle
     double weight = 1.0 / sqrt(Ns*Nc*Nsrc);
     int N_count = 0;
     for (unsigned int s = 0; s < Ns; ++s)
@@ -184,11 +200,13 @@ void TA2AVectors<FImpl, nBasis>::execute(void)
                 if (Ls_ == 1)
                 {
                     PropToFerm<FImpl>(ferm_src, prop_src, s, c);
+                    ferm_src = weight*ferm_src;
+                    tmp = ferm_src;
                 }
                 else
                 {
-                    PropToFerm<FImpl>(tmp2, prop_src, s, c);
-                    tmp = weight*tmp2;
+                    PropToFerm<FImpl>(tmp, prop_src, s, c);
+                    tmp = weight*tmp;
                     action.ImportPhysicalFermionSource(tmp, ferm_src);
                 }
             }
@@ -202,6 +220,8 @@ void TA2AVectors<FImpl, nBasis>::execute(void)
                 else
                 {
                     PropToFerm<FImpl>(ferm_src, prop_src, s, c);
+                    ferm_src = weight*ferm_src;
+                    action.ExportPhysicalFermionSolution(ferm_src, tmp);
                 }
             }
             LOG(Message) << "a2areturn.high_modes Ncount = " << N_count << std::endl;