← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/USER-CUDA/pair_morse_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_morse_cuda.cpp
57
57
#include "respa.h"
58
58
#include "memory.h"
59
59
#include "error.h"
60
 
#include "cuda.h"
 
60
#include "user_cuda.h"
61
61
 
62
62
using namespace LAMMPS_NS;
63
63
 
117
117
void PairMorseCuda::settings(int narg, char **arg)
118
118
{
119
119
        PairMorse::settings(narg, arg);
120
 
        cuda->shared_data.pair.cut_global = (F_FLOAT) cut_global;
 
120
        cuda->shared_data.pair.cut_global = (F_CFLOAT) cut_global;
121
121
}
122
122
 
123
123
/* ---------------------------------------------------------------------- */
140
140
  }
141
141
  else
142
142
  {
143
 
          irequest = neighbor->request(this);
 
143
    irequest = neighbor->request(this,instance_me);
144
144
    neighbor->requests[irequest]->full = 1;
145
145
    neighbor->requests[irequest]->half = 0;
146
146
    neighbor->requests[irequest]->cudable = 1;
169
169
        PairMorse::ev_setup(eflag,vflag);
170
170
 
171
171
  if (eflag_atom && atom->nmax > maxeatomold)
172
 
        {delete cuda->cu_eatom; cuda->cu_eatom = new cCudaData<double, ENERGY_FLOAT, x > ((double*)eatom, & cuda->shared_data.atom.eatom , atom->nmax  );}
 
172
        {delete cuda->cu_eatom; cuda->cu_eatom = new cCudaData<double, ENERGY_CFLOAT, x > ((double*)eatom, & cuda->shared_data.atom.eatom , atom->nmax  );}
173
173
 
174
174
  if (vflag_atom && atom->nmax > maxeatomold)
175
 
        {delete cuda->cu_vatom; cuda->cu_vatom = new cCudaData<double, ENERGY_FLOAT, yx > ((double*)vatom, & cuda->shared_data.atom.vatom , atom->nmax, 6  );}
 
175
        {delete cuda->cu_vatom; cuda->cu_vatom = new cCudaData<double, ENERGY_CFLOAT, yx > ((double*)vatom, & cuda->shared_data.atom.vatom , atom->nmax, 6  );}
176
176
 
177
177
}