jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2016-03-22 13:42:13 +00:00
parent 89e3f5b5a2
commit 8f3d0f743e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/MANYBODY/pair_polymorphic.cpp
View File

@ -614,16 +614,23 @@ void PairPolymorphic::read_file(char *file)
fgets(line,MAXLINE,fp); fgets(line,MAXLINE,fp);
n = strlen(line) + 1; n = strlen(line) + 1;
} }
// Note: the format of this line has changed between the
// 2015-06-06 and 2015-12-09 versions of the pair style.
MPI_Bcast(&n,1,MPI_INT,0,world); MPI_Bcast(&n,1,MPI_INT,0,world);
MPI_Bcast(line,n,MPI_CHAR,0,world); MPI_Bcast(line,n,MPI_CHAR,0,world);
nr = ng = nx = 0;
ptr = strtok(line," \t\n\r\f"); // 1st token ptr = strtok(line," \t\n\r\f"); // 1st token
nr = atoi(ptr); if (ptr) nr = atoi(ptr);
ptr = strtok(NULL," \t\n\r\f"); // 2nd token ptr = strtok(NULL," \t\n\r\f"); // 2nd token
ng = atoi(ptr); if (ptr) ng = atoi(ptr);
ptr = strtok(NULL," \t\n\r\f"); // 3rd token ptr = strtok(NULL," \t\n\r\f"); // 3rd token
nx = atoi(ptr); if (ptr) nx = atoi(ptr);
ptr = strtok(NULL," \t\n\r\f"); // 4th token ptr = strtok(NULL," \t\n\r\f"); // 4th token
maxX = atof(ptr); if (ptr) maxX = atof(ptr);
if (ptr == NULL)
error->all(FLERR,"Potential file incompatible with this pair style version");
npair = nelements*(nelements+1)/2; npair = nelements*(nelements+1)/2;
ntriple = nelements*nelements*nelements; ntriple = nelements*nelements*nelements;