← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/gpu/lal_coul_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_coul_dsf.cu
62
62
    virial[i]=(acctyp)0;
63
63
  
64
64
  if (ii<inum) {
65
 
    const __global int *nbor, *list_end;
 
65
    int nbor, nbor_end;
66
66
    int i, numj;
67
67
    __local int n_stride;
68
68
    nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
69
 
              n_stride,list_end,nbor);
 
69
              n_stride,nbor_end,nbor);
70
70
  
71
71
    numtyp4 ix; fetch4(ix,i,pos_tex); //x_[i];
72
72
    numtyp qtmp; fetch(qtmp,i,q_tex);
77
77
      e_coul += (acctyp)2.0*e_self;
78
78
    }
79
79
 
80
 
    for ( ; nbor<list_end; nbor+=n_stride) {
81
 
      int j=*nbor;
 
80
    for ( ; nbor<nbor_end; nbor+=n_stride) {
 
81
      int j=dev_packed[nbor];
82
82
 
83
83
      numtyp factor_coul, r, prefactor, erfcc;
84
84
      factor_coul = sp_lj[sbmask(j)];
163
163
  __syncthreads();
164
164
  
165
165
  if (ii<inum) {
166
 
    const __global int *nbor, *list_end;
 
166
    int nbor, nbor_end;
167
167
    int i, numj;
168
168
    __local int n_stride;
169
169
    nbor_info(dev_nbor,dev_packed,nbor_pitch,t_per_atom,ii,offset,i,numj,
170
 
              n_stride,list_end,nbor);
 
170
              n_stride,nbor_end,nbor);
171
171
  
172
172
    numtyp4 ix; fetch4(ix,i,pos_tex); //x_[i];
173
173
    numtyp qtmp; fetch(qtmp,i,q_tex);
178
178
      e_coul += (acctyp)2.0*e_self;
179
179
    }
180
180
 
181
 
    for ( ; nbor<list_end; nbor+=n_stride) {
182
 
      int j=*nbor;
 
181
    for ( ; nbor<nbor_end; nbor+=n_stride) {
 
182
      int j=dev_packed[nbor];
183
183
 
184
184
      numtyp factor_coul, r, prefactor, erfcc;
185
185
      factor_coul = sp_lj[sbmask(j)];