diff --git a/Hadrons/Modules/MIO/LoadDistilNoise.hpp b/Hadrons/Modules/MIO/LoadDistilNoise.hpp index cf3513fe..d23a0d02 100644 --- a/Hadrons/Modules/MIO/LoadDistilNoise.hpp +++ b/Hadrons/Modules/MIO/LoadDistilNoise.hpp @@ -77,7 +77,7 @@ TLoadDistilNoise::TLoadDistilNoise(const std::string name) : Module std::vector TLoadDistilNoise::getInput(void) { - return {par().NoiseFileName, par().DistilParams}; + return {par().DistilParams}; } template diff --git a/Hadrons/Modules/MIO/LoadPerambulator.hpp b/Hadrons/Modules/MIO/LoadPerambulator.hpp index 5b7d361b..cd5a4cc8 100644 --- a/Hadrons/Modules/MIO/LoadPerambulator.hpp +++ b/Hadrons/Modules/MIO/LoadPerambulator.hpp @@ -77,7 +77,7 @@ TLoadPerambulator::TLoadPerambulator(const std::string name) : Module std::vector TLoadPerambulator::getInput(void) { - return {par().PerambFileName, par().DistilParams}; + return {par().DistilParams}; } template diff --git a/tests/hadrons/Test_distil.cc b/tests/hadrons/Test_distil.cc index 79b1fae6..0156f340 100644 --- a/tests/hadrons/Test_distil.cc +++ b/tests/hadrons/Test_distil.cc @@ -90,7 +90,7 @@ void test_LapEvec(Application &application) p.Stout.rho = 0.2; p.Cheby.PolyOrder = 11; p.Cheby.alpha = 0.55; - p.Cheby.beta = 12.5; + p.Cheby.beta = 35.5; p.Lanczos.Nvec = 5; p.Lanczos.Nk = 6; p.Lanczos.Np = 2; @@ -180,9 +180,9 @@ std::string PerambulatorName( 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; - PerambPar.PerambFileName = sModuleName; + PerambPar.PerambFileName = "Peramb"; PerambPar.DistilParams = "DPar_l"; test_Noises(application, sModuleName); // I want these written after solver stuff application.createModule( sModuleName, PerambPar ); @@ -359,30 +359,10 @@ int main(int argc, char *argv[]) test_LapEvec( application ); test_DPar( application ); test_LoadPerambulators( application ); - test_DistilVectors( application ); + test_DistilVectors( application, "_load" ); test_MesonField( application, "Phi", "phi" ); test_MesonField( application, "Rho", "rho" ); 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 static const char XmlFileName[] = "test_distil.xml";