# | Line 537 | Line 537 | namespace OpenMD { | |
---|---|---|
537 | fill(snap_->atomData.density.begin(), | |
538 | snap_->atomData.density.end(), 0.0); | |
539 | } | |
540 | + | |
541 | if (storageLayout_ & DataStorage::dslFunctional) { | |
542 | fill(snap_->atomData.functional.begin(), | |
543 | snap_->atomData.functional.end(), 0.0); | |
544 | } | |
545 | + | |
546 | if (storageLayout_ & DataStorage::dslFunctionalDerivative) { | |
547 | fill(snap_->atomData.functionalDerivative.begin(), | |
548 | snap_->atomData.functionalDerivative.end(), 0.0); | |
549 | } | |
550 | + | |
551 | if (storageLayout_ & DataStorage::dslSkippedCharge) { | |
552 | fill(snap_->atomData.skippedCharge.begin(), | |
553 | snap_->atomData.skippedCharge.end(), 0.0); | |
554 | } | |
552 | – | |
555 | } | |
556 | ||
557 | ||
# | Line 951 | Line 953 | namespace OpenMD { | |
953 | } | |
954 | ||
955 | #else | |
956 | + | |
957 | ||
958 | + | // cerr << "atoms = " << atom1 << " " << atom2 << "\n"; |
959 | + | // cerr << "pos1 = " << snap_->atomData.position[atom1] << "\n"; |
960 | + | // cerr << "pos2 = " << snap_->atomData.position[atom2] << "\n"; |
961 | + | |
962 | idat.atypes = make_pair( atypesLocal[atom1], atypesLocal[atom2]); | |
963 | //idat.atypes = make_pair( ff_->getAtomType(idents[atom1]), | |
964 | // ff_->getAtomType(idents[atom2]) ); |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |