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

fixed test_distil

Browse Source
This commit is contained in:
ferben 2019-11-18 15:29:20 +00:00
parent 13a0db7162
commit b350a24ded
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Hadrons/Modules/MIO/LoadDistilNoise.hpp
View File

@ -77,7 +77,7 @@ TLoadDistilNoise<FImpl>::TLoadDistilNoise(const std::string name) : Module<LoadD
template <typename FImpl> template <typename FImpl>
std::vector<std::string> TLoadDistilNoise<FImpl>::getInput(void) std::vector<std::string> TLoadDistilNoise<FImpl>::getInput(void)
{ {
return {par().NoiseFileName, par().DistilParams}; return {par().DistilParams};
} }
template <typename FImpl> template <typename FImpl>

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

@ -77,7 +77,7 @@ TLoadPerambulator<FImpl>::TLoadPerambulator(const std::string name) : Module<Loa
template <typename FImpl> template <typename FImpl>
std::vector<std::string> TLoadPerambulator<FImpl>::getInput(void) std::vector<std::string> TLoadPerambulator<FImpl>::getInput(void)
{ {
return {par().PerambFileName, par().DistilParams}; return {par().DistilParams};
} }
template <typename FImpl> template <typename FImpl>

28
tests/hadrons/Test_distil.cc
View File

@ -90,7 +90,7 @@ void test_LapEvec(Application &application)
p.Stout.rho = 0.2; p.Stout.rho = 0.2;
p.Cheby.PolyOrder = 11; p.Cheby.PolyOrder = 11;
p.Cheby.alpha = 0.55; p.Cheby.alpha = 0.55;
p.Cheby.beta = 12.5; p.Cheby.beta = 35.5;
p.Lanczos.Nvec = 5; p.Lanczos.Nvec = 5;
p.Lanczos.Nk = 6; p.Lanczos.Nk = 6;
p.Lanczos.Np = 2; p.Lanczos.Np = 2;
@ -180,9 +180,9 @@ std::string PerambulatorName( const char * pszSuffix = nullptr )
void test_LoadPerambulators( Application &application, const char * pszSuffix = nullptr ) void test_LoadPerambulators( Application &application, const char * pszSuffix = nullptr )
{ {
std::string sModuleName{ PerambulatorName( pszSuffix ) }; std::string sModuleName{ "Peramb_load" };
MIO::LoadPerambulator::Par PerambPar; MIO::LoadPerambulator::Par PerambPar;
PerambPar.PerambFileName = sModuleName; PerambPar.PerambFileName = "Peramb";
PerambPar.DistilParams = "DPar_l"; PerambPar.DistilParams = "DPar_l";
test_Noises(application, sModuleName); // I want these written after solver stuff test_Noises(application, sModuleName); // I want these written after solver stuff
application.createModule<MIO::LoadPerambulator>( sModuleName, PerambPar ); application.createModule<MIO::LoadPerambulator>( sModuleName, PerambPar );
@ -359,30 +359,10 @@ int main(int argc, char *argv[])
test_LapEvec( application ); test_LapEvec( application );
test_DPar( application ); test_DPar( application );
test_LoadPerambulators( application ); test_LoadPerambulators( application );
test_DistilVectors( application ); test_DistilVectors( application, "_load" );
test_MesonField( application, "Phi", "phi" ); test_MesonField( application, "Phi", "phi" );
test_MesonField( application, "Rho", "rho" ); test_MesonField( application, "Rho", "rho" );
break; break;
case 2:
LOG(Message) << "Computing Meson 2pt-function for two quark flavours" << std::endl;
test_Global( application );
test_LapEvec( application );
test_DPar( application );
test_Perambulators( application );
test_DistilVectors( application );
test_Perambulators( application, "S" );
test_DistilVectors( application, "S" );
test_MesonField( application, "SPhi", "S_phi" );
test_MesonField( application, "SRho", "S_rho" );
break;
case 3:
LOG(Message) << "Computing Meson 2pt-function with current insertion" << std::endl;
test_Global( application );
test_LapEvec( application );
test_DPar( application );
test_Perambulators( application );
test_MesonSink( application );
break;
} }
// execution // execution
static const char XmlFileName[] = "test_distil.xml"; static const char XmlFileName[] = "test_distil.xml";