portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Merge pull request #207 from fionnoh/develop

Browse Source 
Weak Hamiltonian and contraction bug fixes
This commit is contained in:
Antonin Portelli 2019-05-12 21:30:20 +02:00 committed by GitHub
commit d90cf9d022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Grid/qcd/utils/A2Autils.h
View File

@ -986,17 +986,18 @@ void A2Autils<FImpl>::ContractWWVV(std::vector<PropagatorField> &WWVV,
for(int t=0;t<N_t;t++){ for(int t=0;t<N_t;t++){
for(int s=0;s<N_s;s++){ for(int s=0;s<N_s;s++){
auto tmp1 = vs[s]._odata[ss]; auto tmp1 = vs[s]._odata[ss];
vobj tmp2 = zero; vobj tmp2 = zero;
vobj tmp3 = zero;
for(int d=d_o;d<MIN(d_o+d_unroll,N_d);d++){ for(int d=d_o;d<MIN(d_o+d_unroll,N_d);d++){
Scalar_v coeff = WW_sd(t,s,d); Scalar_v coeff = WW_sd(t,s,d);
mac(&tmp2 ,& coeff, & vd[d]._odata[ss]); tmp3 = conjugate(vd[d]._odata[ss]);
} mac(&tmp2, &coeff, &tmp3);
}
////////////////////////// //////////////////////////
// Fast outer product of tmp1 with a sum of terms suppressed by d_unroll // Fast outer product of tmp1 with a sum of terms suppressed by d_unroll
////////////////////////// //////////////////////////
tmp2 = conjugate(tmp2);
for(int s1=0;s1<Ns;s1++){ for(int s1=0;s1<Ns;s1++){
for(int s2=0;s2<Ns;s2++){ for(int s2=0;s2<Ns;s2++){
WWVV[t]._odata[ss]()(s1,s2)(0,0) += tmp1()(s1)(0)*tmp2()(s2)(0); WWVV[t]._odata[ss]()(s1,s2)(0,0) += tmp1()(s1)(0)*tmp2()(s2)(0);

2
Hadrons/Modules/MContraction/A2ALoop.hpp
View File

@ -89,7 +89,7 @@ std::vector<std::string> TA2ALoop<FImpl>::getInput(void)
template <typename FImpl> template <typename FImpl>
std::vector<std::string> TA2ALoop<FImpl>::getOutput(void) std::vector<std::string> TA2ALoop<FImpl>::getOutput(void)
{ {
std::vector<std::string> out = {}; std::vector<std::string> out = {getName()};
return out; return out;
} }

6
Hadrons/Modules/MContraction/WeakEye3pt.hpp
View File

@ -52,7 +52,7 @@ BEGIN_HADRONS_NAMESPACE
* | * |
* one trace | two traces * one trace | two traces
* *
* one trace : tr(qbr*gOut*qs*adj(gIn)*g5*adj(qbl)*g5*G*loop*G*qbr*gOut) * one trace : tr(qbr*gOut*qs*adj(gIn)*g5*adj(qbl)*g5*G*loop*G)
* two traces: tr(qbr*gOut*qs*adj(gIn)*g5*adj(qbl)*g5*G)*tr(loop*G) * two traces: tr(qbr*gOut*qs*adj(gIn)*g5*adj(qbl)*g5*G)*tr(loop*G)
* *
*/ */
@ -118,7 +118,7 @@ template <typename FImpl>
std::vector<std::string> TWeakEye3pt<FImpl>::getInput(void) std::vector<std::string> TWeakEye3pt<FImpl>::getInput(void)
{ {
std::vector<std::string> in = {par().qBarLeft, par().qBarRight, std::vector<std::string> in = {par().qBarLeft, par().qBarRight,
par().qSpectator}; par().qSpectator, par().loop};
return in; return in;
} }
@ -170,7 +170,7 @@ void TWeakEye3pt<FImpl>::execute(void)
r.info.op = G.g; r.info.op = G.g;
// one trace // one trace
corr = trace(qbr*gOut*qst*adj(gIn)*g5*adj(qbl)*g5*G*loop*G*qbr*gOut); corr = trace(qbr*gOut*qst*adj(gIn)*g5*adj(qbl)*g5*G*loop*G);
sliceSum(corr, buf, Tp); sliceSum(corr, buf, Tp);
r.corr.clear(); r.corr.clear();
for (unsigned int t = 0; t < buf.size(); ++t) for (unsigned int t = 0; t < buf.size(); ++t)