[ViewVC] Diff of: OpenMD/trunk/src/nonbonded/InteractionManager.cpp

Comparing:
branches/development/src/nonbonded/InteractionManager.cpp (file contents), Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC vs.
trunk/src/nonbonded/InteractionManager.cpp (file contents), Revision 1793 by gezelter, Fri Aug 31 21:16:10 2012 UTC

#	Line 60 \| Line 60 \| namespace OpenMD {
60		}
61
62		void InteractionManager::initialize() {
63	<
63	>
64	>	if (initialized_) return;
65	>
66		ForceField* forceField_ = info_->getForceField();
67
68		lj_->setForceField(forceField_);
#	Line 109 \| Line 111 \| namespace OpenMD {
111
112		bool vdwExplicit = false;
113		bool metExplicit = false;
112	–	bool hbExplicit = false;
114
115		key = make_pair(atype1, atype2);
116
#	Line 379 \| Line 380 \| namespace OpenMD {
380
381		RealType InteractionManager::getSuggestedCutoffRadius(int *atid) {
382		if (!initialized_) initialize();
383	<
383	>
384		AtomType* atype = typeMap_[*atid];
385
386		pair<AtomType, AtomType> key = make_pair(atype, atype);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines