--- branches/development/src/nonbonded/InteractionManager.cpp 2012/05/18 21:44:02 1710 +++ trunk/src/nonbonded/InteractionManager.cpp 2012/08/31 21:16:10 1793 @@ -60,7 +60,9 @@ namespace OpenMD { } void InteractionManager::initialize() { - + + if (initialized_) return; + ForceField* forceField_ = info_->getForceField(); lj_->setForceField(forceField_); @@ -109,7 +111,6 @@ namespace OpenMD { bool vdwExplicit = false; bool metExplicit = false; - bool hbExplicit = false; key = make_pair(atype1, atype2); @@ -379,7 +380,7 @@ namespace OpenMD { RealType InteractionManager::getSuggestedCutoffRadius(int *atid) { if (!initialized_) initialize(); - + AtomType* atype = typeMap_[*atid]; pair key = make_pair(atype, atype);