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@12480 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2014-09-10 22:46:53 +00:00
parent 7f8da4e667
commit 90d0ffba1d
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GPU/fix_gpu.cpp
View File

@ -110,8 +110,8 @@ FixGPU::FixGPU(LAMMPS *lmp, int narg, char **arg) :
iarg += 2; iarg += 2;
} else if (strcmp(arg[iarg],"newton") == 0) { } else if (strcmp(arg[iarg],"newton") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command"); if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command");
if (strcmp(arg[iarg]+1,"off") == 0) newtonflag = 0; if (strcmp(arg[iarg+1],"off") == 0) newtonflag = 0;
else if (strcmp(arg[iarg]+1,"on") == 0) newtonflag = 1; else if (strcmp(arg[iarg+1],"on") == 0) newtonflag = 1;
else error->all(FLERR,"Illegal package gpu command"); else error->all(FLERR,"Illegal package gpu command");
} else if (strcmp(arg[iarg],"split") == 0) { } else if (strcmp(arg[iarg],"split") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command"); if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command");

4
src/KOKKOS/kokkos.cpp
View File

@ -150,8 +150,8 @@ void KokkosLMP::accelerator(int narg, char **arg)
iarg += 2; iarg += 2;
} else if (strcmp(arg[iarg],"newton") == 0) { } else if (strcmp(arg[iarg],"newton") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal package kokkos command"); if (iarg+2 > narg) error->all(FLERR,"Illegal package kokkos command");
if (strcmp(arg[iarg]+1,"off") == 0) newtonflag = 0; if (strcmp(arg[iarg+1],"off") == 0) newtonflag = 0;
else if (strcmp(arg[iarg]+1,"on") == 0) newtonflag = 1; else if (strcmp(arg[iarg+1],"on") == 0) newtonflag = 1;
else error->all(FLERR,"Illegal package kokkos command"); else error->all(FLERR,"Illegal package kokkos command");
} else if (strcmp(arg[iarg],"comm") == 0) { } else if (strcmp(arg[iarg],"comm") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal package kokkos command"); if (iarg+2 > narg) error->all(FLERR,"Illegal package kokkos command");

4
src/USER-CUDA/cuda.cpp
View File

@ -232,8 +232,8 @@ void Cuda::accelerator(int narg, char **arg)
while (iarg < narg) { while (iarg < narg) {
if (strcmp(arg[iarg],"newton") == 0) { if (strcmp(arg[iarg],"newton") == 0) {
if (iarg+2 > narg) error->all(FLERR,"Illegal package cuda command"); if (iarg+2 > narg) error->all(FLERR,"Illegal package cuda command");
if (strcmp(arg[iarg]+1,"off") == 0) newtonflag = 0; if (strcmp(arg[iarg+1],"off") == 0) newtonflag = 0;
else if (strcmp(arg[iarg]+1,"on") == 0) newtonflag = 1; else if (strcmp(arg[iarg+1],"on") == 0) newtonflag = 1;
else error->all(FLERR,"Illegal package cuda command"); else error->all(FLERR,"Illegal package cuda command");
} else if (strcmp(arg[iarg],"gpuID") == 0) { } else if (strcmp(arg[iarg],"gpuID") == 0) {
if (iarg+pppn+1 > narg) error->all(FLERR,"Illegal package cuda command"); if (iarg+pppn+1 > narg) error->all(FLERR,"Illegal package cuda command");

3
src/lammps.cpp
View File

@ -691,9 +691,6 @@ void LAMMPS::post_create(int npack, int *pfirst, int *plast, char **arg)
void LAMMPS::init() void LAMMPS::init()
{ {
if (cuda) cuda->accelerator(0,NULL);
if (kokkos) kokkos->accelerator(0,NULL);
update->init(); update->init();
force->init(); // pair must come after update due to minimizer force->init(); // pair must come after update due to minimizer
domain->init(); domain->init();