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

correct check for identical requests

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-01-16 14:08:18 -05:00
parent 8d37c89cb6
commit 2ad823ffd4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/neigh_request.cpp
View File

@ -36,7 +36,7 @@ NeighRequest::NeighRequest(LAMMPS *lmp) : Pointers(lmp)
half = 1; half = 1;
full = 0; full = 0;
// attribute flags, mutiple can be set to 1 // attribute flags, mutiple can be set to 1
// default is every reneighboring, not occasional // default is every reneighboring, not occasional
// default is use newton_pair setting in force // default is use newton_pair setting in force
@ -69,7 +69,7 @@ NeighRequest::NeighRequest(LAMMPS *lmp) : Pointers(lmp)
cutoff = 0.0; cutoff = 0.0;
// skip info, default is no skipping // skip info, default is no skipping
skip = 0; skip = 0;
iskip = NULL; iskip = NULL;
ijskip = NULL; ijskip = NULL;
@ -123,7 +123,7 @@ int NeighRequest::identical(NeighRequest *other)
// only compare settings made by requestors // only compare settings made by requestors
// not settings made later by Neighbor class // not settings made later by Neighbor class
if (pair != other->pair) same = 0; if (pair != other->pair) same = 0;
if (fix != other->fix) same = 0; if (fix != other->fix) same = 0;
if (compute != other->compute) same = 0; if (compute != other->compute) same = 0;
@ -152,6 +152,7 @@ int NeighRequest::identical(NeighRequest *other)
if (cutoff != other->cutoff) same = 0; if (cutoff != other->cutoff) same = 0;
if (skip != other->skip) same = 0; if (skip != other->skip) same = 0;
if (same && skip && other->skip) same = same_skip(other);
if (skip && other->skip) same = same_skip(other); if (skip && other->skip) same = same_skip(other);
return same; return same;