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

This commit is contained in:
sjplimp
2011-01-04 21:08:27 +00:00
parent a7f69eac0c
commit c9495408a1
16 changed files with 69 additions and 61 deletions

View File

@ -220,7 +220,7 @@ double ComputeReduceRegion::compute_one(int m, int flag)
/* ---------------------------------------------------------------------- */
double ComputeReduceRegion::count(int m)
bigint ComputeReduceRegion::count(int m)
{
int n = value2index[m];
int j = argindex[m];
@ -235,8 +235,8 @@ double ComputeReduceRegion::count(int m)
if (flavor[m] == PERATOM) {
return group->count(igroup,iregion);
} else if (flavor[m] == LOCAL) {
double ncount = compute->size_local_rows;
double ncountall;
bigint ncount = compute->size_local_rows;
bigint ncountall;
MPI_Allreduce(&ncount,&ncountall,1,MPI_DOUBLE,MPI_SUM,world);
return ncountall;
}
@ -245,13 +245,14 @@ double ComputeReduceRegion::count(int m)
if (flavor[m] == PERATOM) {
return group->count(igroup,iregion);
} else if (flavor[m] == LOCAL) {
double ncount = fix->size_local_rows;
double ncountall;
bigint ncount = fix->size_local_rows;
bigint ncountall;
MPI_Allreduce(&ncount,&ncountall,1,MPI_DOUBLE,MPI_SUM,world);
return ncountall;
}
} else if (which[m] == VARIABLE)
return group->count(igroup,iregion);
return 0.0;
bigint dummy = 0;
return dummy;
}