lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2011-05-26 22:45:42 +00:00
parent b220fdbcf5
commit ab5592e67b
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/input.cpp
View File

@ -808,23 +808,20 @@ void Input::accelerator()
if (domain->box_exist) if (domain->box_exist)
error->all("Accelerator command after simulation box is defined"); error->all("Accelerator command after simulation box is defined");
if (narg < 1) error->all("Illegal accelerator command"); if (narg < 1) error->all("Illegal accelerator command");
if (!lmp->asuffix || (strcmp(lmp->asuffix,arg[0]) != 0))
error->all("Accelerator command requires matching command-line -a switch");
if (strcmp(arg[0],"off") == 0) { if (strcmp(arg[0],"off") == 0) {
if (narg != 1) error->all("Illegal accelerator command"); if (narg != 1) error->all("Illegal accelerator command");
lmp->accelerator = 0; lmp->accelerator = 0;
return; return;
} } else if (strcmp(arg[0],"on") == 0) {
if (strcmp(arg[0],"on") == 0) {
if (narg != 1) error->all("Illegal accelerator command"); if (narg != 1) error->all("Illegal accelerator command");
lmp->accelerator = 1; lmp->accelerator = 1;
return; return;
} } else if (strcmp(arg[0],"cuda") == 0) {
if (!lmp->cuda) error->all("Accelerator cuda command without "
if (strcmp(arg[0],"cuda") == 0) lmp->cuda->accelerator(narg-1,&arg[1]); "USER-CUDA package installed");
else error->all("Illegal accelerator command"); lmp->cuda->accelerator(narg-1,&arg[1]);
} else error->all("Illegal accelerator command");
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

3
src/lammps.cpp
View File

@ -50,8 +50,7 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
screen = NULL; screen = NULL;
logfile = NULL; logfile = NULL;
// create CUDA class // create CUDA class if USER-CUDA installed, else dummy
// cuda = true version if USER-CUDA installed, else dummy
cuda = new Cuda(this); cuda = new Cuda(this);
if (!cuda->cuda_exists) { if (!cuda->cuda_exists) {