ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2014-09-09 21:15:33 +00:00
parent 3f53286836
commit b57945c40e
3 changed files with 55 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/GPU/fix_gpu.cpp
View File

@ -95,7 +95,6 @@ FixGPU::FixGPU(LAMMPS *lmp, int narg, char **arg) :
_gpu_mode = GPU_NEIGH;
_particle_split = 1.0;
int newtonflag = 0;
int nthreads = 1;
int threads_per_atom = -1;
double binsize = -1;
@ -113,14 +112,9 @@ FixGPU::FixGPU(LAMMPS *lmp, int narg, char **arg) :
} else if (strcmp(arg[iarg],"split") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command");
_particle_split = force->numeric(FLERR,arg[iarg+1]);
if (_particle_split <= 0.0 || _particle_split > 1.0)
if (_particle_split == 0.0 || _particle_split > 1.0)
error->all(FLERR,"Illegal package GPU command");
iarg += 2;
} else if (strcmp(arg[iarg],"newton") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command");
if (strcmp(arg[iarg]+1,"off") == 0) newtonflag = 0;
else if (strcmp(arg[iarg]+1,"on") == 0) newtonflag = 1;
iarg += 2;
} else if (strcmp(arg[iarg],"gpuID") == 0) {
if (iarg+3 > narg) error->all(FLERR,"Illegal package gpu command");
first_gpu = force->inumeric(FLERR,arg[iarg+1]);
@ -158,6 +152,12 @@ FixGPU::FixGPU(LAMMPS *lmp, int narg, char **arg) :
error->all(FLERR,"No OpenMP support compiled in");
#endif
// set newton_pair = 0 since required by all GPU pair styles
force->newton_pair = 0;
if (force->newton_pair || force->newton_bond) force->newton = 1;
else force->newton = 0;
// pass params to GPU library
int gpu_flag = lmp_init_device(universe->uworld, world, first_gpu, last_gpu,