mirror of
https://github.com/paboyle/Grid.git
synced 2024-11-10 07:55:35 +00:00
Checking in changes before changing to chulwoo-dec12-2015
This commit is contained in:
parent
411ac49dd7
commit
6012b0ec23
@ -60,8 +60,8 @@ namespace Grid {
|
||||
|
||||
void DiracOptAsmDhopSite(StencilImpl &st,DoubledGaugeField &U,
|
||||
std::vector<SiteHalfSpinor,alignedAllocator<SiteHalfSpinor> > &buf,
|
||||
#if 0
|
||||
<<<<<<< HEAD
|
||||
#if 1
|
||||
//<<<<<<< HEAD
|
||||
int sF,int sU,const FermionField &in, FermionField &out,bool local= true, bool nonlocal=true);
|
||||
// int sF,int sU,const FermionField &in, FermionField &out,uint64_t *);
|
||||
// doesn't seem to work with Gparity at the moment
|
||||
|
Loading…
Reference in New Issue
Block a user