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

major neighbor list style whitespace cleanup

Browse Source
This commit is contained in:
Axel Kohlmeyer
2017-05-30 17:04:48 -04:00
parent 286d4f2743
commit 03ab8d0f48
40 changed files with 475 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/npair.cpp
View File

@ -123,7 +123,7 @@ void NPair::copy_bin_info()
mbinxlo = nb->mbinxlo;
mbinylo = nb->mbinylo;
mbinzlo = nb->mbinzlo;
bininvx = nb->bininvx;
bininvy = nb->bininvy;
bininvz = nb->bininvz;
@ -183,15 +183,15 @@ int NPair::exclusion(int i, int j, int itype, int jtype,
if (nex_mol) {
for (m = 0; m < nex_mol; m++)
// intra-chain: exclude i-j pair if in same molecule
// inter-chain: exclude i-j pair if in different molecules
// intra-chain: exclude i-j pair if in same molecule
// inter-chain: exclude i-j pair if in different molecules
if (ex_mol_intra[m]) {
if (mask[i] & ex_mol_bit[m] && mask[j] & ex_mol_bit[m] &&
molecule[i] == molecule[j]) return 1;
molecule[i] == molecule[j]) return 1;
} else {
if (mask[i] & ex_mol_bit[m] && mask[j] & ex_mol_bit[m] &&
molecule[i] != molecule[j]) return 1;
if (mask[i] & ex_mol_bit[m] && mask[j] & ex_mol_bit[m] &&
molecule[i] != molecule[j]) return 1;
}
}