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

Resolve merge conflicts

Browse Source
This commit is contained in:
Joel Clemmer
2021-01-13 09:42:57 -07:00
parent a25c77e512 9ff011728c
commit 2c92737cd5
541 changed files with 9281 additions and 7264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/neighbor.cpp
View File

@ -784,11 +784,11 @@ int Neighbor::init_pair()
lists[i]->index = i;
lists[i]->requestor = requests[i]->requestor;
if(requests[i]->pair) {
if (requests[i]->pair) {
lists[i]->requestor_type = NeighList::PAIR;
} else if(requests[i]->fix) {
} else if (requests[i]->fix) {
lists[i]->requestor_type = NeighList::FIX;
} else if(requests[i]->compute) {
} else if (requests[i]->compute) {
lists[i]->requestor_type = NeighList::COMPUTE;
}