git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7605 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2012-01-30 22:21:26 +00:00
parent 8083ac3cdc
commit da9de94385
4 changed files with 7 additions and 2 deletions

View File

@ -301,6 +301,7 @@ void Comm::init()
// maxforward = # of datums in largest forward communication
// maxreverse = # of datums in largest reverse communication
// query pair,fix,compute,dump for their requirements
// pair style can force reverse comm even if newton off
maxforward = MAX(size_forward,size_border);
maxreverse = size_reverse;
@ -324,6 +325,7 @@ void Comm::init()
}
if (force->newton == 0) maxreverse = 0;
if (force->pair) maxreverse = MAX(maxreverse,force->pair->comm_reverse_off);
// memory for multi-style communication

View File

@ -47,7 +47,7 @@ Pair::Pair(LAMMPS *lmp) : Pointers(lmp)
eng_vdwl = eng_coul = 0.0;
comm_forward = comm_reverse = 0;
comm_forward = comm_reverse = comm_reverse_off = 0;
single_enable = 1;
restartinfo = 1;

View File

@ -39,6 +39,7 @@ class Pair : protected Pointers {
int comm_forward; // size of forward communication (0 if none)
int comm_reverse; // size of reverse communication (0 if none)
int comm_reverse_off; // size of reverse comm even if newton off
int single_enable; // 1 if single() routine exists
int restartinfo; // 1 if pair style writes restart info

View File

@ -260,11 +260,13 @@ void PairHybrid::settings(int narg, char **arg)
nstyles++;
}
// set comm_forward, comm_reverse to max of any sub-style
// set comm_forward, comm_reverse, comm_reverse_off to max of any sub-style
for (m = 0; m < nstyles; m++) {
if (styles[m]) comm_forward = MAX(comm_forward,styles[m]->comm_forward);
if (styles[m]) comm_reverse = MAX(comm_reverse,styles[m]->comm_reverse);
if (styles[m]) comm_reverse_off = MAX(comm_reverse_off,
styles[m]->comm_reverse_off);
}
// single_enable = 1 if any sub-style is set