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

Merge branch 'master' into improve-include-consistency

Browse Source 
# Conflicts:
#	src/utils.cpp
This commit is contained in:
Axel Kohlmeyer
2019-07-19 17:57:58 -04:00
parent ceb2ce5814 981b9a1f7a
commit a50d57bceb
23 changed files with 346 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/reader_xyz.cpp
View File

@ -168,7 +168,7 @@ bigint ReaderXYZ::read_header(double /*box*/[3][3], int &boxinfo, int &/*triclin
void ReaderXYZ::read_atoms(int n, int nfield, double **fields)
{
int i,m;
int i,m,rv;
char *eof;
int mytype;
double myx, myy, myz;
@ -178,7 +178,9 @@ void ReaderXYZ::read_atoms(int n, int nfield, double **fields)
if (eof == NULL) error->one(FLERR,"Unexpected end of dump file");
++nid;
sscanf(line,"%*s%lg%lg%lg", &myx, &myy, &myz);
rv = sscanf(line,"%*s%lg%lg%lg", &myx, &myy, &myz);
if (rv != 3)
error->one(FLERR,"Dump file is incorrectly formatted");
// XXX: we could insert an element2type translation here
// XXX: for now we flag unrecognized types as type 0,