1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-09 23:45:36 +00:00

Resolving small merge conflict

This commit is contained in:
Guido Cossu 2017-02-09 16:20:24 +00:00
parent e0571c872b
commit 8b6a6c8236

View File

@ -382,12 +382,6 @@ int main (int argc, char ** argv)
}
// ref = src - Gamma(Gamma::Algebra::GammaX)* src ; // 1+gamma_x
tmp = U[mu]*Cshift(src,mu+1,1);
for(int i=0;i<ref._odata.size();i++){
ref._odata[i]+= tmp._odata[i] + Gamma(Gmu[mu])*tmp._odata[i]; ;
}
}