Skip to content
Snippets Groups Projects
Commit ef4e8f28 authored by sjplimp's avatar sjplimp
Browse files 

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14071 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent df7687fc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/pair_lj_cut_coul_dsf.cpp
+ 3
− 2
View file @ ef4e8f28
...@@ -212,11 +212,12 @@ void PairLJCutCoulDSF::allocate() ...@@ -212,11 +212,12 @@ void PairLJCutCoulDSF::allocate()
void PairLJCutCoulDSF::settings(int narg, char **arg) 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]); alpha = force->numeric(FLERR,arg[0]);
cut_lj_global = force->numeric(FLERR,arg[1]); 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 // reset cutoffs that have been explicitly set
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment