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

Merge branch 'master' into varargs-log-error-functions

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-04-26 13:27:58 -04:00
parent e9e0bb71b6 31d244dd80
commit 6b04ebd617
1845 changed files with 3369 additions and 3357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/read_restart.cpp
View File

@ -339,7 +339,7 @@ void ReadRestart::command(int narg, char **arg)
procfile, utils::getsyserror());
}
int flag,procsperfile;
int procsperfile;
if (filereader) {
utils::sfread(FLERR,&flag,sizeof(int),1,fp,nullptr,error);
@ -704,7 +704,7 @@ void ReadRestart::header()
int procgrid[3];
read_int();
read_int_vec(3,procgrid);
int flag = 0;
flag = 0;
if (comm->user_procgrid[0] != 0 &&
procgrid[0] != comm->user_procgrid[0]) flag = 1;
if (comm->user_procgrid[1] != 0 &&