portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-08 13:10:45 +01:00
Code Releases Activity

Merge branch 'develop' of https://github.com/paboyle/Grid into feature/rare_kaon

Browse Source
This commit is contained in:
Lanny91 2017-01-26 12:08:41 +00:00
commit 90ad956340
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/lattice/Lattice_transfer.h
View File

@ -386,7 +386,8 @@ void InsertSlice(Lattice<vobj> &lowDim,Lattice<vobj> & higherDim,int slice, int
}
// the above should guarantee that the operations are local
PARALLEL_FOR_LOOP
// Guido: check the threading here
//PARALLEL_FOR_LOOP
for(int idx=0;idx<lg->lSites();idx++){
std::vector<int> lcoor(nl);
std::vector<int> hcoor(nh);
@ -428,7 +429,7 @@ void ExtractSlice(Lattice<vobj> &lowDim, Lattice<vobj> & higherDim,int slice, in
}
}
// the above should guarantee that the operations are local
PARALLEL_FOR_LOOP
//PARALLEL_FOR_LOOP
for(int idx=0;idx<lg->lSites();idx++){
std::vector<int> lcoor(nl);
std::vector<int> hcoor(nh);

2
tests/hadrons/Makefile.am
View File

@ -1,3 +1,3 @@
AM_LDFLAGS += -L../../extras/hadrons
AM_LDFLAGS += -L../../extras/Hadrons
include Make.inc