1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-18 15:57:05 +01:00

updated my fork and conflicts fixed

This commit is contained in:
Vera Guelpers
2018-02-14 13:57:56 +00:00
63 changed files with 4527 additions and 189 deletions

View File

@ -884,7 +884,6 @@ void WilsonFermion5D<Impl>::SeqConservedCurrent(PropagatorField &q_in,
conformable(q_in._grid, FermionGrid());
conformable(q_in._grid, q_out._grid);
PropagatorField tmp(GaugeGrid()),tmp2(GaugeGrid());
Complex i(0.0, 1.0);
unsigned int tshift = (mu == Tp) ? 1 : 0;
unsigned int LLs = q_in._grid->_rdimensions[0];
unsigned int LLt = GridDefaultLatt()[Tp];