1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-26 05:35:55 +01:00

Renamed PerambLight module. Check with Felix whether Test_24 and Test_tesseract still need to be maintained

This commit is contained in:
Michael Marshall 2019-04-26 08:23:15 +01:00
parent 23a9b93cda
commit 8419fbb335
6 changed files with 243 additions and 240 deletions

View File

@ -1,80 +1,79 @@
#include <Hadrons/Modules/MScalarSUN/TrKinetic.hpp> #include <Hadrons/Modules/MContraction/WeakEye3pt.hpp>
#include <Hadrons/Modules/MScalarSUN/StochFreeField.hpp> #include <Hadrons/Modules/MContraction/Baryon.hpp>
#include <Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp> #include <Hadrons/Modules/MContraction/A2AAslashField.hpp>
#include <Hadrons/Modules/MScalarSUN/Grad.hpp> #include <Hadrons/Modules/MContraction/A2ALoop.hpp>
#include <Hadrons/Modules/MScalarSUN/TransProj.hpp> #include <Hadrons/Modules/MContraction/A2AMesonField.hpp>
#include <Hadrons/Modules/MScalarSUN/Div.hpp> #include <Hadrons/Modules/MContraction/Meson.hpp>
#include <Hadrons/Modules/MScalarSUN/TrMag.hpp> #include <Hadrons/Modules/MContraction/DiscLoop.hpp>
#include <Hadrons/Modules/MScalarSUN/Utils.hpp> #include <Hadrons/Modules/MContraction/Gamma3pt.hpp>
#include <Hadrons/Modules/MScalarSUN/EMT.hpp> #include <Hadrons/Modules/MContraction/WeakNonEye3pt.hpp>
#include <Hadrons/Modules/MScalarSUN/TwoPoint.hpp>
#include <Hadrons/Modules/MScalarSUN/TrPhi.hpp>
#include <Hadrons/Modules/MNoise/FullVolumeSpinColorDiagonal.hpp>
#include <Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp>
#include <Hadrons/Modules/MScalar/FreeProp.hpp>
#include <Hadrons/Modules/MScalar/Scalar.hpp>
#include <Hadrons/Modules/MScalar/ChargedProp.hpp>
#include <Hadrons/Modules/MIO/LoadPerambulator.hpp>
#include <Hadrons/Modules/MIO/LoadEigenPack.hpp>
#include <Hadrons/Modules/MIO/LoadA2AVectors.hpp>
#include <Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp>
#include <Hadrons/Modules/MIO/LoadCosmHol.hpp>
#include <Hadrons/Modules/MIO/LoadBinary.hpp>
#include <Hadrons/Modules/MIO/LoadNersc.hpp>
#include <Hadrons/Modules/MSink/Smear.hpp>
#include <Hadrons/Modules/MSink/Point.hpp>
#include <Hadrons/Modules/MFermion/FreeProp.hpp> #include <Hadrons/Modules/MFermion/FreeProp.hpp>
#include <Hadrons/Modules/MFermion/GaugeProp.hpp> #include <Hadrons/Modules/MFermion/GaugeProp.hpp>
#include <Hadrons/Modules/MGauge/FundtoHirep.hpp> #include <Hadrons/Modules/MSource/SeqGamma.hpp>
#include <Hadrons/Modules/MGauge/Random.hpp> #include <Hadrons/Modules/MSource/Point.hpp>
#include <Hadrons/Modules/MSource/Wall.hpp>
#include <Hadrons/Modules/MSource/Z2.hpp>
#include <Hadrons/Modules/MSource/SeqConserved.hpp>
#include <Hadrons/Modules/MSource/Momentum.hpp>
#include <Hadrons/Modules/MSink/Smear.hpp>
#include <Hadrons/Modules/MSink/Point.hpp>
#include <Hadrons/Modules/MSolver/MixedPrecisionRBPrecCG.hpp>
#include <Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp>
#include <Hadrons/Modules/MSolver/A2AAslashVectors.hpp>
#include <Hadrons/Modules/MSolver/Guesser.hpp>
#include <Hadrons/Modules/MSolver/RBPrecCG.hpp>
#include <Hadrons/Modules/MSolver/A2AVectors.hpp>
#include <Hadrons/Modules/MGauge/UnitEm.hpp>
#include <Hadrons/Modules/MGauge/StoutSmearing.hpp> #include <Hadrons/Modules/MGauge/StoutSmearing.hpp>
#include <Hadrons/Modules/MGauge/Unit.hpp> #include <Hadrons/Modules/MGauge/Unit.hpp>
#include <Hadrons/Modules/MGauge/Random.hpp>
#include <Hadrons/Modules/MGauge/GaugeFix.hpp> #include <Hadrons/Modules/MGauge/GaugeFix.hpp>
#include <Hadrons/Modules/MGauge/FundtoHirep.hpp>
#include <Hadrons/Modules/MGauge/StoutSmearing3D.hpp> #include <Hadrons/Modules/MGauge/StoutSmearing3D.hpp>
#include <Hadrons/Modules/MGauge/StochEm.hpp> #include <Hadrons/Modules/MGauge/StochEm.hpp>
#include <Hadrons/Modules/MGauge/Electrify.hpp> #include <Hadrons/Modules/MGauge/Electrify.hpp>
#include <Hadrons/Modules/MGauge/UnitEm.hpp> #include <Hadrons/Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp>
#include <Hadrons/Modules/MUtilities/RandomVectors.hpp> #include <Hadrons/Modules/MNoise/FullVolumeSpinColorDiagonal.hpp>
#include <Hadrons/Modules/MUtilities/PrecisionCast.hpp> #include <Hadrons/Modules/MUtilities/PrecisionCast.hpp>
#include <Hadrons/Modules/MDistil/Noises.hpp> #include <Hadrons/Modules/MUtilities/RandomVectors.hpp>
#include <Hadrons/Modules/MDistil/PerambLight.hpp> #include <Hadrons/Modules/MScalar/FreeProp.hpp>
#include <Hadrons/Distil.hpp> #include <Hadrons/Modules/MScalar/Scalar.hpp>
#include <Hadrons/Modules/MDistil/BC2.hpp> #include <Hadrons/Modules/MScalar/ChargedProp.hpp>
#include <Hadrons/Modules/MDistil/g5_multiply.hpp>
#include <Hadrons/Modules/MDistil/PerambFromSolve.hpp>
#include <Hadrons/Modules/MDistil/Baryon2pt.hpp>
#include <Hadrons/Modules/MDistil/LapEvec.hpp>
#include <Hadrons/Modules/MDistil/DistilSource.hpp> #include <Hadrons/Modules/MDistil/DistilSource.hpp>
#include <Hadrons/Modules/MDistil/BContraction.hpp> #include <Hadrons/Modules/MDistil/LapEvec.hpp>
#include <Hadrons/Modules/MDistil/DistilVectors.hpp> #include <Hadrons/Modules/MDistil/DistilVectors.hpp>
#include <Hadrons/Modules/MDistil/DistilSink.hpp> #include <Hadrons/Modules/MDistil/DistilSink.hpp>
#include <Hadrons/Modules/MSource/SeqConserved.hpp> #include <Hadrons/Modules/MDistil/Noises.hpp>
#include <Hadrons/Modules/MSource/Z2.hpp> #include <Hadrons/Modules/MDistil/BC2.hpp>
#include <Hadrons/Modules/MSource/Wall.hpp> #include <Hadrons/Modules/MDistil/Perambulator.hpp>
#include <Hadrons/Modules/MSource/SeqGamma.hpp> #include <Hadrons/Modules/MDistil/PerambFromSolve.hpp>
#include <Hadrons/Modules/MSource/Point.hpp> #include <Hadrons/Modules/MDistil/BContraction.hpp>
#include <Hadrons/Modules/MSource/Momentum.hpp> #include <Hadrons/Modules/MDistil/Baryon2pt.hpp>
#include <Hadrons/Modules/MContraction/A2AAslashField.hpp> #include <Hadrons/Modules/MDistil/g5_multiply.hpp>
#include <Hadrons/Modules/MContraction/WeakEye3pt.hpp>
#include <Hadrons/Modules/MContraction/WeakNonEye3pt.hpp>
#include <Hadrons/Modules/MContraction/Baryon.hpp>
#include <Hadrons/Modules/MContraction/Meson.hpp>
#include <Hadrons/Modules/MContraction/A2ALoop.hpp>
#include <Hadrons/Modules/MContraction/Gamma3pt.hpp>
#include <Hadrons/Modules/MContraction/DiscLoop.hpp>
#include <Hadrons/Modules/MContraction/A2AMesonField.hpp>
#include <Hadrons/Modules/MAction/WilsonClover.hpp>
#include <Hadrons/Modules/MAction/ScaledDWF.hpp>
#include <Hadrons/Modules/MAction/MobiusDWF.hpp>
#include <Hadrons/Modules/MAction/Wilson.hpp>
#include <Hadrons/Modules/MAction/DWF.hpp>
#include <Hadrons/Modules/MAction/ZMobiusDWF.hpp>
#include <Hadrons/Modules/MSolver/RBPrecCG.hpp>
#include <Hadrons/Modules/MSolver/LocalCoherenceLanczos.hpp>
#include <Hadrons/Modules/MSolver/A2AVectors.hpp>
#include <Hadrons/Modules/MSolver/MixedPrecisionRBPrecCG.hpp>
#include <Hadrons/Modules/MSolver/Guesser.hpp>
#include <Hadrons/Modules/MSolver/A2AAslashVectors.hpp>
#include <Hadrons/Modules/MNPR/FourQuark.hpp>
#include <Hadrons/Modules/MNPR/Bilinear.hpp> #include <Hadrons/Modules/MNPR/Bilinear.hpp>
#include <Hadrons/Modules/MNPR/Amputate.hpp> #include <Hadrons/Modules/MNPR/Amputate.hpp>
#include <Hadrons/Modules/MNPR/FourQuark.hpp>
#include <Hadrons/Modules/MAction/DWF.hpp>
#include <Hadrons/Modules/MAction/MobiusDWF.hpp>
#include <Hadrons/Modules/MAction/Wilson.hpp>
#include <Hadrons/Modules/MAction/WilsonClover.hpp>
#include <Hadrons/Modules/MAction/ZMobiusDWF.hpp>
#include <Hadrons/Modules/MAction/ScaledDWF.hpp>
#include <Hadrons/Modules/MScalarSUN/StochFreeField.hpp>
#include <Hadrons/Modules/MScalarSUN/TwoPointNPR.hpp>
#include <Hadrons/Modules/MScalarSUN/Div.hpp>
#include <Hadrons/Modules/MScalarSUN/TrMag.hpp>
#include <Hadrons/Modules/MScalarSUN/EMT.hpp>
#include <Hadrons/Modules/MScalarSUN/TwoPoint.hpp>
#include <Hadrons/Modules/MScalarSUN/TrPhi.hpp>
#include <Hadrons/Modules/MScalarSUN/Utils.hpp>
#include <Hadrons/Modules/MScalarSUN/TransProj.hpp>
#include <Hadrons/Modules/MScalarSUN/Grad.hpp>
#include <Hadrons/Modules/MScalarSUN/TrKinetic.hpp>
#include <Hadrons/Modules/MIO/LoadEigenPack.hpp>
#include <Hadrons/Modules/MIO/LoadNersc.hpp>
#include <Hadrons/Modules/MIO/LoadPerambulator.hpp>
#include <Hadrons/Modules/MIO/LoadA2AVectors.hpp>
#include <Hadrons/Modules/MIO/LoadCosmHol.hpp>
#include <Hadrons/Modules/MIO/LoadCoarseEigenPack.hpp>
#include <Hadrons/Modules/MIO/LoadBinary.hpp>

