diff --git a/lib/cshift/Cshift_common.h b/lib/cshift/Cshift_common.h index 822e02c9..83508ca3 100644 --- a/lib/cshift/Cshift_common.h +++ b/lib/cshift/Cshift_common.h @@ -29,14 +29,15 @@ Gather_plane_simple (const Lattice &rhs,std::vector_slice_nblock[dimension]; int e2=rhs._grid->_slice_block[dimension]; -PARALLEL_NESTED_LOOP2 + int bo=0; + //PARALLEL_NESTED_LOOP21 for(int n=0;n_slice_stride[dimension]; - int bo = n*rhs._grid->_slice_block[dimension]; + // int bo = n*rhs._grid->_slice_block[dimension]; int ocb=1<CheckerBoardFromOindex(o+b);// Could easily be a table lookup if ( ocb &cbmask ) { - buffer[bo+b]=compress(rhs._odata[so+o+b],dimension,plane,so+o+b,rhs._grid); + buffer[bo++]=compress(rhs._odata[so+o+b],dimension,plane,so+o+b,rhs._grid); } } } @@ -59,7 +60,7 @@ Gather_plane_extract(const Lattice &rhs,std::vector_slice_nblock[dimension]; int e2=rhs._grid->_slice_block[dimension]; -PARALLEL_NESTED_LOOP2 + //PARALLEL_NESTED_LOOP2 for(int n=0;n void Scatter_plane_simple (Lattice &rhs,std::vector_slice_nblock[dimension]; int e2=rhs._grid->_slice_block[dimension]; -PARALLEL_NESTED_LOOP2 + int bo=0; + //PARALLEL_NESTED_LOOP2 for(int n=0;n_slice_stride[dimension]; - int bo =n*rhs._grid->_slice_block[dimension]; + // int bo =n*rhs._grid->_slice_block[dimension]; int ocb=1<CheckerBoardFromOindex(o+b);// Could easily be a table lookup if ( ocb & cbmask ) { - rhs._odata[so+o+b]=buffer[bo+b]; + rhs._odata[so+o+b]=buffer[bo++]; } } }