lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix off-by-one bugs, improve error messages

This commit is contained in:
Axel Kohlmeyer 2022-08-04 12:24:15 -04:00
parent 6c32058728
commit a84c2ab18a
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fix_store_global.cpp
View File

@ -28,7 +28,7 @@ using namespace FixConst;
FixStoreGlobal::FixStoreGlobal(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg), vstore(nullptr), astore(nullptr), rbuf(nullptr)
{
if (narg != 6 && narg != 7) error->all(FLERR, "Illegal fix store command");
if (narg != 5) error->all(FLERR, "Illegal fix STORE/GLOBAL command: incorrect number of args");
// syntax: id group style n1 n2
// N2 = 1 is vector, N2 > 1 is array, no tensor allowed (yet)
@ -36,10 +36,10 @@ FixStoreGlobal::FixStoreGlobal(LAMMPS *lmp, int narg, char **arg) :
vecflag = arrayflag = 0;
restart_global = 1;
n1 = utils::inumeric(FLERR, arg[4], false, lmp);
n2 = utils::inumeric(FLERR, arg[5], false, lmp);
if (narg == 6) error->all(FLERR, "Illegal fix store command");
if (n1 <= 0 || n2 <= 0) error->all(FLERR, "Illegal fix store command");
n1 = utils::inumeric(FLERR, arg[3], false, lmp);
n2 = utils::inumeric(FLERR, arg[4], false, lmp);
if (n1 <= 0 || n2 <= 0)
error->all(FLERR, "Illegal fix STORE/GLOBAL dimension args: must be >0: {} {}", n1, n2);
if (n2 == 1)
vecflag = 1;
else

15
src/fix_store_peratom.cpp
View File

@ -28,7 +28,8 @@ using namespace FixConst;
FixStorePeratom::FixStorePeratom(LAMMPS *lmp, int narg, char **arg) :
Fix(lmp, narg, arg), vstore(nullptr), astore(nullptr)
{
if (narg != 5 && narg != 6) error->all(FLERR, "Illegal fix store command");
if (narg != 5 && narg != 6)
error->all(FLERR, "Illegal fix STORE/PERATOM command: number of args");
// syntax: id group style 0/1 n1 n2 (n3), last arg optional
// 0/1 flag = not-store or store peratom values in restart file
@ -38,14 +39,16 @@ FixStorePeratom::FixStorePeratom(LAMMPS *lmp, int narg, char **arg) :
disable = 0;
vecflag = arrayflag = tensorflag = 0;
restart_peratom = utils::inumeric(FLERR, arg[4], false, lmp);
n2 = utils::inumeric(FLERR, arg[5], false, lmp);
restart_peratom = utils::inumeric(FLERR, arg[3], false, lmp);
n2 = utils::inumeric(FLERR, arg[4], false, lmp);
if (narg == 6)
n3 = utils::inumeric(FLERR, arg[6], false, lmp);
n3 = utils::inumeric(FLERR, arg[5], false, lmp);
else
n3 = 1;
if (restart_peratom < 0 || restart_peratom > 1) error->all(FLERR, "Illegal fix store command");
if (n2 <= 0 || n3 <= 0) error->all(FLERR, "Illegal fix store command");
if (restart_peratom < 0 || restart_peratom > 1)
error->all(FLERR, "Illegal fix STORE/PERATOM restart flag: {}", restart_peratom);
if (n2 <= 0 || n3 <= 0)
error->all(FLERR, "Illegal fix STORE/PERATOM dimension args: must be >0: {} {}", n2, n3);
if (n2 == 1 && narg == 5)
vecflag = 1;
else if (narg == 5)