View File

@ -2,7 +2,7 @@
Grid physics library, www.github.com/paboyle/Grid Grid physics library, www.github.com/paboyle/Grid
Source file: Hadrons/Modules/MDistil/PerambLight.cc Source file: Hadrons/Modules/MDistil/Perambulator.cc
Copyright (C) 2019 Copyright (C) 2019
@ -27,10 +27,10 @@
*************************************************************************************/ *************************************************************************************/
/* END LEGAL */ /* END LEGAL */
#include <Hadrons/Modules/MDistil/PerambLight.hpp> #include <Hadrons/Modules/MDistil/Perambulator.hpp>
using namespace Grid; using namespace Grid;
using namespace Hadrons; using namespace Hadrons;
using namespace MDistil; using namespace MDistil;
template class Grid::Hadrons::MDistil::TPerambLight<FIMPL>; template class Grid::Hadrons::MDistil::TPerambulator<FIMPL>;

View File

@ -2,7 +2,7 @@
Grid physics library, www.github.com/paboyle/Grid Grid physics library, www.github.com/paboyle/Grid
Source file: Hadrons/Modules/MDistil/PerambLight.hpp Source file: Hadrons/Modules/MDistil/Perambulator.hpp
Copyright (C) 2019 Copyright (C) 2019
@ -27,8 +27,8 @@
*************************************************************************************/ *************************************************************************************/
/* END LEGAL */ /* END LEGAL */
#ifndef Hadrons_MDistil_PerambLight_hpp_ #ifndef Hadrons_MDistil_Perambulator_hpp_
#define Hadrons_MDistil_PerambLight_hpp_ #define Hadrons_MDistil_Perambulator_hpp_
#include <Hadrons/Global.hpp> #include <Hadrons/Global.hpp>
#include <Hadrons/Module.hpp> #include <Hadrons/Module.hpp>
@ -45,14 +45,14 @@ BEGIN_HADRONS_NAMESPACE
/****************************************************************************** /******************************************************************************
* PerambLight * * Perambulator *
******************************************************************************/ ******************************************************************************/
BEGIN_MODULE_NAMESPACE(MDistil) BEGIN_MODULE_NAMESPACE(MDistil)
class PerambLightPar: Serializable class PerambulatorPar: Serializable
{ {
public: public:
GRID_SERIALIZABLE_CLASS_MEMBERS(PerambLightPar, GRID_SERIALIZABLE_CLASS_MEMBERS(PerambulatorPar,
std::string, eigenPack, std::string, eigenPack,
std::string, noise, std::string, noise,
std::string, PerambFileName, //stem!!! std::string, PerambFileName, //stem!!!
@ -64,15 +64,15 @@ public:
}; };
template <typename FImpl> template <typename FImpl>
class TPerambLight: public Module<PerambLightPar> class TPerambulator: public Module<PerambulatorPar>
{ {
public: public:
FERM_TYPE_ALIASES(FImpl,); FERM_TYPE_ALIASES(FImpl,);
SOLVER_TYPE_ALIASES(FImpl,); SOLVER_TYPE_ALIASES(FImpl,);
// constructor // constructor
TPerambLight(const std::string name); TPerambulator(const std::string name);
// destructor // destructor
virtual ~TPerambLight(void); virtual ~TPerambulator(void);
// dependency relation // dependency relation
virtual std::vector<std::string> getInput(void); virtual std::vector<std::string> getInput(void);
virtual std::vector<std::string> getOutput(void); virtual std::vector<std::string> getOutput(void);
@ -90,27 +90,28 @@ private:
unsigned int Ls_; unsigned int Ls_;
}; };
MODULE_REGISTER_TMP(PerambLight, TPerambLight<FIMPL>, MDistil); // Can't name the module Perambulator, because that's what we've called the object
MODULE_REGISTER_TMP(Peramb, TPerambulator<FIMPL>, MDistil);
/****************************************************************************** /******************************************************************************
* TPerambLight implementation * * TPerambulator implementation *
******************************************************************************/ ******************************************************************************/
// constructor ///////////////////////////////////////////////////////////////// // constructor /////////////////////////////////////////////////////////////////
template <typename FImpl> template <typename FImpl>
TPerambLight<FImpl>::TPerambLight(const std::string name) TPerambulator<FImpl>::TPerambulator(const std::string name)
: grid3d{nullptr}, grid4d{nullptr}, Module<PerambLightPar>(name) : grid3d{nullptr}, grid4d{nullptr}, Module<PerambulatorPar>(name)
{} {}
// destructor // destructor
template <typename FImpl> template <typename FImpl>
TPerambLight<FImpl>::~TPerambLight(void) TPerambulator<FImpl>::~TPerambulator(void)
{ {
Cleanup(); Cleanup();
}; };
// dependencies/products /////////////////////////////////////////////////////// // dependencies/products ///////////////////////////////////////////////////////
template <typename FImpl> template <typename FImpl>
std::vector<std::string> TPerambLight<FImpl>::getInput(void) std::vector<std::string> TPerambulator<FImpl>::getInput(void)
{ {
std::vector<std::string> in; std::vector<std::string> in;
@ -122,7 +123,7 @@ std::vector<std::string> TPerambLight<FImpl>::getInput(void)
} }
template <typename FImpl> template <typename FImpl>
std::vector<std::string> TPerambLight<FImpl>::getOutput(void) std::vector<std::string> TPerambulator<FImpl>::getOutput(void)
{ {
std::vector<std::string> out = {getName(),getName() + "_unsmeared_sink"}; std::vector<std::string> out = {getName(),getName() + "_unsmeared_sink"};
@ -131,7 +132,7 @@ std::vector<std::string> TPerambLight<FImpl>::getOutput(void)
// setup /////////////////////////////////////////////////////////////////////// // setup ///////////////////////////////////////////////////////////////////////
template <typename FImpl> template <typename FImpl>
void TPerambLight<FImpl>::setup(void) void TPerambulator<FImpl>::setup(void)
{ {
Cleanup(); Cleanup();
@ -169,7 +170,7 @@ void TPerambLight<FImpl>::setup(void)
// clean up any temporaries created by setup (that aren't stored in the environment) // clean up any temporaries created by setup (that aren't stored in the environment)
template <typename FImpl> template <typename FImpl>
void TPerambLight<FImpl>::Cleanup(void) void TPerambulator<FImpl>::Cleanup(void)
{ {
if( grid3d != nullptr ) { if( grid3d != nullptr ) {
delete grid3d; delete grid3d;
@ -180,7 +181,7 @@ void TPerambLight<FImpl>::Cleanup(void)
// execution /////////////////////////////////////////////////////////////////// // execution ///////////////////////////////////////////////////////////////////
template <typename FImpl> template <typename FImpl>
void TPerambLight<FImpl>::execute(void) void TPerambulator<FImpl>::execute(void)
{ {
const int nvec{par().nvec}; const int nvec{par().nvec};
const DistilParameters & Distil{par().Distil}; const DistilParameters & Distil{par().Distil};
@ -293,4 +294,4 @@ END_MODULE_NAMESPACE
END_HADRONS_NAMESPACE END_HADRONS_NAMESPACE
#endif // Hadrons_MDistil_PerambLight_hpp_ #endif // Hadrons_MDistil_Perambulator_hpp_

View File

@ -1,160 +1,159 @@
modules_cc =\ modules_cc =\
Modules/MScalarSUN/Grad.cc \ Modules/MContraction/Baryon.cc \
Modules/MScalarSUN/TwoPointNPR.cc \ Modules/MContraction/Meson.cc \
Modules/MScalarSUN/Div.cc \ Modules/MContraction/WeakEye3pt.cc \
Modules/MScalarSUN/TrMag.cc \ Modules/MContraction/A2ALoop.cc \
Modules/MScalarSUN/TransProj.cc \ Modules/MContraction/WeakNonEye3pt.cc \
Modules/MScalarSUN/TwoPoint.cc \ Modules/MContraction/A2AAslashField.cc \
Modules/MScalarSUN/TrKinetic.cc \ Modules/MContraction/A2AMesonField.cc \
Modules/MScalarSUN/TrPhi.cc \ Modules/MContraction/DiscLoop.cc \
Modules/MScalarSUN/EMT.cc \ Modules/MContraction/Gamma3pt.cc \
Modules/MScalarSUN/StochFreeField.cc \
Modules/MNoise/FullVolumeSpinColorDiagonal.cc \
Modules/MNoise/TimeDilutedSpinColorDiagonal.cc \
Modules/MScalar/FreeProp.cc \
Modules/MScalar/ChargedProp.cc \
Modules/MIO/LoadBinary.cc \
Modules/MIO/LoadCosmHol.cc \
Modules/MIO/LoadCoarseEigenPack.cc \
Modules/MIO/LoadNersc.cc \
Modules/MIO/LoadEigenPack.cc \
Modules/MIO/LoadA2AVectors.cc \
Modules/MIO/LoadPerambulator.cc \
Modules/MSink/Smear.cc \
Modules/MSink/Point.cc \
Modules/MFermion/FreeProp.cc \ Modules/MFermion/FreeProp.cc \
Modules/MFermion/GaugeProp.cc \ Modules/MFermion/GaugeProp.cc \
Modules/MGauge/Random.cc \
Modules/MGauge/StoutSmearing3D.cc \
Modules/MGauge/StochEm.cc \
Modules/MGauge/StoutSmearing.cc \
Modules/MGauge/Unit.cc \
Modules/MGauge/Electrify.cc \
Modules/MGauge/UnitEm.cc \
Modules/MGauge/FundtoHirep.cc \
Modules/MGauge/GaugeFix.cc \
Modules/MUtilities/RandomVectors.cc \
Modules/MUtilities/PrecisionCast.cc \
Modules/MDistil/PerambFromSolve.cc \
Modules/MDistil/g5_multiply.cc \
Modules/MDistil/LapEvec.cc \
Modules/MDistil/Noises.cc \
Modules/MDistil/DistilSource.cc \
Modules/MDistil/DistilVectors.cc \
Modules/MDistil/BContraction.cc \
Modules/MDistil/Baryon2pt.cc \
Modules/MDistil/BC2.cc \
Modules/MDistil/PerambLight.cc \
Modules/MDistil/DistilSink.cc \
Modules/MSource/Momentum.cc \ Modules/MSource/Momentum.cc \
Modules/MSource/Z2.cc \
Modules/MSource/Point.cc \ Modules/MSource/Point.cc \
Modules/MSource/SeqGamma.cc \
Modules/MSource/Wall.cc \ Modules/MSource/Wall.cc \
Modules/MSource/SeqConserved.cc \ Modules/MSource/SeqConserved.cc \
Modules/MContraction/WeakEye3pt.cc \ Modules/MSource/SeqGamma.cc \
Modules/MContraction/Meson.cc \ Modules/MSource/Z2.cc \
Modules/MContraction/A2AAslashField.cc \ Modules/MSink/Point.cc \
Modules/MContraction/Baryon.cc \ Modules/MSink/Smear.cc \
Modules/MContraction/WeakNonEye3pt.cc \
Modules/MContraction/DiscLoop.cc \
Modules/MContraction/A2AMesonField.cc \
Modules/MContraction/A2ALoop.cc \
Modules/MContraction/Gamma3pt.cc \
Modules/MAction/MobiusDWF.cc \
Modules/MAction/WilsonClover.cc \
Modules/MAction/Wilson.cc \
Modules/MAction/DWF.cc \
Modules/MAction/ScaledDWF.cc \
Modules/MAction/ZMobiusDWF.cc \
Modules/MSolver/A2AVectors.cc \ Modules/MSolver/A2AVectors.cc \
Modules/MSolver/RBPrecCG.cc \
Modules/MSolver/LocalCoherenceLanczos.cc \
Modules/MSolver/MixedPrecisionRBPrecCG.cc \
Modules/MSolver/A2AAslashVectors.cc \ Modules/MSolver/A2AAslashVectors.cc \
Modules/MSolver/RBPrecCG.cc \
Modules/MSolver/MixedPrecisionRBPrecCG.cc \
Modules/MSolver/LocalCoherenceLanczos.cc \
Modules/MGauge/StoutSmearing.cc \
Modules/MGauge/Unit.cc \
Modules/MGauge/UnitEm.cc \
Modules/MGauge/StochEm.cc \
Modules/MGauge/Random.cc \
Modules/MGauge/Electrify.cc \
Modules/MGauge/StoutSmearing3D.cc \
Modules/MGauge/FundtoHirep.cc \
Modules/MGauge/GaugeFix.cc \
Modules/MNoise/FullVolumeSpinColorDiagonal.cc \
Modules/MNoise/TimeDilutedSpinColorDiagonal.cc \
Modules/MUtilities/RandomVectors.cc \
Modules/MUtilities/PrecisionCast.cc \
Modules/MScalar/FreeProp.cc \
Modules/MScalar/ChargedProp.cc \
Modules/MDistil/DistilVectors.cc \
Modules/MDistil/g5_multiply.cc \
Modules/MDistil/BC2.cc \
Modules/MDistil/Noises.cc \
Modules/MDistil/BContraction.cc \
Modules/MDistil/DistilSource.cc \
Modules/MDistil/LapEvec.cc \
Modules/MDistil/DistilSink.cc \
Modules/MDistil/Baryon2pt.cc \
Modules/MDistil/Perambulator.cc \
Modules/MDistil/PerambFromSolve.cc \
Modules/MNPR/Amputate.cc \
Modules/MNPR/Bilinear.cc \ Modules/MNPR/Bilinear.cc \
Modules/MNPR/FourQuark.cc \ Modules/MNPR/FourQuark.cc \
Modules/MNPR/Amputate.cc Modules/MAction/Wilson.cc \
Modules/MAction/MobiusDWF.cc \
Modules/MAction/ZMobiusDWF.cc \
Modules/MAction/WilsonClover.cc \
Modules/MAction/DWF.cc \
Modules/MAction/ScaledDWF.cc \
Modules/MScalarSUN/TrPhi.cc \
Modules/MScalarSUN/Grad.cc \
Modules/MScalarSUN/TrMag.cc \
Modules/MScalarSUN/TrKinetic.cc \
Modules/MScalarSUN/EMT.cc \
Modules/MScalarSUN/TransProj.cc \
Modules/MScalarSUN/StochFreeField.cc \
Modules/MScalarSUN/TwoPoint.cc \
Modules/MScalarSUN/TwoPointNPR.cc \
Modules/MScalarSUN/Div.cc \
Modules/MIO/LoadEigenPack.cc \
Modules/MIO/LoadBinary.cc \
Modules/MIO/LoadPerambulator.cc \
Modules/MIO/LoadNersc.cc \
Modules/MIO/LoadCoarseEigenPack.cc \
Modules/MIO/LoadCosmHol.cc \
Modules/MIO/LoadA2AVectors.cc
modules_hpp =\ modules_hpp =\
Modules/MScalarSUN/TrKinetic.hpp \ Modules/MContraction/WeakEye3pt.hpp \
Modules/MScalarSUN/StochFreeField.hpp \ Modules/MContraction/Baryon.hpp \
Modules/MScalarSUN/TwoPointNPR.hpp \ Modules/MContraction/A2AAslashField.hpp \
Modules/MScalarSUN/Grad.hpp \ Modules/MContraction/A2ALoop.hpp \
Modules/MScalarSUN/TransProj.hpp \ Modules/MContraction/A2AMesonField.hpp \
Modules/MScalarSUN/Div.hpp \ Modules/MContraction/Meson.hpp \
Modules/MScalarSUN/TrMag.hpp \ Modules/MContraction/DiscLoop.hpp \
Modules/MScalarSUN/Utils.hpp \ Modules/MContraction/Gamma3pt.hpp \
Modules/MScalarSUN/EMT.hpp \ Modules/MContraction/WeakNonEye3pt.hpp \
Modules/MScalarSUN/TwoPoint.hpp \
Modules/MScalarSUN/TrPhi.hpp \
Modules/MNoise/FullVolumeSpinColorDiagonal.hpp \
Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp \
Modules/MScalar/FreeProp.hpp \
Modules/MScalar/Scalar.hpp \
Modules/MScalar/ChargedProp.hpp \
Modules/MIO/LoadPerambulator.hpp \
Modules/MIO/LoadEigenPack.hpp \
Modules/MIO/LoadA2AVectors.hpp \
Modules/MIO/LoadCoarseEigenPack.hpp \
Modules/MIO/LoadCosmHol.hpp \
Modules/MIO/LoadBinary.hpp \
Modules/MIO/LoadNersc.hpp \
Modules/MSink/Smear.hpp \
Modules/MSink/Point.hpp \
Modules/MFermion/FreeProp.hpp \ Modules/MFermion/FreeProp.hpp \
Modules/MFermion/GaugeProp.hpp \ Modules/MFermion/GaugeProp.hpp \
Modules/MGauge/FundtoHirep.hpp \ Modules/MSource/SeqGamma.hpp \
Modules/MGauge/Random.hpp \ Modules/MSource/Point.hpp \
Modules/MSource/Wall.hpp \
Modules/MSource/Z2.hpp \
Modules/MSource/SeqConserved.hpp \
Modules/MSource/Momentum.hpp \
Modules/MSink/Smear.hpp \
Modules/MSink/Point.hpp \
Modules/MSolver/MixedPrecisionRBPrecCG.hpp \
Modules/MSolver/LocalCoherenceLanczos.hpp \
Modules/MSolver/A2AAslashVectors.hpp \
Modules/MSolver/Guesser.hpp \
Modules/MSolver/RBPrecCG.hpp \
Modules/MSolver/A2AVectors.hpp \
Modules/MGauge/UnitEm.hpp \
Modules/MGauge/StoutSmearing.hpp \ Modules/MGauge/StoutSmearing.hpp \
Modules/MGauge/Unit.hpp \ Modules/MGauge/Unit.hpp \
Modules/MGauge/Random.hpp \
Modules/MGauge/GaugeFix.hpp \ Modules/MGauge/GaugeFix.hpp \
Modules/MGauge/FundtoHirep.hpp \
Modules/MGauge/StoutSmearing3D.hpp \ Modules/MGauge/StoutSmearing3D.hpp \
Modules/MGauge/StochEm.hpp \ Modules/MGauge/StochEm.hpp \
Modules/MGauge/Electrify.hpp \ Modules/MGauge/Electrify.hpp \
Modules/MGauge/UnitEm.hpp \ Modules/MNoise/TimeDilutedSpinColorDiagonal.hpp \
Modules/MUtilities/RandomVectors.hpp \ Modules/MNoise/FullVolumeSpinColorDiagonal.hpp \
Modules/MUtilities/PrecisionCast.hpp \ Modules/MUtilities/PrecisionCast.hpp \
Modules/MDistil/Noises.hpp \ Modules/MUtilities/RandomVectors.hpp \
Modules/MDistil/PerambLight.hpp \ Modules/MScalar/FreeProp.hpp \
Modules/MDistil/Distil.hpp \ Modules/MScalar/Scalar.hpp \
Modules/MDistil/BC2.hpp \ Modules/MScalar/ChargedProp.hpp \
Modules/MDistil/g5_multiply.hpp \
Modules/MDistil/PerambFromSolve.hpp \
Modules/MDistil/Baryon2pt.hpp \
Modules/MDistil/LapEvec.hpp \
Modules/MDistil/DistilSource.hpp \ Modules/MDistil/DistilSource.hpp \
Modules/MDistil/BContraction.hpp \ Modules/MDistil/LapEvec.hpp \
Modules/MDistil/DistilVectors.hpp \ Modules/MDistil/DistilVectors.hpp \
Modules/MDistil/DistilSink.hpp \ Modules/MDistil/DistilSink.hpp \
Modules/MSource/SeqConserved.hpp \ Modules/MDistil/Noises.hpp \
Modules/MSource/Z2.hpp \ Modules/MDistil/BC2.hpp \
Modules/MSource/Wall.hpp \ Modules/MDistil/Perambulator.hpp \
Modules/MSource/SeqGamma.hpp \ Modules/MDistil/PerambFromSolve.hpp \
Modules/MSource/Point.hpp \ Modules/MDistil/BContraction.hpp \
Modules/MSource/Momentum.hpp \ Modules/MDistil/Baryon2pt.hpp \
Modules/MContraction/A2AAslashField.hpp \ Modules/MDistil/g5_multiply.hpp \
Modules/MContraction/WeakEye3pt.hpp \ Modules/MNPR/Bilinear.hpp \
Modules/MContraction/WeakNonEye3pt.hpp \ Modules/MNPR/Amputate.hpp \
Modules/MContraction/Baryon.hpp \ Modules/MNPR/FourQuark.hpp \
Modules/MContraction/Meson.hpp \ Modules/MAction/DWF.hpp \
Modules/MContraction/A2ALoop.hpp \
Modules/MContraction/Gamma3pt.hpp \
Modules/MContraction/DiscLoop.hpp \
Modules/MContraction/A2AMesonField.hpp \
Modules/MAction/WilsonClover.hpp \
Modules/MAction/ScaledDWF.hpp \
Modules/MAction/MobiusDWF.hpp \ Modules/MAction/MobiusDWF.hpp \
Modules/MAction/Wilson.hpp \ Modules/MAction/Wilson.hpp \
Modules/MAction/DWF.hpp \ Modules/MAction/WilsonClover.hpp \
Modules/MAction/ZMobiusDWF.hpp \ Modules/MAction/ZMobiusDWF.hpp \
Modules/MSolver/RBPrecCG.hpp \ Modules/MAction/ScaledDWF.hpp \
Modules/MSolver/LocalCoherenceLanczos.hpp \ Modules/MScalarSUN/StochFreeField.hpp \
Modules/MSolver/A2AVectors.hpp \ Modules/MScalarSUN/TwoPointNPR.hpp \
Modules/MSolver/MixedPrecisionRBPrecCG.hpp \ Modules/MScalarSUN/Div.hpp \
Modules/MSolver/Guesser.hpp \ Modules/MScalarSUN/TrMag.hpp \
Modules/MSolver/A2AAslashVectors.hpp \ Modules/MScalarSUN/EMT.hpp \
Modules/MNPR/FourQuark.hpp \ Modules/MScalarSUN/TwoPoint.hpp \
Modules/MNPR/Bilinear.hpp \ Modules/MScalarSUN/TrPhi.hpp \
Modules/MNPR/Amputate.hpp Modules/MScalarSUN/Utils.hpp \
Modules/MScalarSUN/TransProj.hpp \
Modules/MScalarSUN/Grad.hpp \
Modules/MScalarSUN/TrKinetic.hpp \
Modules/MIO/LoadEigenPack.hpp \
Modules/MIO/LoadNersc.hpp \
Modules/MIO/LoadPerambulator.hpp \
Modules/MIO/LoadA2AVectors.hpp \
Modules/MIO/LoadCosmHol.hpp \
Modules/MIO/LoadCoarseEigenPack.hpp \
Modules/MIO/LoadBinary.hpp

View File

@ -91,7 +91,7 @@ void test_LapEvec(Application &application)
void test_Perambulators(Application &application) void test_Perambulators(Application &application)
{ {
// PerambLight parameters // PerambLight parameters
MDistil::PerambLight::Par PerambPar; MDistil::Peramb::Par PerambPar;
PerambPar.eigenPack="LapEvec"; PerambPar.eigenPack="LapEvec";
PerambPar.PerambFileName="peramb_" + std::to_string(Nconf) + ".bin"; PerambPar.PerambFileName="peramb_" + std::to_string(Nconf) + ".bin";
PerambPar.ConfigFileDir="/home/dp008/dp008/dc-rich6/Scripts/ConfigsDeflQED/"; PerambPar.ConfigFileDir="/home/dp008/dp008/dc-rich6/Scripts/ConfigsDeflQED/";
@ -111,7 +111,7 @@ void test_Perambulators(Application &application)
PerambPar.Ls=16; PerambPar.Ls=16;
PerambPar.Solver.CGPrecision=1e-7; PerambPar.Solver.CGPrecision=1e-7;
PerambPar.Solver.MaxIterations=10000; PerambPar.Solver.MaxIterations=10000;
application.createModule<MDistil::PerambLight>("Peramb",PerambPar); application.createModule<MDistil::Peramb>("Peramb",PerambPar);
} }
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
// DistilVectors // DistilVectors
@ -122,7 +122,8 @@ void test_DistilVectors(Application &application)
// DistilVectors parameters // DistilVectors parameters
MDistil::DistilVectors::Par DistilVecPar; MDistil::DistilVectors::Par DistilVecPar;
DistilVecPar.noise="Peramb_noise"; DistilVecPar.noise="Peramb_noise";
DistilVecPar.perambulator="Peramb_perambulator_light"; //DistilVecPar.perambulator="Peramb_perambulator_light";
DistilVecPar.perambulator="Peramb";
DistilVecPar.eigenPack="LapEvec"; DistilVecPar.eigenPack="LapEvec";
DistilVecPar.tsrc = 0; DistilVecPar.tsrc = 0;
DistilVecPar.nnoise = 1; DistilVecPar.nnoise = 1;
@ -137,8 +138,8 @@ void test_DistilVectors(Application &application)
} }
void test_PerambulatorsS(Application &application) void test_PerambulatorsS(Application &application)
{ {
// PerambLight parameters // Peramb parameters
MDistil::PerambLight::Par PerambPar; MDistil::Peramb::Par PerambPar;
PerambPar.eigenPack="LapEvec"; PerambPar.eigenPack="LapEvec";
PerambPar.PerambFileName="perambS.bin"; PerambPar.PerambFileName="perambS.bin";
PerambPar.ConfigFileDir="/home/dp008/dp008/paboyle/A2A/run/"; PerambPar.ConfigFileDir="/home/dp008/dp008/paboyle/A2A/run/";
@ -158,7 +159,7 @@ void test_PerambulatorsS(Application &application)
PerambPar.Ls=16; PerambPar.Ls=16;
PerambPar.Solver.CGPrecision=1e-8; PerambPar.Solver.CGPrecision=1e-8;
PerambPar.Solver.MaxIterations=10000; PerambPar.Solver.MaxIterations=10000;
application.createModule<MDistil::PerambLight>("PerambS",PerambPar); application.createModule<MDistil::Peramb>("PerambS",PerambPar);
} }
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
// DistilVectors // DistilVectors
@ -169,7 +170,8 @@ void test_DistilVectorsS(Application &application)
// DistilVectors parameters // DistilVectors parameters
MDistil::DistilVectors::Par DistilVecPar; MDistil::DistilVectors::Par DistilVecPar;
DistilVecPar.noise="PerambS_noise"; DistilVecPar.noise="PerambS_noise";
DistilVecPar.perambulator="PerambS_perambulator_light"; //DistilVecPar.perambulator="PerambS_perambulator_light";
DistilVecPar.perambulator="PerambS";
DistilVecPar.eigenPack="LapEvec"; DistilVecPar.eigenPack="LapEvec";
DistilVecPar.tsrc = 0; DistilVecPar.tsrc = 0;
DistilVecPar.nnoise = 1; DistilVecPar.nnoise = 1;

View File

@ -123,8 +123,8 @@ void test_LapEvec(Application &application)
void test_Perambulators(Application &application) void test_Perambulators(Application &application)
{ {
// PerambLight parameters // Perambulator parameters
MDistil::PerambLight::Par PerambPar; MDistil::Peramb::Par PerambPar;
PerambPar.eigenPack="LapEvec"; PerambPar.eigenPack="LapEvec";
PerambPar.noise="Peramb_noise"; PerambPar.noise="Peramb_noise";
PerambPar.PerambFileName="peramb.bin"; PerambPar.PerambFileName="peramb.bin";
@ -144,7 +144,7 @@ void test_Perambulators(Application &application)
//PerambPar.Ls=16; //PerambPar.Ls=16;
//PerambPar.Solver.CGPrecision=1e-8; //PerambPar.Solver.CGPrecision=1e-8;
//PerambPar.Solver.MaxIterations=10000; //PerambPar.Solver.MaxIterations=10000;
application.createModule<MDistil::PerambLight>("Peramb",PerambPar); application.createModule<MDistil::Peramb>("Peramb",PerambPar);
} }
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
// Multiple Perambulators // Multiple Perambulators
@ -152,8 +152,8 @@ void test_Perambulators(Application &application)
void test_MultiPerambulators(Application &application) void test_MultiPerambulators(Application &application)
{ {
// PerambLight parameters // Perambulator parameters
MDistil::PerambLight::Par PerambPar; MDistil::Peramb::Par PerambPar;
PerambPar.eigenPack="LapEvec"; PerambPar.eigenPack="LapEvec";
PerambPar.UniqueIdentifier="full_dilution"; PerambPar.UniqueIdentifier="full_dilution";
PerambPar.PerambFileName="Peramb5"; PerambPar.PerambFileName="Peramb5";
@ -167,7 +167,7 @@ void test_MultiPerambulators(Application &application)
PerambPar.Distil.Ns=4; PerambPar.Distil.Ns=4;
PerambPar.Distil.Nt=8; PerambPar.Distil.Nt=8;
PerambPar.Distil.Nt_inv=1; PerambPar.Distil.Nt_inv=1;
application.createModule<MDistil::PerambLight>("Peramb5",PerambPar); application.createModule<MDistil::Peramb>("Peramb5",PerambPar);
MDistil::PerambFromSolve::Par SolvePar; MDistil::PerambFromSolve::Par SolvePar;
SolvePar.eigenPack="LapEvec"; SolvePar.eigenPack="LapEvec";
SolvePar.PerambFileName="Peramb2"; SolvePar.PerambFileName="Peramb2";
@ -205,7 +205,8 @@ void test_MultiPerambulators(Application &application)
DistilVecPar.LI=3; DistilVecPar.LI=3;
DistilVecPar.nvec=3; DistilVecPar.nvec=3;
application.createModule<MDistil::DistilVectors>("DistilVecs3",DistilVecPar); application.createModule<MDistil::DistilVectors>("DistilVecs3",DistilVecPar);
DistilVecPar.perambulator="Peramb5_perambulator_light"; //DistilVecPar.perambulator="Peramb5_perambulator_light";
DistilVecPar.perambulator="Peramb5";
DistilVecPar.LI=5; DistilVecPar.LI=5;
DistilVecPar.nvec=5; DistilVecPar.nvec=5;
application.createModule<MDistil::DistilVectors>("DistilVecs5",DistilVecPar); application.createModule<MDistil::DistilVectors>("DistilVecs5",DistilVecPar);
@ -279,8 +280,8 @@ void test_DistilVectors(Application &application)
} }
void test_PerambulatorsS(Application &application) void test_PerambulatorsS(Application &application)
{ {
// PerambLight parameters // Perambulator parameters
MDistil::PerambLight::Par PerambPar; MDistil::Peramb::Par PerambPar;
PerambPar.eigenPack="LapEvec"; PerambPar.eigenPack="LapEvec";
PerambPar.PerambFileName="perambS.bin"; PerambPar.PerambFileName="perambS.bin";
PerambPar.UniqueIdentifier="full_dilution"; PerambPar.UniqueIdentifier="full_dilution";
@ -299,7 +300,7 @@ void test_PerambulatorsS(Application &application)
//PerambPar.Ls=16; //PerambPar.Ls=16;
//PerambPar.Solver.CGPrecision=1e-8; //PerambPar.Solver.CGPrecision=1e-8;
//PerambPar.Solver.MaxIterations=10000; //PerambPar.Solver.MaxIterations=10000;
application.createModule<MDistil::PerambLight>("PerambS",PerambPar); application.createModule<MDistil::Peramb>("PerambS",PerambPar);
} }
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
// DistilVectors // DistilVectors
@ -310,7 +311,8 @@ void test_DistilVectorsS(Application &application)
// DistilVectors parameters // DistilVectors parameters
MDistil::DistilVectors::Par DistilVecPar; MDistil::DistilVectors::Par DistilVecPar;
DistilVecPar.noise="PerambS_noise"; DistilVecPar.noise="PerambS_noise";
DistilVecPar.perambulator="PerambS_perambulator_light"; //DistilVecPar.perambulator="PerambS_perambulator_light";
DistilVecPar.perambulator="PerambS";
DistilVecPar.eigenPack="LapEvec"; DistilVecPar.eigenPack="LapEvec";
DistilVecPar.tsrc = 0; DistilVecPar.tsrc = 0;
DistilVecPar.nnoise = 1; DistilVecPar.nnoise = 1;
@ -556,7 +558,7 @@ void test_AslashSeq(Application &application)
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
void test_PerambulatorsSolve(Application &application) void test_PerambulatorsSolve(Application &application)
{ {
// PerambLight parameters // Perambulator parameters
MDistil::PerambFromSolve::Par PerambFromSolvePar; MDistil::PerambFromSolve::Par PerambFromSolvePar;
PerambFromSolvePar.eigenPack="LapEvec"; PerambFromSolvePar.eigenPack="LapEvec";
PerambFromSolvePar.solve="Aslash_seq"; PerambFromSolvePar.solve="Aslash_seq";
@ -759,7 +761,7 @@ bool DebugEigenTest()
// Test initialisation of an array of strings // Test initialisation of an array of strings
for( auto a : as ) for( auto a : as )
std::cout << a << std::endl; std::cout << a << std::endl;
Grid::Hadrons::MDistil::Perambulator<Complex,3,sizeof(Real)> p{as,2,7,2}; Grid::Hadrons::MDistil::Peramb<Complex,3,sizeof(Real)> p{as,2,7,2};
DebugShowTensor(p, "p"); DebugShowTensor(p, "p");
std::cout << "p.IndexNames follow" << std::endl; std::cout << "p.IndexNames follow" << std::endl;
for( auto a : p.IndexNames ) for( auto a : p.IndexNames )