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

Merge branch 'master' of github.com:paboyle/Grid

Conflicts:
	lib/qcd/action/fermion/WilsonFermion5D.cc
This commit is contained in:
paboyle
2015-11-06 03:50:04 -08:00
20 changed files with 559 additions and 8450 deletions

View File

@ -75,7 +75,7 @@ namespace Grid {
namespace QCD {
template<class Impl>
void WilsonKernels<Impl >::DiracOptAsmDhopSite(CartesianStencil &st,DoubledGaugeField &U,
void WilsonKernels<Impl >::DiracOptAsmDhopSite(StencilImpl &st,DoubledGaugeField &U,
std::vector<SiteHalfSpinor,alignedAllocator<SiteHalfSpinor> > &buf,
int ss,int sU,const FermionField &in, FermionField &out,uint64_t *timers)
{