ViewVC Help

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

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

Comparing:
trunk/src/io/Globals.cpp (file contents), Revision 1402 by chuckv, Fri Jan 8 17:15:27 2010 UTC vs.
branches/development/src/io/Globals.cpp (file contents), Revision 1616 by gezelter, Tue Aug 30 15:45:35 2011 UTC

#	Line 74 | Line 74 | Globals::Globals() {
74		DefineOptionalParameter(Seed, "seed");
75		DefineOptionalParameter(Minimizer, "minimizer");
76		DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
77	<	DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq");
77	>	DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq");
78		DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
79		DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
80		DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
#	Line 92 | Line 92 | Globals::Globals() {
92		DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
93		DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
94		DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
95	–	DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
95		DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
96		DefineOptionalParameter(HydroPropFile, "HydroPropFile");
97		DefineOptionalParameter(Viscosity, "viscosity");
#	Line 101 | Line 100 | Globals::Globals() {
100		DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
101		DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
102		DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
103	+	DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
104		DefineOptionalParameter(MTM_Ce, "MTM_Ce");
105		DefineOptionalParameter(MTM_G, "MTM_G");
106		DefineOptionalParameter(MTM_Io, "MTM_Io");
#	Line 114 | Line 114 | Globals::Globals() {
114		DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
115		DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
116		DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);
117	<	DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE");
117	>	DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE");
118		DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
119	<	DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5);
119	>	DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
120		DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
121		DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
122		DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
#	Line 137 | Line 137 | Globals::Globals() {
137		DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
138
139
140	+
141		deprecatedKeywords_.insert("nComponents");
142		deprecatedKeywords_.insert("nZconstraints");
143		deprecatedKeywords_.insert("initialConfig");
#	Line 177 | Line 178 | void Globals::validate() {
178		CheckParameter(Seed, isPositive());
179		CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
180		CheckParameter(MinimizerMaxIter, isPositive());
181	<	CheckParameter(MinimizerWriteFrq, isPositive());
181	>	CheckParameter(MinimizerWriteFreq, isPositive());
182		CheckParameter(MinimizerStepSize, isPositive());
183		CheckParameter(MinimizerFTol, isPositive());
184		CheckParameter(MinimizerGTol, isPositive());
#	Line 189 | Line 190 | void Globals::validate() {
190		CheckParameter(ThermodynamicIntegrationK, isPositive());
191		CheckParameter(ForceFieldVariant, isNotEmpty());
192		CheckParameter(ForceFieldFileName, isNotEmpty());
193	<	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
193	<	CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
193	>	CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
194		CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
195	+	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
196	+	CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
197		CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
196	–	//CheckParameter(StatFileFormat,);
198		CheckParameter(OrthoBoxTolerance, isPositive());
199		CheckParameter(DampingAlpha,isNonNegative());
200		CheckParameter(SkinThickness, isPositive());
#	Line 218 | Line 219 | void Globals::validate() {
219		}
220		}
221		}
222	<
222	>
223		bool Globals::addComponent(Component* comp) {
224		components_.push_back(comp);
225		return true;

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 1402 by chuckv, Fri Jan 8 17:15:27 2010 UTC vs.
branches/development/src/io/Globals.cpp (property svn:keywords), Revision 1616 by gezelter, Tue Aug 30 15:45:35 2011 UTC

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

Diff Legend

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