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

minor whitespace cleanup commit to retrigger PR tests on github

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-03-26 16:43:09 -04:00
parent cf349633f7
commit b6b0d0b30e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pair_table.cpp
View File

@ -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 utils::sfgets(FLERR,line,MAXLINE,fp,file,error); // no match, skip section
param_extract(tb,line); param_extract(tb,line);
utils::sfgets(FLERR,line,MAXLINE,fp,file,error); 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); utils::sfgets(FLERR,line,MAXLINE,fp,file,error);
} }

16
src/read_dump.cpp
View File

@ -94,7 +94,7 @@ ReadDump::~ReadDump()
memory->destroy(fields); memory->destroy(fields);
memory->destroy(buf); memory->destroy(buf);
for (int i = 0; i < nreader; i++) delete readers[i]; for (int i = 0; i < nreader; i++) delete readers[i];
delete [] readers; delete [] readers;
delete [] nsnapatoms; delete [] nsnapatoms;
@ -359,7 +359,7 @@ bigint ReadDump::seek(bigint nrequest, int exact)
readers[i]->skip(); readers[i]->skip();
} }
if (eofflag) if (eofflag)
error->one(FLERR,"Read dump parallel files " error->one(FLERR,"Read dump parallel files "
"do not all have same timestep"); "do not all have same timestep");
} }
@ -466,7 +466,7 @@ bigint ReadDump::next(bigint ncurrent, bigint nlast, int nevery, int nskip)
readers[i]->skip(); readers[i]->skip();
} }
if (eofflag) if (eofflag)
error->one(FLERR,"Read dump parallel files " error->one(FLERR,"Read dump parallel files "
"do not all have same timestep"); "do not all have same timestep");
} }
@ -724,7 +724,7 @@ void ReadDump::read_atoms()
otherproc = 0; otherproc = 0;
ofirst = (bigint) otherproc * nsnap/nprocs_cluster; ofirst = (bigint) otherproc * nsnap/nprocs_cluster;
olast = (bigint) (otherproc+1) * 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"); error->one(FLERR,"Read dump snapshot is too large for a proc");
nnew = static_cast<int> (olast - ofirst); nnew = static_cast<int> (olast - ofirst);
@ -765,7 +765,7 @@ void ReadDump::read_atoms()
} else { } else {
ofirst = (bigint) me_cluster * nsnap/nprocs_cluster; ofirst = (bigint) me_cluster * nsnap/nprocs_cluster;
olast = (bigint) (me_cluster+1) * 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"); error->one(FLERR,"Read dump snapshot is too large for a proc");
nnew = static_cast<int> (olast - ofirst); nnew = static_cast<int> (olast - ofirst);
if (nnew > maxnew || maxnew == 0) { if (nnew > maxnew || maxnew == 0) {
@ -791,7 +791,7 @@ void ReadDump::read_atoms()
bigint sum = 0; bigint sum = 0;
for (int i = 0; i < nreader; i++) for (int i = 0; i < nreader; i++)
sum += nsnapatoms[i]; sum += nsnapatoms[i];
if (sum > MAXSMALLINT) if (sum > MAXSMALLINT)
error->one(FLERR,"Read dump snapshot is too large for a proc"); error->one(FLERR,"Read dump snapshot is too large for a proc");
nnew = static_cast<int> (sum); nnew = static_cast<int> (sum);
if (nnew > maxnew || maxnew == 0) { if (nnew > maxnew || maxnew == 0) {
@ -811,7 +811,7 @@ void ReadDump::read_atoms()
} }
nnew += nsnap; nnew += nsnap;
} }
} }
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
@ -943,7 +943,7 @@ void ReadDump::process_atoms()
ntrim++; ntrim++;
} else i++; } else i++;
} }
atom->nlocal = nlocal; atom->nlocal = nlocal;
bigint nblocal = atom->nlocal; bigint nblocal = atom->nlocal;
MPI_Allreduce(&nblocal,&atom->natoms,1,MPI_LMP_BIGINT,MPI_SUM,world); MPI_Allreduce(&nblocal,&atom->natoms,1,MPI_LMP_BIGINT,MPI_SUM,world);

2
src/read_dump.h
View File

@ -86,7 +86,7 @@ private:
double xlo,xhi,ylo,yhi,zlo,zhi,xy,xz,yz; // dump snapshot box params double xlo,xhi,ylo,yhi,zlo,zhi,xy,xz,yz; // dump snapshot box params
double xprd,yprd,zprd; double xprd,yprd,zprd;
bigint *nsnapatoms; // # of atoms in one snapshot from bigint *nsnapatoms; // # of atoms in one snapshot from
// one (parallel) dump file // one (parallel) dump file
// nreader-length vector b/c a reader proc // nreader-length vector b/c a reader proc
// may read from multiple parallel dump files // may read from multiple parallel dump files