diff --git a/src/GPU/fix_gpu.cpp b/src/GPU/fix_gpu.cpp index 843bff2a35..f8ce12f1d4 100644 --- a/src/GPU/fix_gpu.cpp +++ b/src/GPU/fix_gpu.cpp @@ -148,9 +148,7 @@ 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; - else error->all(FLERR,"Illegal package gpu command"); + newtonflag = utils::logical(FLERR,arg[iarg+1],false,lmp); iarg += 2; } else if (strcmp(arg[iarg],"binsize") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command"); @@ -190,9 +188,7 @@ FixGPU::FixGPU(LAMMPS *lmp, int narg, char **arg) : iarg += 2; } else if (strcmp(arg[iarg],"pair/only") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command"); - if (strcmp(arg[iarg+1],"off") == 0) pair_only_flag = 0; - else if (strcmp(arg[iarg+1],"on") == 0) pair_only_flag = 1; - else error->all(FLERR,"Illegal package gpu command"); + pair_only_flag = utils::logical(FLERR,arg[iarg+1],false,lmp); iarg += 2; } else if (strcmp(arg[iarg],"ocl_args") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package gpu command"); @@ -203,7 +199,7 @@ FixGPU::FixGPU(LAMMPS *lmp, int narg, char **arg) : #if (LAL_USE_OMP == 0) if (nthreads > 1) - error->all(FLERR,"No OpenMP support compiled in"); + error->all(FLERR,"No OpenMP support compiled into the GPU package"); #else if (nthreads > 0) { omp_set_num_threads(nthreads); diff --git a/src/INTEL/fix_intel.cpp b/src/INTEL/fix_intel.cpp index d0633d7791..de17c02864 100644 --- a/src/INTEL/fix_intel.cpp +++ b/src/INTEL/fix_intel.cpp @@ -118,9 +118,7 @@ FixIntel::FixIntel(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg) iarg += 2; } else if (strcmp(arg[iarg], "ghost") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package intel command"); - if (strcmp(arg[iarg+1],"yes") == 0) _offload_ghost = 1; - else if (strcmp(arg[iarg+1],"no") == 0) _offload_ghost = 0; - else error->all(FLERR,"Illegal package intel command"); + _offload_ghost = utils::logical(FLERR,arg[iarg+1],false,lmp); iarg += 2; } else if (strcmp(arg[iarg], "tpc") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package intel command"); @@ -135,9 +133,7 @@ FixIntel::FixIntel(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg) iarg++; } else if (strcmp(arg[iarg], "lrt") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package intel command"); - if (strcmp(arg[iarg+1],"yes") == 0) _lrt = 1; - else if (strcmp(arg[iarg+1],"no") == 0) _lrt = 0; - else error->all(FLERR,"Illegal package intel command"); + _lrt = utils::logical(FLERR,arg[iarg+1],false,lmp); iarg += 2; } diff --git a/src/OPENMP/fix_omp.cpp b/src/OPENMP/fix_omp.cpp index 2b7e7eeaf9..ec5b1d5be0 100644 --- a/src/OPENMP/fix_omp.cpp +++ b/src/OPENMP/fix_omp.cpp @@ -99,9 +99,7 @@ FixOMP::FixOMP(LAMMPS *lmp, int narg, char **arg) while (iarg < narg) { if (strcmp(arg[iarg],"neigh") == 0) { if (iarg+2 > narg) error->all(FLERR,"Illegal package omp command"); - if (strcmp(arg[iarg+1],"yes") == 0) _neighbor = true; - else if (strcmp(arg[iarg+1],"no") == 0) _neighbor = false; - else error->all(FLERR,"Illegal package omp command"); + _neighbor = utils::logical(FLERR,arg[iarg+1],false,lmp) != 0; iarg += 2; } else error->all(FLERR,"Illegal package omp command"); }