← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp

  • 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:
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
58
58
#include "respa.h"
59
59
#include "memory.h"
60
60
#include "error.h"
61
 
#include "cuda.h"
 
61
#include "user_cuda.h"
62
62
 
63
63
using namespace LAMMPS_NS;
64
64
 
136
136
void PairLJSDKCoulLongCuda::settings(int narg, char **arg)
137
137
{
138
138
        PairLJSDKCoulLong::settings(narg, arg);
139
 
        cuda->shared_data.pair.cut_global = (F_FLOAT) cut_lj_global;
140
 
        cuda->shared_data.pair.cut_coul_global = (F_FLOAT) cut_coul;
 
139
        cuda->shared_data.pair.cut_global = (F_CFLOAT) cut_lj_global;
 
140
        cuda->shared_data.pair.cut_coul_global = (F_CFLOAT) cut_coul;
141
141
}
142
142
 
143
143
/* ---------------------------------------------------------------------- */
155
155
 
156
156
  int irequest;
157
157
 
158
 
          irequest = neighbor->request(this);
 
158
        irequest = neighbor->request(this,instance_me);
159
159
    neighbor->requests[irequest]->full = 1;
160
160
    neighbor->requests[irequest]->half = 0;
161
161
    neighbor->requests[irequest]->cudable = 1;
185
185
        PairLJSDKCoulLong::ev_setup(eflag,vflag);
186
186
 
187
187
  if (eflag_atom && atom->nmax > maxeatomold)
188
 
        {delete cuda->cu_eatom; cuda->cu_eatom = new cCudaData<double, ENERGY_FLOAT, x > ((double*)eatom, & cuda->shared_data.atom.eatom , atom->nmax  );}
 
188
        {delete cuda->cu_eatom; cuda->cu_eatom = new cCudaData<double, ENERGY_CFLOAT, x > ((double*)eatom, & cuda->shared_data.atom.eatom , atom->nmax  );}
189
189
 
190
190
  if (vflag_atom && atom->nmax > maxeatomold)
191
 
        {delete cuda->cu_vatom; cuda->cu_vatom = new cCudaData<double, ENERGY_FLOAT, yx > ((double*)vatom, & cuda->shared_data.atom.vatom , atom->nmax, 6  );}
 
191
        {delete cuda->cu_vatom; cuda->cu_vatom = new cCudaData<double, ENERGY_CFLOAT, yx > ((double*)vatom, & cuda->shared_data.atom.vatom , atom->nmax, 6  );}
192
192
 
193
193
}