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

Remove freeVpTensor object

Browse Source
This commit is contained in:
James Harrison 2018-01-19 17:14:11 +00:00
parent 581be32ed2
commit 219b3bd34f
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
extras/Hadrons/Modules/MScalar/ScalarVP.cc
View File

@ -38,7 +38,6 @@ std::vector<std::string> TScalarVP::getOutput(void)
for (unsigned int nu = 0; nu < env().getNd(); ++nu) for (unsigned int nu = 0; nu < env().getNd(); ++nu)
{ {
out.push_back(getName() + "_" + std::to_string(mu) + "_" + std::to_string(nu)); out.push_back(getName() + "_" + std::to_string(mu) + "_" + std::to_string(nu));
out.push_back(getName() + "_free_" + std::to_string(mu) + "_" + std::to_string(nu));
} }
} }
@ -55,7 +54,6 @@ void TScalarVP::setup(void)
phaseName_.clear(); phaseName_.clear();
muPropQName_.clear(); muPropQName_.clear();
vpTensorName_.clear(); vpTensorName_.clear();
freeVpTensorName_.clear();
for (unsigned int mu = 0; mu < env().getNd(); ++mu) for (unsigned int mu = 0; mu < env().getNd(); ++mu)
{ {
@ -63,16 +61,12 @@ void TScalarVP::setup(void)
muPropQName_.push_back(getName() + "_propQ_" + std::to_string(mu)); muPropQName_.push_back(getName() + "_propQ_" + std::to_string(mu));
std::vector<std::string> vpTensorName_mu; std::vector<std::string> vpTensorName_mu;
std::vector<std::string> freeVpTensorName_mu;
for (unsigned int nu = 0; nu < env().getNd(); ++nu) for (unsigned int nu = 0; nu < env().getNd(); ++nu)
{ {
vpTensorName_mu.push_back(getName() + "_" + std::to_string(mu) vpTensorName_mu.push_back(getName() + "_" + std::to_string(mu)
+ "_" + std::to_string(nu)); + "_" + std::to_string(nu));
freeVpTensorName_mu.push_back(getName() + "_free_" + std::to_string(mu)
+ "_" + std::to_string(nu));
} }
vpTensorName_.push_back(vpTensorName_mu); vpTensorName_.push_back(vpTensorName_mu);
freeVpTensorName_.push_back(freeVpTensorName_mu);
} }
for (unsigned int mu = 0; mu < env().getNd(); ++mu) for (unsigned int mu = 0; mu < env().getNd(); ++mu)
@ -82,7 +76,6 @@ void TScalarVP::setup(void)
for (unsigned int nu = 0; nu < env().getNd(); ++nu) for (unsigned int nu = 0; nu < env().getNd(); ++nu)
{ {
env().registerLattice<ScalarField>(vpTensorName_[mu][nu]); env().registerLattice<ScalarField>(vpTensorName_[mu][nu]);
env().registerLattice<ScalarField>(freeVpTensorName_[mu][nu]);
} }
} }
} }
@ -129,18 +122,15 @@ void TScalarVP::execute(void)
ScalarField Amu(env().getGrid()), tmp_vp(env().getGrid()); ScalarField Amu(env().getGrid()), tmp_vp(env().getGrid());
TComplex Anu0; TComplex Anu0;
std::vector<int> coor0 = {0, 0, 0, 0}; std::vector<int> coor0 = {0, 0, 0, 0};
std::vector<std::vector<ScalarField> > vpTensor, freeVpTensor; std::vector<std::vector<ScalarField> > vpTensor;
for (unsigned int mu = 0; mu < env().getNd(); ++mu) for (unsigned int mu = 0; mu < env().getNd(); ++mu)
{ {
std::vector<ScalarField> vpTensor_mu; std::vector<ScalarField> vpTensor_mu;
std::vector<ScalarField> freeVpTensor_mu;
for (unsigned int nu = 0; nu < env().getNd(); ++nu) for (unsigned int nu = 0; nu < env().getNd(); ++nu)
{ {
vpTensor_mu.push_back(*env().createLattice<ScalarField>(vpTensorName_[mu][nu])); vpTensor_mu.push_back(*env().createLattice<ScalarField>(vpTensorName_[mu][nu]));
freeVpTensor_mu.push_back(*env().createLattice<ScalarField>(freeVpTensorName_[mu][nu]));
} }
vpTensor.push_back(vpTensor_mu); vpTensor.push_back(vpTensor_mu);
freeVpTensor.push_back(freeVpTensor_mu);
} }
// Open output files if necessary // Open output files if necessary
@ -218,16 +208,17 @@ void TScalarVP::execute(void)
// Free VP // Free VP
prop1 = *prop0_; prop1 = *prop0_;
prop2 = Cshift(*prop0_, nu, -1); prop2 = Cshift(*prop0_, nu, -1);
freeVpTensor[mu][nu] = adj(prop2) * Cshift(prop1, mu, 1); tmp_vp = adj(prop2) * Cshift(prop1, mu, 1);
freeVpTensor[mu][nu] -= Cshift(adj(prop2), mu, 1) * prop1; tmp_vp -= Cshift(adj(prop2), mu, 1) * prop1;
freeVpTensor[mu][nu] = 2.0*real(freeVpTensor[mu][nu]); tmp_vp = 2.0*real(tmp_vp);
vpTensor[mu][nu] = tmp_vp;
// Output if necessary // Output if necessary
if (!par().output.empty()) if (!par().output.empty())
{ {
for (unsigned int i_p = 0; i_p < par().outputMom.size(); ++i_p) for (unsigned int i_p = 0; i_p < par().outputMom.size(); ++i_p)
{ {
vpPhase = freeVpTensor[mu][nu]*momphases[i_p]; vpPhase = tmp_vp*momphases[i_p];
sliceSum(vpPhase, vecBuf, Tp); sliceSum(vpPhase, vecBuf, Tp);
result.resize(vecBuf.size()); result.resize(vecBuf.size());
for (unsigned int t = 0; t < vecBuf.size(); ++t) for (unsigned int t = 0; t < vecBuf.size(); ++t)
@ -243,6 +234,10 @@ void TScalarVP::execute(void)
} }
} }
// S
// X
// 4C
// "Exchange" terms // "Exchange" terms
prop1 += q*propQ; prop1 += q*propQ;
prop2 += q*muPropQ[nu]; prop2 += q*muPropQ[nu];

3
extras/Hadrons/Modules/MScalar/ScalarVP.hpp
View File

@ -47,8 +47,7 @@ private:
prop0Name_, propQName_, prop0Name_, propQName_,
propSunName_, propTadName_; propSunName_, propTadName_;
std::vector<std::string> phaseName_, muPropQName_; std::vector<std::string> phaseName_, muPropQName_;
std::vector<std::vector<std::string> > vpTensorName_, std::vector<std::vector<std::string> > vpTensorName_;
freeVpTensorName_;
ScalarField *freeMomProp_, *GFSrc_, ScalarField *freeMomProp_, *GFSrc_,
*prop0_; *prop0_;
std::vector<ScalarField *> phase_; std::vector<ScalarField *> phase_;