portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil

Browse Source 
* 'feature/distil' of github.com:mmphys/Grid:
  bugfix
This commit is contained in:
Michael Marshall 2019-03-25 15:50:57 +00:00
commit 1d10a3b3de
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Hadrons/Modules/MDistil/Noises.hpp
View File

@ -25,8 +25,7 @@ public:
GRID_SERIALIZABLE_CLASS_MEMBERS(NoisesPar, GRID_SERIALIZABLE_CLASS_MEMBERS(NoisesPar,
std::string, UniqueIdentifier, std::string, UniqueIdentifier,
int, nvec, int, nvec,
DistilParameters, Distil, DistilParameters, Distil);
unsigned int, i);
}; };
template <typename FImpl> template <typename FImpl>

5
Hadrons/Modules/MIO/LoadPerambulator.hpp
View File

@ -19,7 +19,6 @@ class LoadPerambulatorPar: Serializable
public: public:
GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPerambulatorPar, GRID_SERIALIZABLE_CLASS_MEMBERS(LoadPerambulatorPar,
std::string, PerambFileName, //stem!!! std::string, PerambFileName, //stem!!!
std::string, UniqueIdentifier,
int, nvec, int, nvec,
MDistil::DistilParameters, Distil); MDistil::DistilParameters, Distil);
}; };
@ -81,7 +80,7 @@ void TLoadPerambulator<FImpl>::setup(void)
const int Ns{Distil.Ns}; const int Ns{Distil.Ns};
std::array<std::string,6> sIndexNames{"Nt", "nvec", "LI", "nnoise", "Nt_inv", "SI"}; std::array<std::string,6> sIndexNames{"Nt", "nvec", "LI", "nnoise", "Nt_inv", "SI"};
envCreate(MDistil::Perambulator<SpinVector COMMA 6 COMMA sizeof(Real)>, getName() + "_perambulator_light", 1, envCreate(MDistil::Perambulator<SpinVector COMMA 6 COMMA sizeof(Real)>, getName(), 1,
sIndexNames,Distil.Nt,nvec,Distil.LI,Distil.nnoise,Distil.Nt_inv,Distil.SI); sIndexNames,Distil.Nt,nvec,Distil.LI,Distil.nnoise,Distil.Nt_inv,Distil.SI);
} }
@ -91,7 +90,7 @@ template <typename FImpl>
void TLoadPerambulator<FImpl>::execute(void) void TLoadPerambulator<FImpl>::execute(void)
{ {
auto &perambulator = envGet(MDistil::Perambulator<SpinVector COMMA 6 COMMA sizeof(Real)>, auto &perambulator = envGet(MDistil::Perambulator<SpinVector COMMA 6 COMMA sizeof(Real)>,
getName() + "_perambulator_light"); getName());
const std::string &PerambFileName{par().PerambFileName}; const std::string &PerambFileName{par().PerambFileName};