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

Resolving merge conflicts

Browse Source
This commit is contained in:
Joel Thomas Clemmer
2022-03-23 14:28:27 -06:00
parent 9417e41676 3e7de83e6e
commit 92a968a8a9
1211 changed files with 219865 additions and 402506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fix_neigh_history.cpp
View File

@ -62,7 +62,7 @@ FixNeighHistory::FixNeighHistory(LAMMPS *lmp, int narg, char **arg) :
if (newton_pair) comm_reverse = 1; // just for single npartner value
// variable-size history communicated via
// reverse_comm_fix_variable()
// reverse_comm_variable()
// perform initial allocation of atom-based arrays
// register with atom class
@ -379,7 +379,7 @@ void FixNeighHistory::pre_exchange_newton()
// perform reverse comm to augment owned npartner counts with ghost counts
commflag = NPARTNER;
comm->reverse_comm_fix(this,0);
comm->reverse_comm(this);
// get page chunks to store partner IDs and values for owned+ghost atoms
@ -439,7 +439,7 @@ void FixNeighHistory::pre_exchange_newton()
// if many touching neighbors for large particle
commflag = PERPARTNER;
comm->reverse_comm_fix_variable(this);
comm->reverse_comm_variable(this);
// set maxpartner = max # of partners of any owned atom
// maxexchange = max # of values for any Comm::exchange() atom
@ -743,7 +743,7 @@ void FixNeighHistory::set_arrays(int i)
}
/* ----------------------------------------------------------------------
only called by Comm::reverse_comm_fix_variable for PERPARTNER mode
only called by Comm::reverse_comm_variable for PERPARTNER mode
------------------------------------------------------------------------- */
int FixNeighHistory::pack_reverse_comm_size(int n, int first)