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

Merge branch 'feature/gpu-port' of https://github.com/paboyle/Grid into feature/gpu-port

Conflicts:
	Grid/stencil/Stencil.h
This commit is contained in:
Peter Boyle
2019-07-12 17:14:11 +01:00
45 changed files with 35 additions and 75 deletions

View File

@ -777,7 +777,7 @@ public:
int permute_slice=0;
if(permute_dim){
int wrap = sshift/rd;
int wrap = sshift/rd; wrap=wrap % ly; // but it is local anyway
int num = sshift%rd;
if ( x< rd-num ) permute_slice=wrap;
else permute_slice = (wrap+1)%ly;