lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6370 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2011-06-13 17:29:06 +00:00
parent 19a9c8b61a
commit 1fedcb6e5e
2 changed files with 11 additions and 1 deletions

5
src/atom.cpp
View File

@ -805,8 +805,11 @@ void Atom::data_atoms(int n, char *buf)
next = strchr(buf,'\n');
values[0] = strtok(buf," \t\n\r\f");
for (m = 1; m < nwords; m++)
if (values[0] == NULL) error->all("Incorrect atom format in data file");
for (m = 1; m < nwords; m++) {
values[m] = strtok(NULL," \t\n\r\f");
if (values[m] == NULL) error->all("Incorrect atom format in data file");
}
if (imageflag)
imagedata = ((atoi(values[iptr+2]) + 512 & 1023) << 20) |

7
src/read_data.cpp
View File

@ -461,6 +461,7 @@ void ReadData::atoms()
}
buffer[m++] = '\n';
}
buffer[m] = '\0';
MPI_Bcast(&m,1,MPI_INT,0,world);
MPI_Bcast(buffer,m,MPI_CHAR,0,world);
@ -552,6 +553,7 @@ void ReadData::velocities()
}
buffer[m++] = '\n';
}
buffer[m] = '\0';
MPI_Bcast(&m,1,MPI_INT,0,world);
MPI_Bcast(buffer,m,MPI_CHAR,0,world);
@ -603,6 +605,7 @@ void ReadData::ellipsoids()
}
buffer[m++] = '\n';
}
buffer[m] = '\0';
MPI_Bcast(&m,1,MPI_INT,0,world);
MPI_Bcast(buffer,m,MPI_CHAR,0,world);
@ -642,6 +645,7 @@ void ReadData::bonds()
}
buffer[m++] = '\n';
}
buffer[m] = '\0';
MPI_Bcast(&m,1,MPI_INT,0,world);
MPI_Bcast(buffer,m,MPI_CHAR,0,world);
@ -687,6 +691,7 @@ void ReadData::angles()
}
buffer[m++] = '\n';
}
buffer[m] = '\0';
MPI_Bcast(&m,1,MPI_INT,0,world);
MPI_Bcast(buffer,m,MPI_CHAR,0,world);
@ -732,6 +737,7 @@ void ReadData::dihedrals()
}
buffer[m++] = '\n';
}
buffer[m] = '\0';
MPI_Bcast(&m,1,MPI_INT,0,world);
MPI_Bcast(buffer,m,MPI_CHAR,0,world);
@ -778,6 +784,7 @@ void ReadData::impropers()
}
buffer[m++] = '\n';
}
buffer[m] = '\0';
MPI_Bcast(&m,1,MPI_INT,0,world);
MPI_Bcast(buffer,m,MPI_CHAR,0,world);