ViewVC Help

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

root/OpenMD/branches/development/src/io/Globals.hpp

Comparing:
trunk/src/io/Globals.hpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/io/Globals.hpp (file contents), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
2	>	* Copyright (c) 2005, 2010 The University of Notre Dame. All Rights Reserved.
3		*
4		* The University of Notre Dame grants you ("Licensee") a
5		* non-exclusive, royalty free, license to use, modify and
#	Line 90 | Line 90 | namespace OpenMD {
90		DeclareParameter(OrthoBoxTolerance, RealType);
91		DeclareParameter(Minimizer, std::string);
92		DeclareParameter(MinimizerMaxIter, RealType);
93	<	DeclareParameter(MinimizerWriteFrq, int);
93	>	DeclareParameter(MinimizerWriteFreq, int);
94		DeclareParameter(MinimizerStepSize, RealType);
95		DeclareParameter(MinimizerFTol, RealType);
96		DeclareParameter(MinimizerGTol, RealType);
#	Line 112 | Line 112 | namespace OpenMD {
112		DeclareParameter(ElectrostaticScreeningMethod, std::string);
113		DeclareParameter(DampingAlpha, RealType);
114		DeclareParameter(Dielectric, RealType);
115	+	DeclareParameter(CutoffMethod, std::string);
116		DeclareParameter(CutoffPolicy, std::string);
117		DeclareParameter(SwitchingFunctionType, std::string);
118		DeclareParameter(CompressDumpFile, bool);
119		DeclareParameter(OutputForceVector, bool);
120	+	DeclareParameter(OutputParticlePotential, bool);
121		DeclareParameter(SkinThickness, RealType);
122		DeclareParameter(StatFileFormat, std::string);
123		DeclareParameter(HydroPropFile, std::string);
124		DeclareParameter(Viscosity, RealType);
125		DeclareParameter(BeadSize, RealType);
124	–	DeclareParameter(ThermalConductivity, RealType);
125	–	DeclareParameter(ThermalLength, RealType);
126		DeclareParameter(UseSphericalBoundaryConditions, bool);
127		DeclareParameter(FrozenBufferRadius, RealType);
128		DeclareParameter(LangevinBufferRadius, RealType);
#	Line 141 | Line 141 | namespace OpenMD {
141		DeclareParameter(RNEMD_exchangeType, std::string);
142		DeclareParameter(RNEMD_objectSelection, std::string);
143		DeclareParameter(RNEMD_targetFlux, RealType);
144	+	DeclareParameter(RNEMD_binShift, bool);
145	+	DeclareParameter(RNEMD_outputDimensionalTemperature, bool);
146		DeclareParameter(UseRestraints, bool);
147		DeclareParameter(Restraint_file, std::string);
148	+	DeclareParameter(HULL_Method, std::string);
149	+	DeclareParameter(Alpha, RealType);
150	+	DeclareAlterableParameter(MDfileVersion, int);
151
152		public:
153		bool addComponent(Component* comp);
#	Line 160 | Line 165 | namespace OpenMD {
165		int getNRestraintStamps() {return restraints_.size();}
166		std::vector<RestraintStamp*> getRestraintStamps() {return restraints_;}
167		RestraintStamp* getRestraintStampAt(int index) {return restraints_.at(index);}
163	–
164	–	//std::string getRestraint_file(){
168
169		virtual void validate();
170		private:

Comparing:
trunk/src/io/Globals.hpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/io/Globals.hpp (property svn:keywords), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

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

Diff Legend

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