Skip to content
Snippets Groups Projects
Commit e6fcaefe authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #431 from v0i0/fix-airebo-morse

Fix airebo/morse
parents f5a85d68 5c9892c0
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;
}
......@@ -27,14 +27,7 @@ PairAIREBOMorseOMP::PairAIREBOMorseOMP(LAMMPS *lmp) : PairAIREBOOMP(lmp) {}
void PairAIREBOMorseOMP::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]);
}
PairAIREBOOMP::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