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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compute_reduce.cpp
View File

@ -14,6 +14,7 @@
#include "string.h"
#include "stdlib.h"
#include "compute_reduce.h"
#include "lmptype.h"
#include "atom.h"
#include "update.h"
#include "domain.h"
@ -589,7 +590,7 @@ double ComputeReduce::compute_one(int m, int flag)
/* ---------------------------------------------------------------------- */
double ComputeReduce::count(int m)
bigint ComputeReduce::count(int m)
{
int vidx = value2index[m];
int aidx = argindex[m];
@ -601,9 +602,9 @@ double ComputeReduce::count(int m)
if (flavor[m] == PERATOM) {
return group->count(igroup);
} else if (flavor[m] == LOCAL) {
double ncount = compute->size_local_rows;
double ncountall;
MPI_Allreduce(&ncount,&ncountall,1,MPI_DOUBLE,MPI_SUM,world);
bigint ncount = compute->size_local_rows;
bigint ncountall;
MPI_Allreduce(&ncount,&ncountall,1,MPI_UNSIGNED_LONG,MPI_SUM,world);
return ncountall;
}
} else if (which[m] == FIX) {
@ -611,15 +612,16 @@ double ComputeReduce::count(int m)
if (flavor[m] == PERATOM) {
return group->count(igroup);
} else if (flavor[m] == LOCAL) {
double ncount = fix->size_local_rows;
double ncountall;
MPI_Allreduce(&ncount,&ncountall,1,MPI_DOUBLE,MPI_SUM,world);
bigint ncount = fix->size_local_rows;
bigint ncountall;
MPI_Allreduce(&ncount,&ncountall,1,MPI_UNSIGNED_LONG,MPI_SUM,world);
return ncountall;
}
} else if (which[m] == VARIABLE)
return group->count(igroup);
return 0.0;
bigint dummy = 0;
return dummy;
}
/* ----------------------------------------------------------------------