From 90d0ffba1dd24f40472b042316a2a229de5f1f9f Mon Sep 17 00:00:00 2001 From: sjplimp Date: Wed, 10 Sep 2014 22:46:53 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12480 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/GPU/fix_gpu.cpp | 4 ++-- src/KOKKOS/kokkos.cpp | 4 ++-- src/USER-CUDA/cuda.cpp | 4 ++-- src/lammps.cpp | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/GPU/fix_gpu.cpp b/src/GPU/fix_gpu.cpp index 3e51811059..a9aec7c35a 100644 --- a/src/GPU/fix_gpu.cpp +++ b/src/GPU/fix_gpu.cpp @@ -110,8 +110,8 @@ FixGPU::FixGPU(LAMMPS *lmp, int narg, char **arg) : 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; + if (strcmp(arg[iarg+1],"off") == 0) newtonflag = 0; + else if (strcmp(arg[iarg+1],"on") == 0) newtonflag = 1; else error->all(FLERR,"Illegal package gpu command"); } else if (strcmp(arg[iarg],"split") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command"); diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp index 9b5df82b86..ee1d231894 100644 --- a/src/KOKKOS/kokkos.cpp +++ b/src/KOKKOS/kokkos.cpp @@ -150,8 +150,8 @@ void KokkosLMP::accelerator(int narg, char **arg) iarg += 2; } else if (strcmp(arg[iarg],"newton") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package kokkos command"); - if (strcmp(arg[iarg]+1,"off") == 0) newtonflag = 0; - else if (strcmp(arg[iarg]+1,"on") == 0) newtonflag = 1; + if (strcmp(arg[iarg+1],"off") == 0) newtonflag = 0; + else if (strcmp(arg[iarg+1],"on") == 0) newtonflag = 1; else error->all(FLERR,"Illegal package kokkos command"); } else if (strcmp(arg[iarg],"comm") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package kokkos command"); diff --git a/src/USER-CUDA/cuda.cpp b/src/USER-CUDA/cuda.cpp index d83c460205..4afb212853 100644 --- a/src/USER-CUDA/cuda.cpp +++ b/src/USER-CUDA/cuda.cpp @@ -232,8 +232,8 @@ void Cuda::accelerator(int narg, char **arg) while (iarg < narg) { if (strcmp(arg[iarg],"newton") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package cuda command"); - if (strcmp(arg[iarg]+1,"off") == 0) newtonflag = 0; - else if (strcmp(arg[iarg]+1,"on") == 0) newtonflag = 1; + if (strcmp(arg[iarg+1],"off") == 0) newtonflag = 0; + else if (strcmp(arg[iarg+1],"on") == 0) newtonflag = 1; else error->all(FLERR,"Illegal package cuda command"); } else if (strcmp(arg[iarg],"gpuID") == 0) { if (iarg+pppn+1 > narg) error->all(FLERR,"Illegal package cuda command"); diff --git a/src/lammps.cpp b/src/lammps.cpp index f8a17ccf8b..ea927ea0f4 100644 --- a/src/lammps.cpp +++ b/src/lammps.cpp @@ -691,9 +691,6 @@ void LAMMPS::post_create(int npack, int *pfirst, int *plast, char **arg) void LAMMPS::init() { - if (cuda) cuda->accelerator(0,NULL); - if (kokkos) kokkos->accelerator(0,NULL); - update->init(); force->init(); // pair must come after update due to minimizer domain->init();