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

simplify parsing numbers and reduce usage of BIGINT_FORMAT

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-03-30 07:12:25 -04:00
parent ff3ac64b7e
commit 999c880dfd
2 changed files with 40 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/reader_native.cpp
View File

@ -101,9 +101,7 @@ int ReaderNative::read_time(bigint &ntimestep)
error->one(FLERR,"Dump file is incorrectly formatted");
read_lines(1);
int rv = sscanf(line,BIGINT_FORMAT,&ntimestep);
if (rv != 1)
error->one(FLERR,"Dump file is incorrectly formatted");
ntimestep = utils::bnumeric(FLERR, utils::trim(line), true, lmp);
}
return 0;
}
@ -140,10 +138,8 @@ void ReaderNative::skip()
} else {
read_lines(2);
bigint natoms;
int rv = sscanf(line,BIGINT_FORMAT,&natoms);
if (rv != 1) error->one(FLERR,"Dump file is incorrectly formatted");
// parse natoms value so we error out on incorrectly formatted dumps
utils::bnumeric(FLERR, utils::trim(line), true, lmp);
read_lines(5);
// invoke read_lines() in chunks no larger than MAXSMALLINT