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

This commit is contained in:
sjplimp 2010-10-18 15:47:12 +00:00
parent f729f1b279
commit 39efc7e491
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SRD/Install.sh
View File

@ -3,13 +3,21 @@
if (test $1 == 1) then if (test $1 == 1) then
cp fix_srd.cpp .. cp fix_srd.cpp ..
cp fix_srd2.cpp ..
cp fix_wall_srd.cpp ..
cp fix_srd.h .. cp fix_srd.h ..
cp fix_srd2.h ..
cp fix_wall_srd.h ..
elif (test $1 == 0) then elif (test $1 == 0) then
rm ../fix_srd.cpp rm ../fix_srd.cpp
rm ../fix_srd2.cpp
rm ../fix_wall_srd.cpp
rm ../fix_srd.h rm ../fix_srd.h
rm ../fix_srd2.h
rm ../fix_wall_srd.h
fi fi

8
src/finish.cpp
View File

@ -440,11 +440,11 @@ void Finish::end(int flag)
} }
// find a non-skip neighbor list containing full pairwise interactions // 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++) for (m = 0; m < neighbor->old_nrequest; m++)
if (neighbor->old_requests[m]->full && if (neighbor->old_requests[m]->full &&
neighbor->old_requests[m]->skip == 0 neighbor->old_requests[m]->skip == 0) break;
) break;
nneighfull = 0; nneighfull = 0;
if (m < neighbor->old_nrequest) { if (m < neighbor->old_nrequest) {
@ -482,8 +482,8 @@ void Finish::end(int flag)
} }
tmp = MAX(nneigh,nneighfull); tmp = MAX(nneigh,nneighfull);
double nall = 0; double nall;
// MPI_Allreduce(&tmp,&nall,1,MPI_DOUBLE,MPI_SUM,world); MPI_Allreduce(&tmp,&nall,1,MPI_DOUBLE,MPI_SUM,world);
int nspec; int nspec;
double nspec_all; double nspec_all;