portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Checking in changes before changing to chulwoo-dec12-2015

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8171
configure vendored
View File

File diff suppressed because it is too large Load Diff

4
lib/qcd/action/fermion/WilsonKernels.h
View File

@ -60,8 +60,8 @@ namespace Grid {
void DiracOptAsmDhopSite(StencilImpl &st,DoubledGaugeField &U, void DiracOptAsmDhopSite(StencilImpl &st,DoubledGaugeField &U,
std::vector<SiteHalfSpinor,alignedAllocator<SiteHalfSpinor> > &buf, std::vector<SiteHalfSpinor,alignedAllocator<SiteHalfSpinor> > &buf,
#if 0 #if 1
<<<<<<< HEAD //<<<<<<< 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,bool local= true, bool nonlocal=true);
// int sF,int sU,const FermionField &in, FermionField &out,uint64_t *); // int sF,int sU,const FermionField &in, FermionField &out,uint64_t *);
// doesn't seem to work with Gparity at the moment // doesn't seem to work with Gparity at the moment