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

change ring communication API to no longer require a static variable pointing to 'this' of the caller

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-06-14 17:01:06 -04:00
parent 286d4f2743
commit fcc387f232
18 changed files with 166 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/group.cpp
View File

@ -45,10 +45,6 @@ enum{LT,LE,GT,GE,EQ,NEQ,BETWEEN};
#define BIG 1.0e20
// allocate space for static class variable
Group *Group::cptr;
/* ----------------------------------------------------------------------
initialize group memory
------------------------------------------------------------------------- */
@ -654,9 +650,8 @@ void Group::add_molecules(int igroup, int bit)
std::map<tagint,int>::iterator pos;
for (pos = hash->begin(); pos != hash->end(); ++pos) list[n++] = pos->first;
cptr = this;
molbit = bit;
comm->ring(n,sizeof(tagint),list,1,molring,NULL);
comm->ring(n,sizeof(tagint),list,1,molring,NULL,(void *)this);
delete hash;
memory->destroy(list);
@ -669,14 +664,15 @@ void Group::add_molecules(int igroup, int bit)
add atom to group flagged by molbit
------------------------------------------------------------------------- */
void Group::molring(int n, char *cbuf)
void Group::molring(int n, char *cbuf, void *ptr)
{
Group *gptr = (Group *) ptr;
tagint *list = (tagint *) cbuf;
std::map<tagint,int> *hash = cptr->hash;
int nlocal = cptr->atom->nlocal;
tagint *molecule = cptr->atom->molecule;
int *mask = cptr->atom->mask;
int molbit = cptr->molbit;
std::map<tagint,int> *hash = gptr->hash;
int nlocal = gptr->atom->nlocal;
tagint *molecule = gptr->atom->molecule;
int *mask = gptr->atom->mask;
int molbit = gptr->molbit;
hash->clear();
for (int i = 0; i < n; i++) (*hash)[list[i]] = 1;