[ViewVC] Diff of: OpenMD/branches/development/src/primitives/Atom.hpp

Comparing branches/development/src/primitives/Atom.hpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1715 by gezelter, Tue May 22 21:55:31 2012 UTC

#	Line 94 \| Line 94 \| namespace OpenMD{
94		bool isDipole() {
95		return atomType_->isDipole();
96		}
97	–
98	–	bool isQudrapole() {
99	–	return atomType_->isQuadrupole();
100	–	}
97
98		bool isMultipole() {
99		return atomType_->isMultipole();
#	Line 119 \| Line 115 \| namespace OpenMD{
115		return atomType_->isMetal();
116		}
117
118	+	bool isFluctuatingCharge() {
119	+	return atomType_->isFluctuatingCharge();
120	+	}
121	+
122		int getIdent() {
123		return atomType_->getIdent();
124		}
125
126	+	RealType getChargeMass() {
127	+	return chargeMass_;
128	+	}
129	+
130	+	void setChargeMass(RealType cm) {
131	+	chargeMass_ = cm;
132	+	}
133	+
134		protected:
135		AtomType* atomType_;
136	+	RealType chargeMass_;
137		};
138
139		}//namespace OpenMD

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