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

Replace Atom::count_words with utils::count_words

Browse Source
This commit is contained in:
Richard Berger
2020-05-15 16:18:24 -04:00
parent db46521d64
commit 4a2d3e95cb
56 changed files with 135 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/read_data.cpp
View File

@ -70,7 +70,6 @@ ReadData::ReadData(LAMMPS *lmp) : Pointers(lmp)
{
MPI_Comm_rank(world,&me);
line = new char[MAXLINE];
copy = new char[MAXLINE];
keyword = new char[MAXLINE];
style = new char[MAXLINE];
buffer = new char[CHUNK*MAXLINE];
@ -96,7 +95,6 @@ ReadData::ReadData(LAMMPS *lmp) : Pointers(lmp)
ReadData::~ReadData()
{
delete [] line;
delete [] copy;
delete [] keyword;
delete [] style;
delete [] buffer;
@ -1736,7 +1734,7 @@ void ReadData::bodies(int firstpass, AtomVec *ptr)
while (nword < ninteger) {
eof = fgets(&buffer[m],MAXLINE,fp);
if (eof == NULL) error->one(FLERR,"Unexpected end of data file");
ncount = atom->count_words(&buffer[m],copy);
ncount = utils::count_words(&buffer[m]);
if (ncount == 0)
error->one(FLERR,"Too few values in body lines in data file");
nword += ncount;
@ -1750,7 +1748,7 @@ void ReadData::bodies(int firstpass, AtomVec *ptr)
while (nword < ndouble) {
eof = fgets(&buffer[m],MAXLINE,fp);
if (eof == NULL) error->one(FLERR,"Unexpected end of data file");
ncount = atom->count_words(&buffer[m],copy);
ncount = utils::count_words(&buffer[m]);
if (ncount == 0)
error->one(FLERR,"Too few values in body lines in data file");
nword += ncount;