← Back to branch summary

~ubuntu-branches/debian/sid/lammps/sid

« back to all changes in this revision

Viewing changes to lib/gpu/lal_lj_dsf.cu

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2015-04-29 23:44:49 UTC
  • mfrom: (5.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20150429234449-mbhy9utku6hp6oq8
Tags: 0~20150313.gitfa668e1-1
Upload into unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gpu/lal_lj_dsf.cu
68
68
    virial[i]=(acctyp)0;
69
69
  
70
70
  if (ii<inum) {
71
 
    const __global int *nbor, *list_end;
 
71
    int nbor, nbor_end;
72
72
    int i, numj;
73
73
    __local int n_stride;
74
74
    nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
75
 
              n_stride,list_end,nbor);
 
75
              n_stride,nbor_end,nbor);
76
76
  
77
77
    numtyp4 ix; fetch4(ix,i,pos_tex); //x_[i];
78
78
    numtyp qtmp; fetch(qtmp,i,q_tex);
84
84
      e_coul += (acctyp)2.0*e_self;
85
85
    }
86
86
 
87
 
    for ( ; nbor<list_end; nbor+=n_stride) {
88
 
      int j=*nbor;
 
87
    for ( ; nbor<nbor_end; nbor+=n_stride) {
 
88
      int j=dev_packed[nbor];
89
89
 
90
90
      numtyp factor_lj, factor_coul, r, prefactor, erfcc;
91
91
      factor_lj = sp_lj[sbmask(j)];
195
195
  __syncthreads();
196
196
  
197
197
  if (ii<inum) {
198
 
    const __global int *nbor, *list_end;
 
198
    int nbor, nbor_end;
199
199
    int i, numj;
200
200
    __local int n_stride;
201
201
    nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
202
 
              n_stride,list_end,nbor);
 
202
              n_stride,nbor_end,nbor);
203
203
  
204
204
    numtyp4 ix; fetch4(ix,i,pos_tex); //x_[i];
205
205
    numtyp qtmp; fetch(qtmp,i,q_tex);
212
212
      e_coul += (acctyp)2.0*e_self;
213
213
    }
214
214
 
215
 
    for ( ; nbor<list_end; nbor+=n_stride) {
216
 
      int j=*nbor;
 
215
    for ( ; nbor<nbor_end; nbor+=n_stride) {
 
216
      int j=dev_packed[nbor];
217
217
 
218
218
      numtyp factor_lj, factor_coul, r, prefactor, erfcc;
219
219
      factor_lj = sp_lj[sbmask(j)];