From c8e6f58e24ac04b0387bafd33334189528212627 Mon Sep 17 00:00:00 2001 From: James Harrison Date: Thu, 13 Apr 2017 17:04:37 +0100 Subject: [PATCH] Fix typos in ScalarVP --- extras/Hadrons/Modules/MScalar/ScalarVP.cc | 3 ++- extras/Hadrons/Modules/MScalar/ScalarVP.hpp | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/extras/Hadrons/Modules/MScalar/ScalarVP.cc b/extras/Hadrons/Modules/MScalar/ScalarVP.cc index 66cdea7e..79cc5574 100644 --- a/extras/Hadrons/Modules/MScalar/ScalarVP.cc +++ b/extras/Hadrons/Modules/MScalar/ScalarVP.cc @@ -1,4 +1,5 @@ #include +#include using namespace Grid; using namespace Hadrons; @@ -46,7 +47,7 @@ void TScalarVP::setup(void) for (unsigned int mu = 0; mu < env().getNd(); ++mu) { phaseName_.push_back("_shiftphase_" + std::to_string(mu)); - muGFSrcName.push_back("_" + getName() + "_DinvSrc_" + std::to_string(mu)); + muGFSrcName_.push_back("_" + getName() + "_DinvSrc_" + std::to_string(mu)); muProp0Name_.push_back(getName() + "_prop0_" + std::to_string(mu)); muPropQName_.push_back(getName() + "_propQ_" + std::to_string(mu)); muPropSunName_.push_back(getName() + "_propSun_" + std::to_string(mu)); diff --git a/extras/Hadrons/Modules/MScalar/ScalarVP.hpp b/extras/Hadrons/Modules/MScalar/ScalarVP.hpp index 9d57a62a..1a2b82fb 100644 --- a/extras/Hadrons/Modules/MScalar/ScalarVP.hpp +++ b/extras/Hadrons/Modules/MScalar/ScalarVP.hpp @@ -42,16 +42,19 @@ public: // execution virtual void execute(void); private: + void chargedProp(ScalarField &prop_q, ScalarField &prop_sun, + ScalarField &prop_tad, ScalarField &GFSrc, + FFT &fft); void momD1(ScalarField &s, FFT &fft); void momD2(ScalarField &s, FFT &fft); private: std::string freeMomPropName_, GFSrcName_, prop0Name_, propQName_, propSunName_, propTadName_; std::vector phaseName_, muGFSrcName_, muProp0Name_, - muPropQName, muPropSunName_, muPropTadName_; + muPropQName_, muPropSunName_, muPropTadName_; ScalarField *freeMomProp_, *GFSrc_, *prop0_; std::vector phase_, muGFSrc_, muProp0_; - emField *A; + EmField *A; }; MODULE_REGISTER_NS(ScalarVP, TScalarVP, MScalar);