mirror of
https://github.com/paboyle/Grid.git
synced 2025-04-05 19:55:56 +01:00
Merge branch 'feature/distil' of github.com:mmphys/Grid into feature/distil
* 'feature/distil' of github.com:mmphys/Grid: made notation DPar->dp consistent over modules
This commit is contained in:
commit
8f88fee680
@ -154,7 +154,7 @@ void TDistilVectors<FImpl>::execute(void)
|
||||
auto &noise = envGet(NoiseTensor, par().noise);
|
||||
auto &perambulator = envGet(PerambTensor, par().perambulator);
|
||||
auto &epack = envGet(Grid::Hadrons::EigenPack<LatticeColourVector>, par().lapevec);
|
||||
const DistilParameters &DPar{envGet(DistilParameters, par().DistilParams)};
|
||||
const DistilParameters &dp{envGet(DistilParameters, par().DistilParams)};
|
||||
|
||||
envGetTmp(LatticeSpinColourVector, source4d);
|
||||
envGetTmp(LatticeSpinColourVector, source3d);
|
||||
@ -167,12 +167,12 @@ void TDistilVectors<FImpl>::execute(void)
|
||||
const int Ntfirst{ grid4d->LocalStarts()[3] };
|
||||
|
||||
const int Nt{env().getDim(Tdir)};
|
||||
const int nvec{DPar.nvec};
|
||||
const int nnoise{DPar.nnoise};
|
||||
const int tsrc{DPar.tsrc};
|
||||
const int TI{DPar.TI};
|
||||
const int LI{DPar.LI};
|
||||
const int SI{DPar.SI};
|
||||
const int nvec{dp.nvec};
|
||||
const int nnoise{dp.nnoise};
|
||||
const int tsrc{dp.tsrc};
|
||||
const int TI{dp.TI};
|
||||
const int LI{dp.LI};
|
||||
const int SI{dp.SI};
|
||||
const bool full_tdil{ TI == Nt };
|
||||
const int Nt_inv{ full_tdil ? 1 : TI };
|
||||
|
||||
|
@ -128,14 +128,14 @@ void TPerambulator<FImpl>::setup(void)
|
||||
template <typename FImpl>
|
||||
void TPerambulator<FImpl>::execute(void)
|
||||
{
|
||||
const DistilParameters &DPar{ envGet(DistilParameters, par().DistilParams) };
|
||||
const DistilParameters &dp{ envGet(DistilParameters, par().DistilParams) };
|
||||
const int Nt{env().getDim(Tdir)};
|
||||
const int nvec{DPar.nvec};
|
||||
const int nnoise{DPar.nnoise};
|
||||
const int tsrc{DPar.tsrc};
|
||||
const int TI{DPar.TI};
|
||||
const int LI{DPar.LI};
|
||||
const int SI{DPar.SI};
|
||||
const int nvec{dp.nvec};
|
||||
const int nnoise{dp.nnoise};
|
||||
const int tsrc{dp.tsrc};
|
||||
const int TI{dp.TI};
|
||||
const int LI{dp.LI};
|
||||
const int SI{dp.SI};
|
||||
const bool full_tdil{ TI == Nt };
|
||||
const int Nt_inv{ full_tdil ? 1 : TI };
|
||||
|
||||
|
@ -67,7 +67,6 @@ modules_cc =\
|
||||
Modules/MDistil/DistilVectors.cc \
|
||||
Modules/MDistil/DistilPar.cc \
|
||||
Modules/MDistil/LapEvec.cc \
|
||||
Modules/MDistil/DistilParameters.cc \
|
||||
Modules/MDistil/Perambulator.cc \
|
||||
Modules/MDistil/Noises.cc \
|
||||
Modules/MAction/MobiusDWF.cc \
|
||||
@ -154,7 +153,6 @@ modules_hpp =\
|
||||
Modules/MDistil/LapEvec.hpp \
|
||||
Modules/MDistil/Perambulator.hpp \
|
||||
Modules/MDistil/DistilPar.hpp \
|
||||
Modules/MDistil/DistilCommon.hpp \
|
||||
Modules/MAction/ZMobiusDWF.hpp \
|
||||
Modules/MAction/ScaledDWF.hpp \
|
||||
Modules/MAction/WilsonClover.hpp \
|
||||
|
Loading…
x
Reference in New Issue
Block a user