1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-09-20 09:15:38 +01:00

Checking in changes before changing to chulwoo-dec12-2015

This commit is contained in:
Jung 2016-01-25 09:40:58 -05:00
parent 411ac49dd7
commit 6012b0ec23
2 changed files with 3270 additions and 5041 deletions

8307
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -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