1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00

made notation DPar->dp consistent over modules

This commit is contained in:
ferben 2019-11-13 11:21:08 +00:00
parent 66e0811317
commit 12e415330f
3 changed files with 14 additions and 16 deletions

View File

@ -154,7 +154,7 @@ void TDistilVectors<FImpl>::execute(void)
auto &noise = envGet(NoiseTensor, par().noise); auto &noise = envGet(NoiseTensor, par().noise);
auto &perambulator = envGet(PerambTensor, par().perambulator); auto &perambulator = envGet(PerambTensor, par().perambulator);
auto &epack = envGet(Grid::Hadrons::EigenPack<LatticeColourVector>, par().lapevec); 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, source4d);
envGetTmp(LatticeSpinColourVector, source3d); envGetTmp(LatticeSpinColourVector, source3d);
@ -167,12 +167,12 @@ void TDistilVectors<FImpl>::execute(void)
const int Ntfirst{ grid4d->LocalStarts()[3] }; const int Ntfirst{ grid4d->LocalStarts()[3] };
const int Nt{env().getDim(Tdir)}; const int Nt{env().getDim(Tdir)};
const int nvec{DPar.nvec}; const int nvec{dp.nvec};
const int nnoise{DPar.nnoise}; const int nnoise{dp.nnoise};
const int tsrc{DPar.tsrc}; const int tsrc{dp.tsrc};
const int TI{DPar.TI}; const int TI{dp.TI};
const int LI{DPar.LI}; const int LI{dp.LI};
const int SI{DPar.SI}; const int SI{dp.SI};
const bool full_tdil{ TI == Nt }; const bool full_tdil{ TI == Nt };
const int Nt_inv{ full_tdil ? 1 : TI }; const int Nt_inv{ full_tdil ? 1 : TI };

View File

@ -128,14 +128,14 @@ void TPerambulator<FImpl>::setup(void)
template <typename FImpl> template <typename FImpl>
void TPerambulator<FImpl>::execute(void) 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 Nt{env().getDim(Tdir)};
const int nvec{DPar.nvec}; const int nvec{dp.nvec};
const int nnoise{DPar.nnoise}; const int nnoise{dp.nnoise};
const int tsrc{DPar.tsrc}; const int tsrc{dp.tsrc};
const int TI{DPar.TI}; const int TI{dp.TI};
const int LI{DPar.LI}; const int LI{dp.LI};
const int SI{DPar.SI}; const int SI{dp.SI};
const bool full_tdil{ TI == Nt }; const bool full_tdil{ TI == Nt };
const int Nt_inv{ full_tdil ? 1 : TI }; const int Nt_inv{ full_tdil ? 1 : TI };

View File

@ -67,7 +67,6 @@ modules_cc =\
Modules/MDistil/DistilVectors.cc \ Modules/MDistil/DistilVectors.cc \
Modules/MDistil/DistilPar.cc \ Modules/MDistil/DistilPar.cc \
Modules/MDistil/LapEvec.cc \ Modules/MDistil/LapEvec.cc \
Modules/MDistil/DistilParameters.cc \
Modules/MDistil/Perambulator.cc \ Modules/MDistil/Perambulator.cc \
Modules/MDistil/Noises.cc \ Modules/MDistil/Noises.cc \
Modules/MAction/MobiusDWF.cc \ Modules/MAction/MobiusDWF.cc \
@ -154,7 +153,6 @@ modules_hpp =\
Modules/MDistil/LapEvec.hpp \ Modules/MDistil/LapEvec.hpp \
Modules/MDistil/Perambulator.hpp \ Modules/MDistil/Perambulator.hpp \
Modules/MDistil/DistilPar.hpp \ Modules/MDistil/DistilPar.hpp \
Modules/MDistil/DistilCommon.hpp \
Modules/MAction/ZMobiusDWF.hpp \ Modules/MAction/ZMobiusDWF.hpp \
Modules/MAction/ScaledDWF.hpp \ Modules/MAction/ScaledDWF.hpp \
Modules/MAction/WilsonClover.hpp \ Modules/MAction/WilsonClover.hpp \