← 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_cut_coul_cut_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_cut_coul_cut_cuda.cpp
42
42
#include "respa.h"
43
43
#include "memory.h"
44
44
#include "error.h"
45
 
#include "cuda.h"
 
45
#include "user_cuda.h"
46
46
 
47
47
using namespace LAMMPS_NS;
48
48
 
105
105
void PairLJCutCoulCutCuda::settings(int narg, char **arg)
106
106
{
107
107
        PairLJCutCoulCut::settings(narg, arg);
108
 
        cuda->shared_data.pair.cut_global = (F_FLOAT) cut_lj_global;
109
 
        cuda->shared_data.pair.cut_coul_global = (F_FLOAT) cut_coul_global;
 
108
        cuda->shared_data.pair.cut_global = (F_CFLOAT) cut_lj_global;
 
109
        cuda->shared_data.pair.cut_coul_global = (F_CFLOAT) cut_coul_global;
110
110
}
111
111
 
112
112
/* ---------------------------------------------------------------------- */
126
126
  int irequest;
127
127
 
128
128
 
129
 
  irequest = neighbor->request(this);
 
129
  irequest = neighbor->request(this,instance_me);
130
130
  neighbor->requests[irequest]->full = 1;
131
131
  neighbor->requests[irequest]->half = 0;
132
132
  neighbor->requests[irequest]->cudable = 1;
154
154
        PairLJCutCoulCut::ev_setup(eflag,vflag);
155
155
 
156
156
  if (eflag_atom && atom->nmax > maxeatomold)
157
 
        {delete cuda->cu_eatom; cuda->cu_eatom = new cCudaData<double, ENERGY_FLOAT, x > ((double*)eatom, & cuda->shared_data.atom.eatom , atom->nmax  );}
 
157
        {delete cuda->cu_eatom; cuda->cu_eatom = new cCudaData<double, ENERGY_CFLOAT, x > ((double*)eatom, & cuda->shared_data.atom.eatom , atom->nmax  );}
158
158
 
159
159
  if (vflag_atom && atom->nmax > maxeatomold)
160
 
        {delete cuda->cu_vatom; cuda->cu_vatom = new cCudaData<double, ENERGY_FLOAT, yx > ((double*)vatom, & cuda->shared_data.atom.vatom , atom->nmax, 6  );}
 
160
        {delete cuda->cu_vatom; cuda->cu_vatom = new cCudaData<double, ENERGY_CFLOAT, yx > ((double*)vatom, & cuda->shared_data.atom.vatom , atom->nmax, 6  );}
161
161
 
162
162
}