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 1398 by gezelter, Tue Dec 8 22:17:02 2009 UTC vs.
branches/development/src/io/Globals.cpp (file contents), Revision 1528 by gezelter, Fri Dec 17 20:11:05 2010 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 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");
107		DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
108		DefineOptionalParameter(MTM_R, "MTM_R");
109	<
109	>	DefineOptionalParameter(Alpha, "alpha");
110
111
112		DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
#	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 134 | Line 134 | Globals::Globals() {
134		DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
135		DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
136		DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
137	+	DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
138
139
140	+
141		deprecatedKeywords_.insert("nComponents");
142		deprecatedKeywords_.insert("nZconstraints");
143		deprecatedKeywords_.insert("initialConfig");
#	Line 144 | Line 146 | Globals::Globals() {
146		deprecatedKeywords_.insert("thermIntOmegaSpringConst");
147		deprecatedKeywords_.insert("useSolidThermInt");
148		deprecatedKeywords_.insert("useLiquidThermInt");
149	+	deprecatedKeywords_.insert("cutoffPolicy");
150
151		}
152
#	Line 176 | Line 179 | void Globals::validate() {
179		CheckParameter(Seed, isPositive());
180		CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
181		CheckParameter(MinimizerMaxIter, isPositive());
182	<	CheckParameter(MinimizerWriteFrq, isPositive());
182	>	CheckParameter(MinimizerWriteFreq, isPositive());
183		CheckParameter(MinimizerStepSize, isPositive());
184		CheckParameter(MinimizerFTol, isPositive());
185		CheckParameter(MinimizerGTol, isPositive());
#	Line 188 | Line 191 | void Globals::validate() {
191		CheckParameter(ThermodynamicIntegrationK, isPositive());
192		CheckParameter(ForceFieldVariant, isNotEmpty());
193		CheckParameter(ForceFieldFileName, isNotEmpty());
194	<	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
194	>	CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
195	>	CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
196		CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
193	–	CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
197		CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
195	–	//CheckParameter(StatFileFormat,);
198		CheckParameter(OrthoBoxTolerance, isPositive());
199		CheckParameter(DampingAlpha,isNonNegative());
200		CheckParameter(SkinThickness, isPositive());
#	Line 205 | Line 207 | void Globals::validate() {
207		CheckParameter(RNEMD_nBins, isPositive() && isEven());
208		CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
209		CheckParameter(RNEMD_targetFlux, isNonNegative());
210	+	CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
211	+	CheckParameter(Alpha, isPositive());
212
213	+
214		for(std::vector<Component*>::iterator i = components_.begin(); i != components_.end(); ++i) {
215		if (!(*i)->findMoleculeStamp(moleculeStamps_)) {
216		std::ostringstream oss;

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 1398 by gezelter, Tue Dec 8 22:17:02 2009 UTC vs.
branches/development/src/io/Globals.cpp (property svn:keywords), Revision 1528 by gezelter, Fri Dec 17 20:11:05 2010 UTC

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

Diff Legend

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