[ViewVC] Diff of: OpenMD/branches/development/src/io/Globals.hpp

Comparing trunk/src/io/Globals.hpp (file contents):
Revision 1306 by chuckv, Thu Oct 16 18:25:36 2008 UTC vs.
Revision 1331 by gezelter, Thu Apr 2 16:04:52 2009 UTC

#	Line 83 \| Line 83 \| namespace oopse {
83		DeclareParameter(ZconsTime, RealType);
84		DeclareParameter(ZconsTol, RealType);
85		DeclareParameter(ZconsForcePolicy, std::string);
86	<	DeclareParameter(Seed, int);
86	>	DeclareParameter(Seed, unsigned long int);
87		DeclareParameter(UseInitalTime, bool);
88		DeclareParameter(UseIntialExtendedSystemState, bool);
89		DeclareParameter(OrthoBoxTolerance, RealType);
#	Line 135 \| Line 135 \| namespace oopse {
135		DeclareParameter(MTM_Io, RealType);
136		DeclareParameter(MTM_Sigma, RealType);
137		DeclareParameter(MTM_R, RealType);
138	+	DeclareParameter(UseRNEMD, bool);
139	+	DeclareParameter(RNEMD_swapTime, RealType);
140	+	DeclareParameter(RNEMD_nBins, int);
141	+	DeclareParameter(RNEMD_swapType, std::string);
142	+	DeclareParameter(RNEMD_objectSelection, std::string);
143
144		public:
145		bool addComponent(Component* comp);
#	Line 155 \| Line 160 \| namespace oopse {
160		std::vector<ZConsStamp*> zconstraints_;
161		std::map<std::string, MoleculeStamp*> moleculeStamps_;
162		std::pair<int, int> taggedAtomPair_;
158	–
163		};
164		}
165		#endif

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