From 39efc7e491289e4f21cfed290f7a67e1aac0dc6d Mon Sep 17 00:00:00 2001 From: sjplimp Date: Mon, 18 Oct 2010 15:47:12 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5054 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/SRD/Install.sh | 8 ++++++++ src/finish.cpp | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/SRD/Install.sh b/src/SRD/Install.sh index fac5b74ae8..2be216d6dd 100644 --- a/src/SRD/Install.sh +++ b/src/SRD/Install.sh @@ -3,13 +3,21 @@ if (test $1 == 1) then cp fix_srd.cpp .. + cp fix_srd2.cpp .. + cp fix_wall_srd.cpp .. cp fix_srd.h .. + cp fix_srd2.h .. + cp fix_wall_srd.h .. elif (test $1 == 0) then rm ../fix_srd.cpp + rm ../fix_srd2.cpp + rm ../fix_wall_srd.cpp rm ../fix_srd.h + rm ../fix_srd2.h + rm ../fix_wall_srd.h fi diff --git a/src/finish.cpp b/src/finish.cpp index bf89b43f8c..ac27ad2bdf 100644 --- a/src/finish.cpp +++ b/src/finish.cpp @@ -440,12 +440,12 @@ void Finish::end(int flag) } // find a non-skip neighbor list containing full pairwise interactions + // count neighbors in that list for stats purposes for (m = 0; m < neighbor->old_nrequest; m++) if (neighbor->old_requests[m]->full && - neighbor->old_requests[m]->skip == 0 - ) break; - + neighbor->old_requests[m]->skip == 0) break; + nneighfull = 0; if (m < neighbor->old_nrequest) { if (neighbor->lists[m]->numneigh > 0) { @@ -482,8 +482,8 @@ void Finish::end(int flag) } tmp = MAX(nneigh,nneighfull); - double nall = 0; - // MPI_Allreduce(&tmp,&nall,1,MPI_DOUBLE,MPI_SUM,world); + double nall; + MPI_Allreduce(&tmp,&nall,1,MPI_DOUBLE,MPI_SUM,world); int nspec; double nspec_all;