ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/devel_omp/src/brains/ForceManager.hpp

Comparing:
trunk/src/brains/ForceManager.hpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/brains/ForceManager.hpp (file contents), Revision 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC

#	Line 67 | Line 67 | namespace OpenMD {
67		class ForceManager {
68
69		public:
70	<	ForceManager(SimInfo * info) : info_(info) {}
70	>	ForceManager(SimInfo * info) : info_(info), NBforcesInitialized_(false) {}
71
72		virtual ~ForceManager() {}
73
74		// public virtual functions should be avoided
75		/**@todo needs refactoring */
76	<	virtual void calcForces(bool needPotential, bool needStress);
76	>	virtual void calcForces();
77
78		virtual void init() {}
79		protected:
#	Line 82 | Line 82 | namespace OpenMD {
82
83		virtual void calcShortRangeInteraction();
84
85	<	virtual void calcLongRangeInteraction(bool needPotential, bool needStress);
85	>	virtual void calcLongRangeInteraction();
86
87	<	virtual void postCalculation(bool needStress);
87	>	virtual void postCalculation();
88
89		SimInfo * info_;
90
#	Line 92 | Line 92 | namespace OpenMD {
92		std::map<Torsion*, TorsionDataSet> torsionDataSets;
93		std::map<Inversion*, InversionDataSet> inversionDataSets;
94		Mat3x3d tau;
95	+
96	+	bool NBforcesInitialized_;
97
98		};
99

Comparing:
trunk/src/brains/ForceManager.hpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/brains/ForceManager.hpp (property svn:keywords), Revision 1467 by gezelter, Sat Jul 17 15:33:03 2010 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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