portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Stout smearing 3D fixes. Changed LapEvec to perform spatial smearing only

Browse Source
This commit is contained in:
Michael Marshall 2019-04-19 11:54:02 +01:00
parent 4a4203c610
commit 143b75956c
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Grid/qcd/smearing/StoutSmearing.h
View File

@ -44,20 +44,20 @@ class Smear_Stout : public Smear<Gimpl> {
// Smear<Gimpl>* ownership semantics: // Smear<Gimpl>* ownership semantics:
// Smear<Gimpl>* passed in to constructor are owned by caller, so we don't delete them here // Smear<Gimpl>* passed in to constructor are owned by caller, so we don't delete them here
// Smear<Gimpl>* created within constructor need to be deleted as part of the destructor // Smear<Gimpl>* created within constructor need to be deleted as part of the destructor
const Smear<Gimpl>* SmearBase; // Not owned by this object, so not deleted at destruction
const std::unique_ptr<Smear<Gimpl>> OwnedBase; // deleted at destruction const std::unique_ptr<Smear<Gimpl>> OwnedBase; // deleted at destruction
const Smear<Gimpl>* SmearBase; // Not owned by this object, so not deleted at destruction
public: // only anticipated to be used from default constructor
INHERIT_GIMPL_TYPES(Gimpl) inline static std::vector<double> rho3D(double rho, int orthogdim){
// only anticipated to be used from default constructor, but might as well be visible
inline static std::vector<double> rho3D(double rho = 1.0, int orthogdim = -1){
std::vector<double> rho3d(Nd*Nd); std::vector<double> rho3d(Nd*Nd);
for (int mu=0; mu<Nd; mu++) for (int mu=0; mu<Nd; mu++)
for (int nu=0; nu<Nd; nu++) for (int nu=0; nu<Nd; nu++)
rho3d[mu + Nd * nu] = (mu == orthogdim || nu == orthogdim) ? 0.0 : rho; rho3d[mu + Nd * nu] = (mu == nu || mu == orthogdim || nu == orthogdim) ? 0.0 : rho;
return rho3d; return rho3d;
}; };
public:
INHERIT_GIMPL_TYPES(Gimpl)
/*! Stout smearing with base explicitly specified */ /*! Stout smearing with base explicitly specified */
Smear_Stout(Smear<Gimpl>* base) : SmearBase{base} { Smear_Stout(Smear<Gimpl>* base) : SmearBase{base} {
@ -71,15 +71,17 @@ public:
} }
/*! Default constructor. rho is constant in all directions, optionally except for orthogonal dimension */ /*! Default constructor. rho is constant in all directions, optionally except for orthogonal dimension */
/*Smear_Stout(double rho = 1.0, int orthogdim = -1) Smear_Stout(double rho, int orthogdim = -1)
: OwnedBase{new Smear_APE<Gimpl>(rho3D(rho,orthogdim))}, SmearBase{OwnedBase.get()} { : OwnedBase{(orthogdim<0 || orthogdim>=Nd) ? new Smear_APE<Gimpl>(rho) : new Smear_APE<Gimpl>(rho3D(rho,orthogdim))},
SmearBase{OwnedBase.get()} {
assert(Nc == 3 && "Stout smearing currently implemented only for Nc==3");
}
/*
Smear_Stout(double rho = 1.0) : SmearBase(new Smear_APE<Gimpl>(rho)) {
assert(Nc == 3 && "Stout smearing currently implemented only for Nc==3"); assert(Nc == 3 && "Stout smearing currently implemented only for Nc==3");
}*/ }*/
Smear_Stout(double rho = 1.0) : SmearBase(new Smear_APE<Gimpl>(rho)) {
assert(Nc == 3);// "Stout smearing currently implemented only for Nc==3");
}
~Smear_Stout() {} // delete SmearBase... ~Smear_Stout() {} // delete SmearBase...
void smear(GaugeField& u_smr, const GaugeField& U) const { void smear(GaugeField& u_smr, const GaugeField& U) const {

8
Hadrons/Modules/MDistil/LapEvec.hpp
View File

@ -51,7 +51,7 @@ BEGIN_MODULE_NAMESPACE(MDistil)
struct StoutParameters: Serializable { struct StoutParameters: Serializable {
GRID_SERIALIZABLE_CLASS_MEMBERS(StoutParameters, GRID_SERIALIZABLE_CLASS_MEMBERS(StoutParameters,
int, steps, int, steps,
double, parm) double, parm) // TODO: change name of this to rho
StoutParameters() = default; StoutParameters() = default;
template <class ReaderClass> StoutParameters(Reader<ReaderClass>& Reader){read(Reader,"StoutSmearing",*this);} template <class ReaderClass> StoutParameters(Reader<ReaderClass>& Reader){read(Reader,"StoutSmearing",*this);}
}; };
@ -139,8 +139,8 @@ MODULE_REGISTER_TMP(LapEvec, TLapEvec<GIMPL>, MDistil);
template <typename GImpl> template <typename GImpl>
TLapEvec<GImpl>::TLapEvec(const std::string name) : gridLD{nullptr}, Module<LapEvecPar>(name) TLapEvec<GImpl>::TLapEvec(const std::string name) : gridLD{nullptr}, Module<LapEvecPar>(name)
{ {
LOG(Message) << "TLapEvec constructor : TLapEvec<GImpl>::TLapEvec(const std::string name)" << std::endl; //LOG(Message) << "TLapEvec constructor : TLapEvec<GImpl>::TLapEvec(const std::string name)" << std::endl;
LOG(Message) << "this=" << this << ", gridLD=" << gridLD << std::endl; //LOG(Message) << "this=" << this << ", gridLD=" << gridLD << std::endl;
} }
// destructor ///////////////////////////////////////////////////////////////// // destructor /////////////////////////////////////////////////////////////////
@ -235,7 +235,7 @@ void TLapEvec<GImpl>::execute(void)
{ {
const StoutParameters &Stout{par().Stout}; const StoutParameters &Stout{par().Stout};
envGetTmp(GaugeField, Umu_stout); envGetTmp(GaugeField, Umu_stout);
Smear_Stout<PeriodicGimplR> LS(Stout.parm); Smear_Stout<PeriodicGimplR> LS(Stout.parm, Tdir);
for (int i = 0; i < Stout.steps; i++) { for (int i = 0; i < Stout.steps; i++) {
LS.smear(Umu_stout, Umu_smear); LS.smear(Umu_stout, Umu_smear);
Umu_smear = Umu_stout; Umu_smear = Umu_stout;

11
Hadrons/Modules/MGauge/StoutSmearing3D.hpp
View File

@ -108,13 +108,12 @@ void TStoutSmearing3D<GImpl>::setup(void)
template <typename GImpl> template <typename GImpl>
void TStoutSmearing3D<GImpl>::execute(void) void TStoutSmearing3D<GImpl>::execute(void)
{ {
LOG(Message) << "Smearing '" << par().gauge << "' with " << par().steps LOG(Message) << "Smearing '" << par().gauge
<< " step" << ((par().steps > 1) ? "s" : "") << "' with " << par().steps << " step" << ((par().steps > 1) ? "s" : "")
<< " of 3D-stout smearing and rho= " << par().rho << " of 3D-stout smearing and rho=" << par().rho
<< "orthogonal to dimension " << par().orthogdim << std::endl; << " orthogonal to dimension " << par().orthogdim << std::endl;
//Smear_Stout<GImpl> smearer(par().rho, par().orthogdim); Smear_Stout<GImpl> smearer(par().rho, par().orthogdim);
Smear_Stout<GImpl> smearer(par().rho);
auto &U = envGet(GaugeField, par().gauge); auto &U = envGet(GaugeField, par().gauge);
auto &Usmr = envGet(GaugeField, getName()); auto &Usmr = envGet(GaugeField, getName());