portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-13 01:05:36 +00:00
Code Releases Activity

Fixed a bug where the guess was always subtracted after the solve and included appropriate weights for the sources in the one case we're looking at now. More work needs to be done to make the 5d/4d source logic less brittle.

Browse Source
This commit is contained in:
fionnoh 2018-06-21 16:36:59 +01:00
parent 7a0abfac89
commit 8fccda301a
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
extras/Hadrons/Modules/MSolver/A2AVectors.hpp
View File

@ -38,7 +38,6 @@ class TA2AVectors : public Module<A2AVectorsPar>
typedef CoarseFermionEigenPack<FImpl, nBasis> CoarseEPack; typedef CoarseFermionEigenPack<FImpl, nBasis> CoarseEPack;
typedef A2AModesSchurDiagTwo<typename FImpl::FermionField, FMat> A2ABase; typedef A2AModesSchurDiagTwo<typename FImpl::FermionField, FMat> A2ABase;
typedef A2AVectorsReturn<typename FImpl::FermionField, FMat> A2AReturn;
public: public:
// constructor // constructor
@ -55,7 +54,7 @@ class TA2AVectors : public Module<A2AVectorsPar>
private: private:
unsigned int Ls_; unsigned int Ls_;
std::string retName_, whighName_, vhighName_; std::string retName_;
}; };
MODULE_REGISTER_TMP(A2AVectors, ARG(TA2AVectors<FIMPL, HADRONS_DEFAULT_LANCZOS_NBASIS>), MSolver); MODULE_REGISTER_TMP(A2AVectors, ARG(TA2AVectors<FIMPL, HADRONS_DEFAULT_LANCZOS_NBASIS>), MSolver);
@ -69,8 +68,6 @@ template <typename FImpl, int nBasis>
TA2AVectors<FImpl, nBasis>::TA2AVectors(const std::string name) TA2AVectors<FImpl, nBasis>::TA2AVectors(const std::string name)
: Module<A2AVectorsPar>(name) : Module<A2AVectorsPar>(name)
, retName_ (name + "_ret") , retName_ (name + "_ret")
, whighName_ (name + "_whigh")
, vhighName_ (name + "_vhigh")
{} {}
// dependencies/products /////////////////////////////////////////////////////// // dependencies/products ///////////////////////////////////////////////////////
@ -107,27 +104,16 @@ void TA2AVectors<FImpl, nBasis>::setup(void)
bool return_5d = par().return_5d; bool return_5d = par().return_5d;
int Ls, Ls_; int Ls, Ls_;
Ls_ = env().getObjectLs(par().solver + "_subtract"); std::string sub_string = "";
auto &solver = envGet(SolverFn, par().solver + "_subtract"); if (Nl > 0) sub_string = "_subtract";
if (!(Nl > 0)) auto &solver = envGet(SolverFn, par().solver + sub_string);
{ Ls_ = env().getObjectLs(par().solver + sub_string);
Ls_ = env().getObjectLs(par().solver);
auto &solver = envGet(SolverFn, par().solver);
}
if (return_5d)
{
Ls = Ls_;
}
else
{
Ls = 1;
}
auto &action = envGet(FMat, par().action); auto &action = envGet(FMat, par().action);
envTmpLat(FermionField, "ferm_src", Ls_); envTmpLat(FermionField, "ferm_src", Ls_);
envTmpLat(FermionField, "tmp"); envTmpLat(FermionField, "tmp");
envTmpLat(FermionField, "tmp2");
std::vector<FermionField> *evec; std::vector<FermionField> *evec;
const std::vector<RealD> *eval; const std::vector<RealD> *eval;
@ -149,7 +135,7 @@ void TA2AVectors<FImpl, nBasis>::setup(void)
LOG(Message) << "Creating a2a vectors " << getName() << LOG(Message) << "Creating a2a vectors " << getName() <<
" using " << Nh << " high modes only." << std::endl; " using " << Nh << " high modes only." << std::endl;
} }
envCreateDerived(A2ABase, A2AReturn, retName_, Ls, envCreate(A2ABase, retName_, Ls_,
evec, eval, evec, eval,
action, action,
solver, solver,
@ -167,13 +153,12 @@ void TA2AVectors<FImpl, nBasis>::execute(void)
int Nc = FImpl::Dimension; int Nc = FImpl::Dimension;
int Ls_; int Ls_;
int Nl = par().Nl; int Nl = par().Nl;
Ls_ = env().getObjectLs(par().solver + "_subtract");
if (!(Nl > 0))
{
Ls_ = env().getObjectLs(par().solver);
}
auto &a2areturn = envGetDerived(A2ABase, A2AReturn, retName_); std::string sub_string = "";
if (Nl > 0) sub_string = "_subtract";
Ls_ = env().getObjectLs(par().solver + sub_string);
auto &a2areturn = envGet(A2ABase, retName_);
// High modes // High modes
auto sources = par().sources; auto sources = par().sources;
@ -181,7 +166,9 @@ void TA2AVectors<FImpl, nBasis>::execute(void)
envGetTmp(FermionField, ferm_src); envGetTmp(FermionField, ferm_src);
envGetTmp(FermionField, tmp); envGetTmp(FermionField, tmp);
envGetTmp(FermionField, tmp2);
double weight = 1.0 / sqrt(Ns*Nc*Nsrc);
int N_count = 0; int N_count = 0;
for (unsigned int s = 0; s < Ns; ++s) for (unsigned int s = 0; s < Ns; ++s)
for (unsigned int c = 0; c < Nc; ++c) for (unsigned int c = 0; c < Nc; ++c)
@ -198,7 +185,8 @@ void TA2AVectors<FImpl, nBasis>::execute(void)
} }
else else
{ {
PropToFerm<FImpl>(tmp, prop_src, s, c); PropToFerm<FImpl>(tmp2, prop_src, s, c);
tmp = weight*tmp2;
action.ImportPhysicalFermionSource(tmp, ferm_src); action.ImportPhysicalFermionSource(tmp, ferm_src);
} }
} }