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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14420 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2016-01-11 22:00:15 +00:00
parent d3f534f5cc
commit e24ed78dd1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/read_data.cpp
View File

@ -1469,7 +1469,7 @@ void ReadData::bonus(bigint nbonus, AtomVec *ptr, const char *type)
void ReadData::bodies(int firstpass) void ReadData::bodies(int firstpass)
{ {
int i,m,nchunk,nline,nmax,ninteger,ndouble,nword,onebody,tmp; int i,m,nchunk,nline,nmax,ninteger,ndouble,nword,ncount,onebody,tmp;
char *eof; char *eof;
int mapflag = 0; int mapflag = 0;
@ -1500,8 +1500,7 @@ void ReadData::bodies(int firstpass)
sscanf(&buffer[m],"%d %d %d",&tmp,&ninteger,&ndouble); sscanf(&buffer[m],"%d %d %d",&tmp,&ninteger,&ndouble);
m += strlen(&buffer[m]); m += strlen(&buffer[m]);
// read lines one at a time into buffer // read lines one at a time into buffer and count words
// make copy of line and count words
// count to ninteger and ndouble until have enough lines // count to ninteger and ndouble until have enough lines
onebody = 0; onebody = 0;
@ -1510,23 +1509,29 @@ void ReadData::bodies(int firstpass)
while (nword < ninteger) { while (nword < ninteger) {
eof = fgets(&buffer[m],MAXLINE,fp); eof = fgets(&buffer[m],MAXLINE,fp);
if (eof == NULL) error->one(FLERR,"Unexpected end of data file"); if (eof == NULL) error->one(FLERR,"Unexpected end of data file");
nword += atom->count_words(&buffer[m],copy); ncount = atom->count_words(&buffer[m],copy);
if (ncount == 0)
error->one(FLERR,"Too few values in body lines in data file");
nword += ncount;
m += strlen(&buffer[m]); m += strlen(&buffer[m]);
onebody++; onebody++;
} }
if (nword > ninteger) if (nword > ninteger)
error->one(FLERR,"Too many value in body lines in data file"); error->one(FLERR,"Too many values in body lines in data file");
nword = 0; nword = 0;
while (nword < ndouble) { while (nword < ndouble) {
eof = fgets(&buffer[m],MAXLINE,fp); eof = fgets(&buffer[m],MAXLINE,fp);
if (eof == NULL) error->one(FLERR,"Unexpected end of data file"); if (eof == NULL) error->one(FLERR,"Unexpected end of data file");
nword += atom->count_words(&buffer[m],copy); ncount = atom->count_words(&buffer[m],copy);
if (ncount == 0)
error->one(FLERR,"Too few values in body lines in data file");
nword += ncount;
m += strlen(&buffer[m]); m += strlen(&buffer[m]);
onebody++; onebody++;
} }
if (nword > ndouble) if (nword > ndouble)
error->one(FLERR,"Too many value in body lines in data file"); error->one(FLERR,"Too many values in body lines in data file");
if (onebody+1 > MAXBODY) if (onebody+1 > MAXBODY)
error->one(FLERR, error->one(FLERR,