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@11100 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2013-12-06 23:19:33 +00:00
parent f41d6124fb
commit a4c075eacf
5 changed files with 115 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/output.cpp
View File

@ -762,13 +762,13 @@ void Output::create_restart(int narg, char **arg)
error->all(FLERR,"Both restart files must have '%' or neither");
}
int mpiio;
if (strstr(arg[1],".mpi")) mpiio = 1;
else mpiio = 0;
int mpiioflag;
if (strstr(arg[1],".mpi")) mpiioflag = 1;
else mpiioflag = 0;
if (nfile == 2) {
if (mpiio && !strstr(arg[2],".mpi"))
if (mpiioflag && !strstr(arg[2],".mpi"))
error->all(FLERR,"Both restart files must use MPI-IO or neither");
if (!mpiio && strstr(arg[2],".mpi"))
if (!mpiioflag && strstr(arg[2],".mpi"))
error->all(FLERR,"Both restart files must use MPI-IO or neither");
}
@ -777,7 +777,7 @@ void Output::create_restart(int narg, char **arg)
delete restart;
restart = new WriteRestart(lmp);
int iarg = nfile+1;
restart->multiproc_options(multiproc,mpiio,narg-iarg,&arg[iarg]);
restart->multiproc_options(multiproc,mpiioflag,narg-iarg,&arg[iarg]);
}
/* ----------------------------------------------------------------------