[ViewVC] Diff of: OpenMD/trunk/src/constraints/Shake.hpp

Comparing trunk/src/constraints/Shake.hpp (file contents):
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 1982 by gezelter, Tue Apr 15 12:12:23 2014 UTC

#	Line 45 \| Line 45
45
46		#include "brains/SimInfo.hpp"
47		#include "constraints/ConstraintPair.hpp"
48	+	#include "io/ConstraintWriter.hpp"
49	+
50		namespace OpenMD {
51
52		class Shake {
53		public:
54		enum ConsStatus{
55	<	consFail = -1, //Constraint Fail
56	<	consSuccess = 0, //constrain the pair by moving two elements
57	<	consAlready = 1}; //current pair is already constrained, do not need to move the elements
55	>	consFail = -1, //Constraint Fail
56	>	consSuccess = 0, //constrain the pair by moving two elements
57	>	consAlready = 1 //current pair is already constrained, do not need to move the elements
58	>	};
59
60		Shake(SimInfo* info);
61		void constraintR();
#	Line 74 \| Line 77 \| namespace OpenMD {
77		RealType consTolerance_;
78		Snapshot* currentSnapshot_;
79		bool doShake_;
80	+	std::string constraintOutputFile_;
81	+	ConstraintWriter* constraintWriter_;
82	+	RealType constraintTime_;
83	+	RealType currConstraintTime_;
84		};
85		}
86		#endif

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