type labels for MOLECULE tip4p styles
This commit is contained in:
@ -426,10 +426,10 @@ void PairLJCutTIP4PCut::settings(int narg, char **arg)
|
|||||||
{
|
{
|
||||||
if (narg < 6 || narg > 7) error->all(FLERR,"Illegal pair_style command");
|
if (narg < 6 || narg > 7) error->all(FLERR,"Illegal pair_style command");
|
||||||
|
|
||||||
typeO = utils::inumeric(FLERR,arg[0],false,lmp);
|
typeO = utils::expand_type_int(FLERR, arg[0], Atom::ATOM, lmp);
|
||||||
typeH = utils::inumeric(FLERR,arg[1],false,lmp);
|
typeH = utils::expand_type_int(FLERR, arg[1], Atom::ATOM, lmp);
|
||||||
typeB = utils::inumeric(FLERR,arg[2],false,lmp);
|
typeB = utils::expand_type_int(FLERR, arg[2], Atom::BOND, lmp);
|
||||||
typeA = utils::inumeric(FLERR,arg[3],false,lmp);
|
typeA = utils::expand_type_int(FLERR, arg[3], Atom::ANGLE, lmp);
|
||||||
qdist = utils::numeric(FLERR, arg[4], false, lmp);
|
qdist = utils::numeric(FLERR, arg[4], false, lmp);
|
||||||
|
|
||||||
cut_lj_global = utils::numeric(FLERR, arg[5], false, lmp);
|
cut_lj_global = utils::numeric(FLERR, arg[5], false, lmp);
|
||||||
|
|||||||
@ -375,10 +375,10 @@ void PairTIP4PCut::settings(int narg, char **arg)
|
|||||||
{
|
{
|
||||||
if (narg != 6) error->all(FLERR,"Illegal pair_style command");
|
if (narg != 6) error->all(FLERR,"Illegal pair_style command");
|
||||||
|
|
||||||
typeO = utils::inumeric(FLERR,arg[0],false,lmp);
|
typeO = utils::expand_type_int(FLERR, arg[0], Atom::ATOM, lmp);
|
||||||
typeH = utils::inumeric(FLERR,arg[1],false,lmp);
|
typeH = utils::expand_type_int(FLERR, arg[1], Atom::ATOM, lmp);
|
||||||
typeB = utils::inumeric(FLERR,arg[2],false,lmp);
|
typeB = utils::expand_type_int(FLERR, arg[2], Atom::BOND, lmp);
|
||||||
typeA = utils::inumeric(FLERR,arg[3],false,lmp);
|
typeA = utils::expand_type_int(FLERR, arg[3], Atom::ANGLE, lmp);
|
||||||
qdist = utils::numeric(FLERR, arg[4], false, lmp);
|
qdist = utils::numeric(FLERR, arg[4], false, lmp);
|
||||||
cut_coul = utils::numeric(FLERR, arg[5], false, lmp);
|
cut_coul = utils::numeric(FLERR, arg[5], false, lmp);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user