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

6
src/RIGID/fix_rigid.cpp
View File

@ -329,7 +329,7 @@ FixRigid::FixRigid(LAMMPS *lmp, int narg, char **arg) :
pstyle = ANISO;
dimension = domain->dimension;
for (int i = 0; i < 3; i++) {
for (i = 0; i < 3; i++) {
p_start[i] = p_stop[i] = p_period[i] = 0.0;
p_flag[i] = 0;
}
@ -551,7 +551,7 @@ FixRigid::FixRigid(LAMMPS *lmp, int narg, char **arg) :
// set pstat_flag
pstat_flag = 0;
for (int i = 0; i < 3; i++)
for (i = 0; i < 3; i++)
if (p_flag[i]) pstat_flag = 1;
if (pcouple == XYZ || (dimension == 2 && pcouple == XY)) pstyle = ISO;
@ -2301,7 +2301,7 @@ void FixRigid::readfile(int which, double *vec,
int nread = 0;
while (nread < nlines) {
nchunk = MIN(nlines-nread,CHUNK);
eofflag = comm->read_lines_from_file(fp,nchunk,MAXLINE,buffer);
eofflag = utils::read_lines_from_file(fp,nchunk,MAXLINE,buffer,me,world);
if (eofflag) error->all(FLERR,"Unexpected end of fix rigid file");
buf = buffer;