git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7276 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2011-12-02 15:55:55 +00:00
parent 37f098062b
commit 24a85166bf
32 changed files with 75 additions and 83 deletions

View File

@ -69,7 +69,7 @@ enum{SPHERE_SPHERE,SPHERE_ELLIPSE,ELLIPSE_SPHERE,ELLIPSE_ELLIPSE};
/* ---------------------------------------------------------------------- */
PairRESquaredGPU::PairRESquaredGPU(LAMMPS *lmp) : PairRESquared(lmp),
gpu_mode(GPU_PAIR)
gpu_mode(GPU_FORCE)
{
avec = (AtomVecEllipsoid *) atom->style_match("ellipsoid");
if (!avec)
@ -118,7 +118,7 @@ void PairRESquaredGPU::compute(int eflag, int vflag)
}
}
if (gpu_mode == GPU_NEIGH) {
if (gpu_mode != GPU_FORCE) {
inum = atom->nlocal;
firstneigh = re_gpu_compute_n(neighbor->ago, inum, nall, atom->x,
atom->type, domain->sublo, domain->subhi,
@ -199,7 +199,7 @@ void PairRESquaredGPU::init_style()
cell_size, gpu_mode, screen);
GPU_EXTRA::check_flag(success,error,world);
if (gpu_mode != GPU_NEIGH) {
if (gpu_mode == GPU_FORCE) {
int irequest = neighbor->request(this);
neighbor->requests[irequest]->half = 0;
neighbor->requests[irequest]->full = 1;