--- branches/development/src/parallel/ForceDecomposition.cpp 2011/06/21 06:34:35 1586 +++ branches/development/src/parallel/ForceDecomposition.cpp 2011/07/12 15:25:07 1591 @@ -89,7 +89,7 @@ namespace OpenMD { void ForceDecomposition::fillSelfData(SelfData &sdat, int atom1) { - sdat.atype = ff_->getAtomType(idents[atom1]); + sdat.atype = atypesLocal[atom1]; // Still Missing skippedCharge if (storageLayout_ & DataStorage::dslElectroFrame) { @@ -128,10 +128,7 @@ namespace OpenMD { // if we have changed the group identities or haven't set up the // saved positions we automatically will need a neighbor list update: - if ( saved_CG_positions_.size() != nGroups ) { - cerr << "build because size\n"; - return true; - } + if ( saved_CG_positions_.size() != nGroups ) return true; RealType dispmax = 0.0; Vector3d disp; @@ -150,12 +147,9 @@ namespace OpenMD { dispmax = 2.0 * sqrt (3.0 * dispmax * dispmax); - if (dispmax > skinThickness_) { - cerr << "build because movement\n"; + if (dispmax > skinThickness_) return (dispmax > skinThickness_); - } else { - cerr << "not rebuilding\n"; - } + return false; } }