portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-17 07:17:06 +01:00
Code Releases Activity

Hadrons: code cleaning

Browse Source
This commit is contained in:
Antonin Portelli
2018-08-08 18:45:06 +01:00
parent 0a4020eb4d
commit ee5c0cc9b6
4 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,6 @@ class A2AVectorsPar: Serializable
{
public:
GRID_SERIALIZABLE_CLASS_MEMBERS(A2AVectorsPar,
bool, return_5d,
std::string, noise,
std::string, action,
std::string, eigenPack,
@ -131,21 +130,10 @@ void TA2AVectors<FImpl, Pack>::setup(void)
auto &solver = envGet(Solver, par().solver + sub_string);
int Ls = env().getObjectLs(par().action);
LOG(Message) << "Creating all-to-all vectors ";
if (hasLowModes)
{
auto &epack = envGet(Pack, par().eigenPack);
Nl_ = epack.evec.size();
std::cout << " using eigenpack '" << par().eigenPack << "' ("
<< Nl_ << " low modes) and noise '"
<< par().noise << "' (" << noise.size()
<< " noise vectors)" << std::endl;
}
else
{
std::cout << " using noise '" << par().noise << "' (" << noise.size()
<< " noise vectors)" << std::endl;
}
envCreate(std::vector<FermionField>, getName() + "_v", 1,
Nl_ + noise.size(), FermionField(env().getGrid()));
@ -171,6 +159,24 @@ void TA2AVectors<FImpl, Pack>::execute(void)
int Ls = env().getObjectLs(par().action);
envGetTmp(A2A, a2a);
if (hasLowModes)
{
auto &epack = envGet(Pack, par().eigenPack);
Nl_ = epack.evec.size();
LOG(Message) << "Computing all-to-all vectors "
<< " using eigenpack '" << par().eigenPack << "' ("
<< Nl_ << " low modes) and noise '"
<< par().noise << "' (" << noise.size()
<< " noise vectors)" << std::endl;
}
else
{
LOG(Message) << "Computing all-to-all vectors "
<< " using noise '" << par().noise << "' (" << noise.size()
<< " noise vectors)" << std::endl;
}
// Low modes
for (unsigned int il = 0; il < Nl_; il++)
{

2
extras/Hadrons/Modules/MSolver/RBPrecCG.hpp
View File

@ -159,7 +159,7 @@ void TRBPrecCG<FImpl, nBasis>::setup(void)
guesser.reset(new CoarseGuesser(epack.evec, epack.evecCoarse,
epack.evalCoarse));
}
catch (Exceptions::Definition &e)
catch (Exceptions::ObjectType &e)
{
auto &epack = envGet(EPack, par().eigenPack);