jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix airebo/morse
This commit is contained in:
sjplimp 2017-03-24 10:03:29 -06:00 committed by GitHub
parent f5a85d68ad 5c9892c083
commit e6fcaefe95
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/MANYBODY/pair_airebo_morse.cpp
View File

@ -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;
}

9
src/USER-OMP/pair_airebo_morse_omp.cpp
View File

@ -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;
}