correct and reformat error messages for short reads

This commit is contained in:
Axel Kohlmeyer
2023-06-22 11:49:56 -04:00
parent ffda6596da
commit e9a06a0654

View File

@ -2021,9 +2021,7 @@ void ReadData::pairIJcoeffs()
if (eof) error->all(FLERR, "Unexpected end of data file");
if (tlabelflag && !lmap->is_complete(Atom::ATOM))
error->all(FLERR,
"Label map is incomplete: "
"all types must be assigned a unique type label");
error->all(FLERR,"Label map is incomplete: all types must be assigned a unique type label");
char *original = buf;
for (i = 0; i < ntypes; i++)
@ -2032,10 +2030,7 @@ void ReadData::pairIJcoeffs()
*next = '\0';
parse_coeffs(buf, nullptr, 0, 2, toffset, tlabelflag, lmap->lmap2lmap.atom);
if (ncoeffarg == 0)
error->all(FLERR,
"Unexpected empty line in PairIJCoeffs section. "
"Expected {} lines.",
(ntypes - 1) * ntypes);
error->all(FLERR, "Unexpected empty line in PairIJCoeffs section. Expected {} lines.", nsq);
force->pair->coeff(ncoeffarg, coeffarg);
buf = next + 1;
}
@ -2055,9 +2050,7 @@ void ReadData::bondcoeffs()
if (eof) error->all(FLERR, "Unexpected end of data file");
if (blabelflag && !lmap->is_complete(Atom::BOND))
error->all(FLERR,
"Label map is incomplete: "
"all types must be assigned a unique type label");
error->all(FLERR, "Label map is incomplete: all types must be assigned a unique type label");
char *original = buf;
for (int i = 0; i < nbondtypes; i++) {
@ -2086,9 +2079,7 @@ void ReadData::anglecoeffs(int which)
if (eof) error->all(FLERR, "Unexpected end of data file");
if (alabelflag && !lmap->is_complete(Atom::ANGLE))
error->all(FLERR,
"Label map is incomplete: "
"all types must be assigned a unique type label");
error->all(FLERR, "Label map is incomplete: all types must be assigned a unique type label");
char *original = buf;
for (int i = 0; i < nangletypes; i++) {
@ -2122,9 +2113,7 @@ void ReadData::dihedralcoeffs(int which)
if (eof) error->all(FLERR, "Unexpected end of data file");
if (dlabelflag && !lmap->is_complete(Atom::DIHEDRAL))
error->all(FLERR,
"Label map is incomplete: "
"all types must be assigned a unique type label");
error->all(FLERR, "Label map is incomplete: all types must be assigned a unique type label");
char *original = buf;
for (int i = 0; i < ndihedraltypes; i++) {