--- branches/development/src/nonbonded/LJ.cpp 2010/07/20 15:43:00 1473 +++ branches/development/src/nonbonded/LJ.cpp 2010/07/21 18:31:05 1476 @@ -166,23 +166,23 @@ namespace OpenMD { } void LJ::initialize() { - ForceField::AtomTypeContainer atomTypes = forceField_->getAtomTypes(); + ForceField::AtomTypeContainer* atomTypes = forceField_->getAtomTypes(); ForceField::AtomTypeContainer::MapTypeIterator i; AtomType* at; - for (at = atomTypes.beginType(i); at != NULL; - at = atomTypes.nextType(i)) { + for (at = atomTypes->beginType(i); at != NULL; + at = atomTypes->nextType(i)) { if (at->isLennardJones()) addType(at); } - ForceField::NonBondedInteractionTypeContainer nbiTypes = forceField_->getNonBondedInteractionTypes(); + ForceField::NonBondedInteractionTypeContainer* nbiTypes = forceField_->getNonBondedInteractionTypes(); ForceField::NonBondedInteractionTypeContainer::MapTypeIterator j; NonBondedInteractionType* nbt; - for (nbt = nbiTypes.beginType(j); nbt != NULL; - nbt = nbiTypes.nextType(j)) { + for (nbt = nbiTypes->beginType(j); nbt != NULL; + nbt = nbiTypes->nextType(j)) { if (nbt->isLennardJones()) { @@ -336,8 +336,6 @@ namespace OpenMD { return; - - } void LJ::do_lj_pair(int *atid1, int *atid2, RealType *d, RealType *rij,