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

22
src/comm_tiled.cpp
View File

@ -1376,7 +1376,7 @@ void CommTiled::borders()
nsize used only to set recv buffer limit
------------------------------------------------------------------------- */
void CommTiled::forward_comm_pair(Pair *pair)
void CommTiled::forward_comm(Pair *pair)
{
int i,irecv,n,nsend,nrecv;
@ -1424,7 +1424,7 @@ void CommTiled::forward_comm_pair(Pair *pair)
nsize used only to set recv buffer limit
------------------------------------------------------------------------- */
void CommTiled::reverse_comm_pair(Pair *pair)
void CommTiled::reverse_comm(Pair *pair)
{
int i,irecv,n,nsend,nrecv;
@ -1469,7 +1469,7 @@ void CommTiled::reverse_comm_pair(Pair *pair)
nsize used only to set recv buffer limit
------------------------------------------------------------------------- */
void CommTiled::forward_comm_bond(Bond *bond)
void CommTiled::forward_comm(Bond *bond)
{
int i,irecv,n,nsend,nrecv;
@ -1517,7 +1517,7 @@ void CommTiled::forward_comm_bond(Bond *bond)
nsize used only to set recv buffer limit
------------------------------------------------------------------------- */
void CommTiled::reverse_comm_bond(Bond *bond)
void CommTiled::reverse_comm(Bond *bond)
{
int i,irecv,n,nsend,nrecv;
@ -1566,7 +1566,7 @@ void CommTiled::reverse_comm_bond(Bond *bond)
some are smaller than max stored in its comm_forward
------------------------------------------------------------------------- */
void CommTiled::forward_comm_fix(Fix *fix, int size)
void CommTiled::forward_comm(Fix *fix, int size)
{
int i,irecv,n,nsize,nsend,nrecv;
@ -1617,7 +1617,7 @@ void CommTiled::forward_comm_fix(Fix *fix, int size)
some are smaller than max stored in its comm_forward
------------------------------------------------------------------------- */
void CommTiled::reverse_comm_fix(Fix *fix, int size)
void CommTiled::reverse_comm(Fix *fix, int size)
{
int i,irecv,n,nsize,nsend,nrecv;
@ -1665,7 +1665,7 @@ void CommTiled::reverse_comm_fix(Fix *fix, int size)
NOTE: how to setup one big buf recv with correct offsets ??
------------------------------------------------------------------------- */
void CommTiled::reverse_comm_fix_variable(Fix * /*fix*/)
void CommTiled::reverse_comm_variable(Fix * /*fix*/)
{
error->all(FLERR,"Reverse comm fix variable not yet supported by CommTiled");
}
@ -1675,7 +1675,7 @@ void CommTiled::reverse_comm_fix_variable(Fix * /*fix*/)
nsize used only to set recv buffer limit
------------------------------------------------------------------------- */
void CommTiled::forward_comm_compute(Compute *compute)
void CommTiled::forward_comm(Compute *compute)
{
int i,irecv,n,nsend,nrecv;
@ -1723,7 +1723,7 @@ void CommTiled::forward_comm_compute(Compute *compute)
nsize used only to set recv buffer limit
------------------------------------------------------------------------- */
void CommTiled::reverse_comm_compute(Compute *compute)
void CommTiled::reverse_comm(Compute *compute)
{
int i,irecv,n,nsend,nrecv;
@ -1769,7 +1769,7 @@ void CommTiled::reverse_comm_compute(Compute *compute)
nsize used only to set recv buffer limit
------------------------------------------------------------------------- */
void CommTiled::forward_comm_dump(Dump *dump)
void CommTiled::forward_comm(Dump *dump)
{
int i,irecv,n,nsend,nrecv;
@ -1816,7 +1816,7 @@ void CommTiled::forward_comm_dump(Dump *dump)
nsize used only to set recv buffer limit
------------------------------------------------------------------------- */
void CommTiled::reverse_comm_dump(Dump *dump)
void CommTiled::reverse_comm(Dump *dump)
{
int i,irecv,n,nsend,nrecv;