--- branches/development/src/parallel/ForceMatrixDecomposition.cpp 2012/01/06 19:03:05 1668 +++ branches/development/src/parallel/ForceMatrixDecomposition.cpp 2012/04/27 20:44:16 1706 @@ -537,19 +537,21 @@ namespace OpenMD { fill(snap_->atomData.density.begin(), snap_->atomData.density.end(), 0.0); } + if (storageLayout_ & DataStorage::dslFunctional) { fill(snap_->atomData.functional.begin(), snap_->atomData.functional.end(), 0.0); } + if (storageLayout_ & DataStorage::dslFunctionalDerivative) { fill(snap_->atomData.functionalDerivative.begin(), snap_->atomData.functionalDerivative.end(), 0.0); } + if (storageLayout_ & DataStorage::dslSkippedCharge) { fill(snap_->atomData.skippedCharge.begin(), snap_->atomData.skippedCharge.end(), 0.0); } - } @@ -951,7 +953,12 @@ namespace OpenMD { } #else + + // cerr << "atoms = " << atom1 << " " << atom2 << "\n"; + // cerr << "pos1 = " << snap_->atomData.position[atom1] << "\n"; + // cerr << "pos2 = " << snap_->atomData.position[atom2] << "\n"; + idat.atypes = make_pair( atypesLocal[atom1], atypesLocal[atom2]); //idat.atypes = make_pair( ff_->getAtomType(idents[atom1]), // ff_->getAtomType(idents[atom2]) );