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

This commit is contained in:
sjplimp 2007-10-05 15:58:01 +00:00
parent 0c449c2531
commit d8e1ead8e2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GRANULAR/pair_gran_history.cpp
View File

@ -424,16 +424,20 @@ double PairGranHistory::init_one(int i, int j)
// return max diameter of any particle
// not used in granular neighbor calculation since particles have radius
// but will insure cutoff is big enough for any other neighbor lists built
// if no particles, return 1.0
double *radius = atom->radius;
int nlocal = atom->nlocal;
double maxrad = 0.0;
for (int m = 0; m < nlocal; m++) maxrad = MAX(maxrad,radius[m]);
double mine = maxrad;
MPI_Allreduce(&mine,&maxrad,1,MPI_DOUBLE,MPI_MAX,world);
double mine = 2.0*maxrad;
return 2.0*maxrad;
double maxdiam;
MPI_Allreduce(&mine,&maxdiam,1,MPI_DOUBLE,MPI_MAX,world);
if (maxdiam == 0.0) maxdiam = 1.0;
return maxdiam;
}
/* ----------------------------------------------------------------------