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

Browse Source
This commit is contained in:
sjplimp
2013-07-25 00:24:25 +00:00
parent 68701b561a
commit 6a79706441
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/variable.cpp
View File

@ -3845,6 +3845,8 @@ int VarReader::read_scalar(char *str)
int n; int n;
char *ptr; char *ptr;
// read one string from file
if (me == 0) { if (me == 0) {
while (1) { while (1) {
if (fgets(str,MAXLINE,fp) == NULL) n = 0; if (fgets(str,MAXLINE,fp) == NULL) n = 0;
@ -3872,8 +3874,8 @@ int VarReader::read_scalar(char *str)
int VarReader::read_peratom() int VarReader::read_peratom()
{ {
int i,m,tagdata,nchunk,eof; int i,m,n,tagdata,nchunk,eof;
char *next; char *ptr,*next;
double value; double value;
// set all per-atom values to 0.0 // set all per-atom values to 0.0
@ -3884,10 +3886,28 @@ int VarReader::read_peratom()
int nlocal = atom->nlocal; int nlocal = atom->nlocal;
for (i = 0; i < nlocal; i++) vstore[i] = 0.0; for (i = 0; i < nlocal; i++) vstore[i] = 0.0;
int map_tag_max = atom->map_tag_max; // read one string from file, convert to Nlines
// NOTE: read this value from file char str[MAXLINE];
bigint nlines = atom->natoms; if (me == 0) {
while (1) {
if (fgets(str,MAXLINE,fp) == NULL) n = 0;
else n = strlen(str);
if (n == 0) break; // end of file
str[n-1] = '\0'; // strip newline
if (ptr = strchr(str,'#')) *ptr = '\0'; // strip comment
if (strtok(str," \t\n\r\f") == NULL) continue; // skip if blank
n = strlen(str) + 1;
break;
}
}
MPI_Bcast(&n,1,MPI_INT,0,world);
if (n == 0) return 1;
MPI_Bcast(str,n,MPI_CHAR,0,world);
bigint nlines = ATOBIGINT(str);
int map_tag_max = atom->map_tag_max;
bigint nread = 0; bigint nread = 0;
while (nread < nlines) { while (nread < nlines) {