From fe6a372f752a4f0040a93b6dfad918ca5b078ca2 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 8 Oct 2018 15:14:08 +0100 Subject: [PATCH] Hadrons: fixes and cleaning in the scalar SU(N) part --- Hadrons/Modules.hpp | 1 - Hadrons/Modules/MScalarSUN/TimeMomProbe.cc | 38 --- Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp | 268 -------------------- Hadrons/Modules/MScalarSUN/TrMag.hpp | 3 +- Hadrons/Modules/MScalarSUN/Utils.hpp | 2 +- Hadrons/modules.inc | 2 - 6 files changed, 3 insertions(+), 311 deletions(-) delete mode 100644 Hadrons/Modules/MScalarSUN/TimeMomProbe.cc delete mode 100644 Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp diff --git a/Hadrons/Modules.hpp b/Hadrons/Modules.hpp index 2859f0fc..6d56ea2d 100644 --- a/Hadrons/Modules.hpp +++ b/Hadrons/Modules.hpp @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/Hadrons/Modules/MScalarSUN/TimeMomProbe.cc b/Hadrons/Modules/MScalarSUN/TimeMomProbe.cc deleted file mode 100644 index 5bfa203a..00000000 --- a/Hadrons/Modules/MScalarSUN/TimeMomProbe.cc +++ /dev/null @@ -1,38 +0,0 @@ -/************************************************************************************* - -Grid physics library, www.github.com/paboyle/Grid - -Source file: Hadrons/Modules/MScalarSUN/TimeMomProbe.cc - -Copyright (C) 2015-2018 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution directory -*************************************************************************************/ -/* END LEGAL */ -#include - -using namespace Grid; -using namespace Hadrons; -using namespace MScalarSUN; - -template class Grid::Hadrons::MScalarSUN::TTimeMomProbe>; -template class Grid::Hadrons::MScalarSUN::TTimeMomProbe>; -template class Grid::Hadrons::MScalarSUN::TTimeMomProbe>; -template class Grid::Hadrons::MScalarSUN::TTimeMomProbe>; -template class Grid::Hadrons::MScalarSUN::TTimeMomProbe>; diff --git a/Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp b/Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp deleted file mode 100644 index a73da8de..00000000 --- a/Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp +++ /dev/null @@ -1,268 +0,0 @@ -/************************************************************************************* - -Grid physics library, www.github.com/paboyle/Grid - -Source file: Hadrons/Modules/MScalarSUN/TimeMomProbe.hpp - -Copyright (C) 2015-2018 - -Author: Antonin Portelli - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -See the full license in the file "LICENSE" in the top level distribution directory -*************************************************************************************/ -/* END LEGAL */ -#ifndef Hadrons_MScalarSUN_TimeMomProbe_hpp_ -#define Hadrons_MScalarSUN_TimeMomProbe_hpp_ - -#include -#include -#include -#include - -BEGIN_HADRONS_NAMESPACE - -/****************************************************************************** - * n-point functions O(t,p)*tr(phi(t_1,p_1)*...*phi(t_n,p_n)) * - ******************************************************************************/ -BEGIN_MODULE_NAMESPACE(MScalarSUN) - -class TimeMomProbePar: Serializable -{ -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(TimeMomProbePar, - std::string, field, - std::vector, op, - std::vector>, timeMom, - std::string, output); -}; - -class TimeMomProbeResult: Serializable -{ -public: - GRID_SERIALIZABLE_CLASS_MEMBERS(TimeMomProbeResult, - std::string, op, - std::vector>, timeMom, - std::vector, data); -}; - -template -class TTimeMomProbe: public Module -{ -public: - typedef typename SImpl::Field Field; - typedef typename SImpl::SiteField::scalar_object Site; - typedef typename SImpl::ComplexField ComplexField; - typedef std::vector SlicedOp; -public: - // constructor - TTimeMomProbe(const std::string name); - // destructor - virtual ~TTimeMomProbe(void) {}; - // dependency relation - virtual std::vector getInput(void); - virtual std::vector getOutput(void); - // setup - virtual void setup(void); - // execution - virtual void execute(void); -private: - void vectorModulo(std::vector &v); -}; - -MODULE_REGISTER_TMP(TimeMomProbeSU2, TTimeMomProbe>, MScalarSUN); -MODULE_REGISTER_TMP(TimeMomProbeSU3, TTimeMomProbe>, MScalarSUN); -MODULE_REGISTER_TMP(TimeMomProbeSU4, TTimeMomProbe>, MScalarSUN); -MODULE_REGISTER_TMP(TimeMomProbeSU5, TTimeMomProbe>, MScalarSUN); -MODULE_REGISTER_TMP(TimeMomProbeSU6, TTimeMomProbe>, MScalarSUN); - -/****************************************************************************** - * TTimeMomProbe implementation * - ******************************************************************************/ -// constructor ///////////////////////////////////////////////////////////////// -template -TTimeMomProbe::TTimeMomProbe(const std::string name) -: Module(name) -{} - -// dependencies/products /////////////////////////////////////////////////////// -template -std::vector TTimeMomProbe::getInput(void) -{ - std::vector in = par().op; - - in.push_back(par().field); - - return in; -} - -template -std::vector TTimeMomProbe::getOutput(void) -{ - std::vector out; - - return out; -} - -// setup /////////////////////////////////////////////////////////////////////// -template -void TTimeMomProbe::setup(void) -{ - envTmpLat(ComplexField, "ftBuf"); - envTmpLat(Field, "ftMatBuf"); -} - -// execution /////////////////////////////////////////////////////////////////// -// NB: time is direction 0 -template -void TTimeMomProbe::vectorModulo(std::vector &v) -{ - for (unsigned int mu = 0; mu < env().getNd(); ++mu) - { - auto d = env().getDim(mu); - v[mu] = ((v[mu] % d) + d) % d; - } -} - -template -void TTimeMomProbe::execute(void) -{ - const unsigned int nd = env().getNd(); - const unsigned int nt = env().getDim(0); - double partVol = 1.; - std::set> timeMomSet; - std::vector>> timeMom; - std::vector> transferMom; - FFT fft(envGetGrid(Field)); - std::vector dMask(nd, 1); - std::vector result; - std::map> slicedOp; - std::vector slicedProbe; - auto &phi = envGet(Field, par().field); - - envGetTmp(ComplexField, ftBuf); - envGetTmp(Field, ftMatBuf); - dMask[0] = 0; - for (unsigned int mu = 1; mu < nd; ++mu) - { - partVol *= env().getDim(mu); - } - timeMom.resize(par().timeMom.size()); - for (unsigned int p = 0; p < timeMom.size(); ++p) - { - for (auto &tms: par().timeMom[p]) - { - std::vector tm = strToVec(tms); - - timeMom[p].push_back(tm); - timeMomSet.insert(tm); - } - transferMom.push_back(std::vector(nd - 1, 0)); - for (auto &tm: timeMom[p]) - { - for (unsigned int j = 1; j < nd; ++j) - { - transferMom[p][j - 1] -= tm[j]; - } - } - LOG(Message) << "Probe " << p << " (" << timeMom[p].size() << " points) : " << std::endl; - LOG(Message) << " phi(t_i, p_i) for (t_i, p_i) in " << timeMom[p] << std::endl; - LOG(Message) << " operator with momentum " << transferMom[p] << std::endl; - } - LOG(Message) << "FFT: field '" << par().field << "'" << std::endl; - fft.FFT_dim_mask(ftMatBuf, phi, dMask, FFT::forward); - slicedProbe.resize(timeMom.size()); - for (unsigned int p = 0; p < timeMom.size(); ++p) - { - std::vector qt; - - LOG(Message) << "Making probe " << p << std::endl; - slicedProbe[p].resize(nt); - for (unsigned int t = 0; t < nt; ++t) - { - Site acc; - - for (unsigned int i = 0; i < timeMom[p].size(); ++i) - { - Site buf; - - qt = timeMom[p][i]; - qt[0] += t; - vectorModulo(qt); - peekSite(buf, ftMatBuf, qt); - if (i == 0) - { - acc = buf; - } - else - { - acc *= buf; - } - } - slicedProbe[p][t] = TensorRemove(trace(acc)); - } - //std::cout << slicedProbe[p]<< std::endl; - } - for (auto &o: par().op) - { - auto &op = envGet(ComplexField, o); - - slicedOp[o].resize(transferMom.size()); - LOG(Message) << "FFT: operator '" << o << "'" << std::endl; - fft.FFT_dim_mask(ftBuf, op, dMask, FFT::forward); - //std::cout << ftBuf << std::endl; - for (unsigned int p = 0; p < transferMom.size(); ++p) - { - std::vector qt(nd, 0); - - for (unsigned int j = 1; j < nd; ++j) - { - qt[j] = transferMom[p][j - 1]; - } - slicedOp[o][p].resize(nt); - for (unsigned int t = 0; t < nt; ++t) - { - TComplex buf; - - qt[0] = t; - vectorModulo(qt); - peekSite(buf, ftBuf, qt); - slicedOp[o][p][t] = TensorRemove(buf); - } - //std::cout << ftBuf << std::endl; - //std::cout << slicedOp[o][p] << std::endl; - } - } - LOG(Message) << "Making correlators" << std::endl; - for (auto &o: par().op) - for (unsigned int p = 0; p < timeMom.size(); ++p) - { - TimeMomProbeResult r; - - LOG(Message) << " <" << o << " probe_" << p << ">" << std::endl; - r.op = o; - r.timeMom = timeMom[p]; - r.data = makeTwoPoint(slicedOp[o][p], slicedProbe[p], 1./partVol); - result.push_back(r); - } - saveResult(par().output, "timemomprobe", result); -} - -END_MODULE_NAMESPACE - -END_HADRONS_NAMESPACE - -#endif // Hadrons_MScalarSUN_TimeMomProbe_hpp_ diff --git a/Hadrons/Modules/MScalarSUN/TrMag.hpp b/Hadrons/Modules/MScalarSUN/TrMag.hpp index d7d40e88..b9602be3 100644 --- a/Hadrons/Modules/MScalarSUN/TrMag.hpp +++ b/Hadrons/Modules/MScalarSUN/TrMag.hpp @@ -124,7 +124,8 @@ void TTrMag::execute(void) std::vector result; auto &phi = envGet(Field, par().field); - auto m2 = sum(phi), mn = m2; + auto m2 = sum(phi); + auto mn = m2; m2 = -m2*m2; mn = 1.; diff --git a/Hadrons/Modules/MScalarSUN/Utils.hpp b/Hadrons/Modules/MScalarSUN/Utils.hpp index fdc42c9a..7eba5900 100644 --- a/Hadrons/Modules/MScalarSUN/Utils.hpp +++ b/Hadrons/Modules/MScalarSUN/Utils.hpp @@ -103,7 +103,7 @@ std::vector makeTwoPoint(const std::vector &sink, { for (unsigned int t = 0; t < nt; ++t) { - res[dt] += trace(sink[(t+dt)%nt]*source[t]); + res[dt] += trace(sink[(t+dt)%nt]*adj(source[t])); } res[dt] *= factor/static_cast(nt); } diff --git a/Hadrons/modules.inc b/Hadrons/modules.inc index 866dfd91..74138238 100644 --- a/Hadrons/modules.inc +++ b/Hadrons/modules.inc @@ -46,7 +46,6 @@ modules_cc =\ Modules/MAction/ScaledDWF.cc \ Modules/MScalarSUN/TrPhi.cc \ Modules/MScalarSUN/Grad.cc \ - Modules/MScalarSUN/TimeMomProbe.cc \ Modules/MScalarSUN/TrMag.cc \ Modules/MScalarSUN/TrKinetic.cc \ Modules/MScalarSUN/EMT.cc \ @@ -115,7 +114,6 @@ modules_hpp =\ Modules/MScalarSUN/TwoPointNPR.hpp \ Modules/MScalarSUN/ShiftProbe.hpp \ Modules/MScalarSUN/Div.hpp \ - Modules/MScalarSUN/TimeMomProbe.hpp \ Modules/MScalarSUN/TrMag.hpp \ Modules/MScalarSUN/EMT.hpp \ Modules/MScalarSUN/TwoPoint.hpp \