Skip to content
Snippets Groups Projects
Commit 9ecc5c8c authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'fix-airebo-morse' of https://github.com/v0i0/lammps into pull-431

parents dcede304 47cebb0d
No related branches found
No related tags found
No related merge requests found
......@@ -27,14 +27,7 @@ PairAIREBOMorse::PairAIREBOMorse(LAMMPS *lmp) : PairAIREBO(lmp) {}
void PairAIREBOMorse::settings(int narg, char **arg)
{
if (narg != 1 && narg != 3) error->all(FLERR,"Illegal pair_style command");
cutlj = force->numeric(FLERR,arg[0]);
if (narg == 3) {
ljflag = force->inumeric(FLERR,arg[1]);
torflag = force->inumeric(FLERR,arg[2]);
}
PairAIREBO::settings(narg, arg);
morseflag = 1;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment