tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2015-09-24 20:57:49 +00:00
parent df7687fcc1
commit ef4e8f288a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pair_lj_cut_coul_dsf.cpp
View File

@ -212,11 +212,12 @@ void PairLJCutCoulDSF::allocate()
void PairLJCutCoulDSF::settings(int narg, char **arg)
{
if (narg != 3) error->all(FLERR,"Illegal pair_style command");
if (narg < 2 || narg > 3) error->all(FLERR,"Illegal pair_style command");
alpha = force->numeric(FLERR,arg[0]);
cut_lj_global = force->numeric(FLERR,arg[1]);
cut_coul = force->numeric(FLERR,arg[2]);
if (narg == 2) cut_coul = cut_lj_global;
else cut_coul = force->numeric(FLERR,arg[2]);
// reset cutoffs that have been explicitly set