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

replace some numeric constants in Atom and AtomVec classes with enumerators

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-09-11 18:44:13 -04:00
parent cdd9d693ad
commit 9d0c3bc665
202 changed files with 539 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/npair_half_multi_newton.cpp
View File

@ -54,7 +54,7 @@ void NPairHalfMultiNewton::build(NeighList *list)
int *molindex = atom->molindex;
int *molatom = atom->molatom;
Molecule **onemols = atom->avec->onemols;
if (molecular == 2) moltemplate = 1;
if (molecular == Atom::TEMPLATE) moltemplate = 1;
else moltemplate = 0;
int *ilist = list->ilist;
@ -101,7 +101,7 @@ void NPairHalfMultiNewton::build(NeighList *list)
rsq = delx*delx + dely*dely + delz*delz;
if (rsq <= cutneighsq[itype][jtype]) {
if (molecular) {
if (molecular != Atom::ATOMIC) {
if (!moltemplate)
which = find_special(special[i],nspecial[i],tag[j]);
else if (imol >= 0)
@ -138,7 +138,7 @@ void NPairHalfMultiNewton::build(NeighList *list)
rsq = delx*delx + dely*dely + delz*delz;
if (rsq <= cutneighsq[itype][jtype]) {
if (molecular) {
if (molecular != Atom::ATOMIC) {
if (!moltemplate)
which = find_special(special[i],nspecial[i],tag[j]);
else if (imol >= 0)