| 178 |
|
iHash_[atid1][atid2] |= LJ_INTERACTION; |
| 179 |
|
} |
| 180 |
|
if (atype1->isElectrostatic() && atype2->isElectrostatic() ) { |
| 181 |
< |
// Pairs of fluctuating density EAM atoms have their |
| 182 |
< |
// interactions handled via the EAM routines. All other |
| 183 |
< |
// interactions with these atoms are handled via normal |
| 184 |
< |
// electrostatic channels: |
| 185 |
< |
if (!(atype1->isEAM() && atype2->isEAM())) { |
| 186 |
< |
interactions_[atid1][atid2].insert(electrostatic_); |
| 187 |
< |
iHash_[atid1][atid2] |= ELECTROSTATIC_INTERACTION; |
| 188 |
< |
} |
| 181 |
> |
interactions_[atid1][atid2].insert(electrostatic_); |
| 182 |
> |
iHash_[atid1][atid2] |= ELECTROSTATIC_INTERACTION; |
| 183 |
|
} |
| 184 |
|
if (atype1->isSticky() && atype2->isSticky() ) { |
| 185 |
|
interactions_[atid1][atid2].insert(sticky_); |
