ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12655 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2014-10-29 15:47:24 +00:00
parent c21dee6f53
commit 7510ec7960
95 changed files with 850 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/gpu/lal_dpd.cu
View File

@ -187,11 +187,10 @@ __kernel void k_dpd(const __global numtyp4 *restrict x_,
virial[i]=(acctyp)0;
if (ii<inum) {
const __global int *nbor, *list_end;
int i, numj;
int i, numj, nbor, nbor_end;
__local int n_stride;
nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
n_stride,list_end,nbor);
n_stride,nbor_end,nbor);
numtyp4 ix; fetch4(ix,i,pos_tex); //x_[i];
int itype=ix.w;
@ -199,9 +198,9 @@ __kernel void k_dpd(const __global numtyp4 *restrict x_,
int itag=iv.w;
numtyp factor_dpd;
for ( ; nbor<list_end; nbor+=n_stride) {
for ( ; nbor<nbor_end; nbor+=n_stride) {
int j=*nbor;
int j=dev_packed[nbor];
factor_dpd = sp_lj[sbmask(j)];
j &= NEIGHMASK;
@ -308,11 +307,10 @@ __kernel void k_dpd_fast(const __global numtyp4 *restrict x_,
__syncthreads();
if (ii<inum) {
const __global int *nbor, *list_end;
int i, numj;
int i, numj, nbor, nbor_end;
__local int n_stride;
nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
n_stride,list_end,nbor);
n_stride,nbor_end,nbor);
numtyp4 ix; fetch4(ix,i,pos_tex); //x_[i];
int iw=ix.w;
@ -321,9 +319,9 @@ __kernel void k_dpd_fast(const __global numtyp4 *restrict x_,
int itag=iv.w;
numtyp factor_dpd;
for ( ; nbor<list_end; nbor+=n_stride) {
for ( ; nbor<nbor_end; nbor+=n_stride) {
int j=*nbor;
int j=dev_packed[nbor];
factor_dpd = sp_lj[sbmask(j)];
j &= NEIGHMASK;