From d14512ee03bf8bd6188f0ad26eac5cc59f19234e Mon Sep 17 00:00:00 2001 From: fionnoh Date: Fri, 17 May 2019 19:01:52 +0100 Subject: [PATCH 1/2] Exposed a coulomb/landau enum to the gauge fixing module --- Hadrons/Modules/MGauge/GaugeFix.hpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Hadrons/Modules/MGauge/GaugeFix.hpp b/Hadrons/Modules/MGauge/GaugeFix.hpp index 57b1e082..f5ebb39f 100644 --- a/Hadrons/Modules/MGauge/GaugeFix.hpp +++ b/Hadrons/Modules/MGauge/GaugeFix.hpp @@ -42,6 +42,8 @@ BEGIN_HADRONS_NAMESPACE ******************************************************************************/ BEGIN_MODULE_NAMESPACE(MGauge) +GRID_SERIALIZABLE_ENUM(Fix, undef, coulomb, Nd - 1, landau, -1); + class GaugeFixPar: Serializable { public: @@ -51,6 +53,7 @@ public: int, maxiter, Real, Omega_tol, Real, Phi_tol, + Fix, gaugeFix, bool, Fourier); }; @@ -115,8 +118,8 @@ void TGaugeFix::execute(void) //Loads the gauge and fixes it { std::cout << "executing" << std::endl; - LOG(Message) << "Fixing the Gauge" << std::endl; - LOG(Message) << par().gauge << std::endl; + LOG(Message) << "Fixing the Gauge " << par().gauge << " using " + << par().gaugeFix << " guage fixing. " << Nd - 1 << std::endl; auto &U = envGet(GaugeField, par().gauge); auto &Umu = envGet(GaugeField, getName()); auto &xform = envGet(GaugeMat, getName()+"_xform"); @@ -126,9 +129,10 @@ void TGaugeFix::execute(void) int maxiter = par().maxiter; Real Omega_tol = par().Omega_tol; Real Phi_tol = par().Phi_tol; + int gaugeFix = par().gaugeFix; bool Fourier = par().Fourier; Umu = U; - FourierAcceleratedGaugeFixer::SteepestDescentGaugeFix(Umu,xform,alpha,maxiter,Omega_tol,Phi_tol,Fourier); + FourierAcceleratedGaugeFixer::SteepestDescentGaugeFix(Umu,xform,alpha,maxiter,Omega_tol,Phi_tol,Fourier,gaugeFix); LOG(Message) << "Gauge Fixed" << std::endl; } From dbd7f3f0fcbb0035c489e986d83fefd6b9a73b7c Mon Sep 17 00:00:00 2001 From: fionnoh Date: Fri, 17 May 2019 19:10:09 +0100 Subject: [PATCH 2/2] Added variables that were missing from wall source setup --- Hadrons/Modules/MSource/Wall.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hadrons/Modules/MSource/Wall.hpp b/Hadrons/Modules/MSource/Wall.hpp index e43c61bb..945e2760 100644 --- a/Hadrons/Modules/MSource/Wall.hpp +++ b/Hadrons/Modules/MSource/Wall.hpp @@ -119,6 +119,9 @@ template void TWall::setup(void) { envCreateLat(PropagatorField, getName()); + envCache(Lattice>, tName_, 1, envGetGrid(LatticeComplex)); + envCacheLat(LatticeComplex, momphName_); + envTmpLat(LatticeComplex, "coor"); } // execution ///////////////////////////////////////////////////////////////////