ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve/correct error messages for fix efield

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-03-08 18:25:58 -05:00
parent c3c99b701c
commit 189be4625e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/fix_efield.cpp
View File

@ -42,7 +42,7 @@ FixEfield::FixEfield(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg), xstr(nullptr), ystr(nullptr), zstr(nullptr), estr(nullptr), Fix(lmp, narg, arg), xstr(nullptr), ystr(nullptr), zstr(nullptr), estr(nullptr),
idregion(nullptr), region(nullptr), efield(nullptr) idregion(nullptr), region(nullptr), efield(nullptr)
{ {
if (narg < 6) error->all(FLERR, "Illegal fix efield command"); if (narg < 6) utils::missing_cmd_args(FLERR, "fix efield", error);
dynamic_group_allow = 1; dynamic_group_allow = 1;
vector_flag = 1; vector_flag = 1;
@ -85,20 +85,20 @@ FixEfield::FixEfield(LAMMPS *lmp, int narg, char **arg) :
int iarg = 6; int iarg = 6;
while (iarg < narg) { while (iarg < narg) {
if (strcmp(arg[iarg], "region") == 0) { if (strcmp(arg[iarg], "region") == 0) {
if (iarg + 2 > narg) error->all(FLERR, "Illegal fix efield command"); if (iarg + 2 > narg) utils::missing_cmd_args(FLERR, "fix efield region", error);
region = domain->get_region_by_id(arg[iarg + 1]); region = domain->get_region_by_id(arg[iarg + 1]);
if (!region) error->all(FLERR, "Region {} for fix efield does not exist", arg[iarg + 1]); if (!region) error->all(FLERR, "Region {} for fix efield does not exist", arg[iarg + 1]);
idregion = utils::strdup(arg[iarg + 1]); idregion = utils::strdup(arg[iarg + 1]);
iarg += 2; iarg += 2;
} else if (strcmp(arg[iarg], "energy") == 0) { } else if (strcmp(arg[iarg], "energy") == 0) {
if (iarg + 2 > narg) error->all(FLERR, "Illegal fix efield command"); if (iarg + 2 > narg) utils::missing_cmd_args(FLERR, "fix efield energy", error);
if (utils::strmatch(arg[iarg + 1], "^v_")) { if (utils::strmatch(arg[iarg + 1], "^v_")) {
estr = utils::strdup(arg[iarg + 1] + 2); estr = utils::strdup(arg[iarg + 1] + 2);
} else } else
error->all(FLERR, "Illegal fix efield command"); error->all(FLERR, "Illegal fix efield energy value argument");
iarg += 2; iarg += 2;
} else } else
error->all(FLERR, "Illegal fix efield command"); error->all(FLERR, "Unknown fix efield keyword: {}", arg[iarg]);
} }
force_flag = 0; force_flag = 0;
@ -188,7 +188,7 @@ void FixEfield::init()
if (idregion) { if (idregion) {
region = domain->get_region_by_id(idregion); region = domain->get_region_by_id(idregion);
if (!region) error->all(FLERR, "Region {} for fix aveforce does not exist", idregion); if (!region) error->all(FLERR, "Region {} for fix efield does not exist", idregion);
} }
if (xstyle == ATOM || ystyle == ATOM || zstyle == ATOM) if (xstyle == ATOM || ystyle == ATOM || zstyle == ATOM)