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

Ensure Distillation test (Test_distil) works

Browse Source
This commit is contained in:
Michael Marshall 2019-09-16 17:00:46 +01:00
parent 2e963d1a78
commit 2f3dd0703d
4 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Hadrons/Distil.hpp
View File

@ -238,7 +238,6 @@ struct DistilParameters: Serializable {
#define DISTIL_PARAMETERS_DEFINE( inSetup ) \ #define DISTIL_PARAMETERS_DEFINE( inSetup ) \
const int Nt{env().getDim(Tdir)}; \ const int Nt{env().getDim(Tdir)}; \
const int nvec{par().nvec}; \ const int nvec{par().nvec}; \
const int Ns{Ns}; \
const int nnoise{par().Distil.nnoise}; \ const int nnoise{par().Distil.nnoise}; \
const int tsrc{par().Distil.tsrc}; \ const int tsrc{par().Distil.tsrc}; \
const int TI{par().Distil.getTI(env(), inSetup)}; \ const int TI{par().Distil.getTI(env(), inSetup)}; \

1
Hadrons/Modules/MDistil/DistilVectors.hpp
View File

@ -233,7 +233,6 @@ void TDistilVectors<FImpl>::execute(void)
const int Ntlocal{ grid4d->LocalDimensions()[3] }; const int Ntlocal{ grid4d->LocalDimensions()[3] };
const int Ntfirst{ grid4d->LocalStarts()[3] }; const int Ntfirst{ grid4d->LocalStarts()[3] };
const int Ns{ Ns };
const int Nt{ env().getDim(Tdir) }; const int Nt{ env().getDim(Tdir) };
const int TI{ Hadrons::MDistil::DistilParameters::ParameterDefault( par().TI, Nt, false ) }; const int TI{ Hadrons::MDistil::DistilParameters::ParameterDefault( par().TI, Nt, false ) };
const int LI{ static_cast<int>( perambulator.tensor.dimension(2) ) }; const int LI{ static_cast<int>( perambulator.tensor.dimension(2) ) };

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

@ -110,7 +110,6 @@ template <typename FImpl>
void TNoises<FImpl>::setup(void) void TNoises<FImpl>::setup(void)
{ {
const int Nt{env().getDim(Tdir)}; const int Nt{env().getDim(Tdir)};
//const int Ns{Grid::Ns};
const int nnoise{par().nnoise}; const int nnoise{par().nnoise};
const int nvec{par().nvec}; const int nvec{par().nvec};
const int TI{ Hadrons::MDistil::DistilParameters::ParameterDefault( par().TI, Nt, true) }; const int TI{ Hadrons::MDistil::DistilParameters::ParameterDefault( par().TI, Nt, true) };
@ -123,7 +122,6 @@ template <typename FImpl>
void TNoises<FImpl>::execute(void) void TNoises<FImpl>::execute(void)
{ {
const int Nt{env().getDim(Tdir)}; const int Nt{env().getDim(Tdir)};
//const int Ns{Grid::Ns};
const int nnoise{par().nnoise}; const int nnoise{par().nnoise};
const int nvec{par().nvec}; const int nvec{par().nvec};
const int TI{ Hadrons::MDistil::DistilParameters::ParameterDefault( par().TI, Nt, false) }; const int TI{ Hadrons::MDistil::DistilParameters::ParameterDefault( par().TI, Nt, false) };

2
tests/hadrons/Test_distil.cc
View File

@ -1058,7 +1058,7 @@ int main(int argc, char *argv[])
static const char XmlFileName[] = "test_distil.xml"; static const char XmlFileName[] = "test_distil.xml";
application.saveParameterFile( XmlFileName ); application.saveParameterFile( XmlFileName );
const std::vector<int> &lat{GridDefaultLatt()}; const Grid::Coordinate &lat{GridDefaultLatt()};
if( lat.size() == 4 && lat[0] == 4 && lat[1] == 4 && lat[2] == 4 && lat[3] == 8 ) if( lat.size() == 4 && lat[0] == 4 && lat[1] == 4 && lat[2] == 4 && lat[3] == 8 )
application.run(); application.run();
else else