ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issues in FixNeighHistory and FixNeighHistoryOMP reported in https://sourceforge.net/p/lammps/mailman/message/36138319/

Browse Source 
This supersedes and closes PR #734
This commit is contained in:
Axel Kohlmeyer
2017-11-28 11:28:15 -05:00
parent e1189381e0
commit fa6fc947f2
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/USER-OMP/fix_neigh_history_omp.cpp
View File

@ -356,7 +356,7 @@ void FixNeighHistoryOMP::pre_exchange_newton()
#endif #endif
{ {
maxpartner = MAX(m,maxpartner); maxpartner = MAX(m,maxpartner);
comm->maxexchange_fix = MAX(comm->maxexchange_fix,4*maxpartner+1); comm->maxexchange_fix = MAX(comm->maxexchange_fix,(dnum+1)*maxpartner+1);
} }
} }

4
src/fix_neigh_history.cpp
View File

@ -424,7 +424,7 @@ void FixNeighHistory::pre_exchange_newton()
maxpartner = 0; maxpartner = 0;
for (i = 0; i < nlocal_neigh; i++) maxpartner = MAX(maxpartner,npartner[i]); for (i = 0; i < nlocal_neigh; i++) maxpartner = MAX(maxpartner,npartner[i]);
comm->maxexchange_fix = MAX(comm->maxexchange_fix,4*maxpartner+1); comm->maxexchange_fix = MAX(comm->maxexchange_fix,(dnum+1)*maxpartner+1);
// zero npartner values from previous nlocal_neigh to current nlocal // zero npartner values from previous nlocal_neigh to current nlocal
@ -720,7 +720,7 @@ int FixNeighHistory::pack_reverse_comm_size(int n, int first)
last = first + n; last = first + n;
for (i = first; i < last; i++) for (i = first; i < last; i++)
m += 1 + 4*npartner[i]; m += 1 + (dnum+1)*npartner[i];
return m; return m;
} }