diff --git a/src/pair_table.cpp b/src/pair_table.cpp index cf9e5c3bfb..b1b6f45eda 100644 --- a/src/pair_table.cpp +++ b/src/pair_table.cpp @@ -378,7 +378,7 @@ void PairTable::read_table(Table *tb, char *file, char *keyword) utils::sfgets(FLERR,line,MAXLINE,fp,file,error); // no match, skip section param_extract(tb,line); utils::sfgets(FLERR,line,MAXLINE,fp,file,error); - for (int i = 0; i < tb->ninput; i++) + for (int i = 0; i < tb->ninput; i++) utils::sfgets(FLERR,line,MAXLINE,fp,file,error); } diff --git a/src/read_dump.cpp b/src/read_dump.cpp index 551cc63c9e..7a05f4b1b5 100644 --- a/src/read_dump.cpp +++ b/src/read_dump.cpp @@ -94,7 +94,7 @@ ReadDump::~ReadDump() memory->destroy(fields); memory->destroy(buf); - + for (int i = 0; i < nreader; i++) delete readers[i]; delete [] readers; delete [] nsnapatoms; @@ -359,7 +359,7 @@ bigint ReadDump::seek(bigint nrequest, int exact) readers[i]->skip(); } - if (eofflag) + if (eofflag) error->one(FLERR,"Read dump parallel files " "do not all have same timestep"); } @@ -466,7 +466,7 @@ bigint ReadDump::next(bigint ncurrent, bigint nlast, int nevery, int nskip) readers[i]->skip(); } - if (eofflag) + if (eofflag) error->one(FLERR,"Read dump parallel files " "do not all have same timestep"); } @@ -724,7 +724,7 @@ void ReadDump::read_atoms() otherproc = 0; ofirst = (bigint) otherproc * nsnap/nprocs_cluster; olast = (bigint) (otherproc+1) * nsnap/nprocs_cluster; - if (olast-ofirst > MAXSMALLINT) + if (olast-ofirst > MAXSMALLINT) error->one(FLERR,"Read dump snapshot is too large for a proc"); nnew = static_cast (olast - ofirst); @@ -765,7 +765,7 @@ void ReadDump::read_atoms() } else { ofirst = (bigint) me_cluster * nsnap/nprocs_cluster; olast = (bigint) (me_cluster+1) * nsnap/nprocs_cluster; - if (olast-ofirst > MAXSMALLINT) + if (olast-ofirst > MAXSMALLINT) error->one(FLERR,"Read dump snapshot is too large for a proc"); nnew = static_cast (olast - ofirst); if (nnew > maxnew || maxnew == 0) { @@ -791,7 +791,7 @@ void ReadDump::read_atoms() bigint sum = 0; for (int i = 0; i < nreader; i++) sum += nsnapatoms[i]; - if (sum > MAXSMALLINT) + if (sum > MAXSMALLINT) error->one(FLERR,"Read dump snapshot is too large for a proc"); nnew = static_cast (sum); if (nnew > maxnew || maxnew == 0) { @@ -811,7 +811,7 @@ void ReadDump::read_atoms() } nnew += nsnap; } - } + } } /* ---------------------------------------------------------------------- @@ -943,7 +943,7 @@ void ReadDump::process_atoms() ntrim++; } else i++; } - + atom->nlocal = nlocal; bigint nblocal = atom->nlocal; MPI_Allreduce(&nblocal,&atom->natoms,1,MPI_LMP_BIGINT,MPI_SUM,world); diff --git a/src/read_dump.h b/src/read_dump.h index 73cb0a8995..de174c3df6 100644 --- a/src/read_dump.h +++ b/src/read_dump.h @@ -86,7 +86,7 @@ private: double xlo,xhi,ylo,yhi,zlo,zhi,xy,xz,yz; // dump snapshot box params double xprd,yprd,zprd; - bigint *nsnapatoms; // # of atoms in one snapshot from + bigint *nsnapatoms; // # of atoms in one snapshot from // one (parallel) dump file // nreader-length vector b/c a reader proc // may read from multiple parallel dump files