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

Few more merge conflicts

Browse Source
This commit is contained in:
Joel Thomas Clemmer
2021-11-02 12:29:49 -06:00
parent 679132b607 0439671e86
commit f5626a2b9d
76 changed files with 1917 additions and 2834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/comm.cpp
View File

@ -201,8 +201,9 @@ void Comm::init()
if (ghost_velocity) size_forward += atom->avec->size_velocity;
if (ghost_velocity) size_border += atom->avec->size_velocity;
for (int i = 0; i < modify->nfix; i++)
size_border += modify->fix[i]->comm_border;
const auto &fix_list = modify->get_fix_list();
for (const auto &fix : fix_list)
size_border += fix->comm_border;
// per-atom limits for communication
// maxexchange = max # of datums in exchange comm, set in exchange()
@ -220,9 +221,9 @@ void Comm::init()
if (force->bond) maxforward = MAX(maxforward,force->bond->comm_forward);
if (force->bond) maxreverse = MAX(maxreverse,force->bond->comm_reverse);
for (int i = 0; i < modify->nfix; i++) {
maxforward = MAX(maxforward,modify->fix[i]->comm_forward);
maxreverse = MAX(maxreverse,modify->fix[i]->comm_reverse);
for (const auto &fix : fix_list) {
maxforward = MAX(maxforward,fix->comm_forward);
maxreverse = MAX(maxreverse,fix->comm_reverse);
}
for (int i = 0; i < modify->ncompute; i++) {
@ -245,12 +246,9 @@ void Comm::init()
maxexchange_atom = atom->avec->maxexchange;
int nfix = modify->nfix;
Fix **fix = modify->fix;
maxexchange_fix_dynamic = 0;
for (int i = 0; i < nfix; i++)
if (fix[i]->maxexchange_dynamic) maxexchange_fix_dynamic = 1;
for (const auto &fix : fix_list)
if (fix->maxexchange_dynamic) maxexchange_fix_dynamic = 1;
if ((mode == Comm::MULTI) && (neighbor->style != Neighbor::MULTI))
error->all(FLERR,"Cannot use comm mode multi without multi-style neighbor lists");
@ -271,12 +269,9 @@ void Comm::init()
void Comm::init_exchange()
{
int nfix = modify->nfix;
Fix **fix = modify->fix;
maxexchange_fix = 0;
for (int i = 0; i < nfix; i++)
maxexchange_fix += fix[i]->maxexchange;
for (const auto &fix : modify->get_fix_list())
maxexchange_fix += fix->maxexchange;
maxexchange = maxexchange_atom + maxexchange_fix;
bufextra = maxexchange + BUFEXTRA;