[ViewVC] Diff of: OpenMD/trunk/src/brains/ForceField.hpp

Comparing branches/development/src/UseTheForce/ForceField.hpp (file contents):
Revision 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC vs.
Revision 1530 by gezelter, Tue Dec 28 21:47:55 2010 UTC

#	Line 65 \| Line 65
65		#include "types/TorsionType.hpp"
66		#include "types/InversionType.hpp"
67		#include "types/NonBondedInteractionType.hpp"
68	–	#include "UseTheForce/fForceOptions.h"
68		namespace OpenMD {
69
70		/**
#	Line 139 \| Line 138 \| namespace OpenMD {
138		return atomTypeCont_.size();
139		}
140
141	<	AtomTypeContainer getAtomTypes() {
142	<	return atomTypeCont_;
141	>	AtomTypeContainer* getAtomTypes() {
142	>	return &atomTypeCont_;
143		}
144
145	<	NonBondedInteractionTypeContainer getNonBondedInteractionTypes() {
146	<	return nonBondedInteractionTypeCont_;
145	>	NonBondedInteractionTypeContainer* getNonBondedInteractionTypes() {
146	>	return &nonBondedInteractionTypeCont_;
147		}
148
149		bool addAtomType(const std::string &at, AtomType* atomType);

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