ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.cpp
(Generate patch)

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 849 by chrisfen, Thu Jan 12 04:13:46 2006 UTC vs.
Revision 867 by chuckv, Fri Jan 13 21:57:48 2006 UTC

# Line 98 | Line 98 | Globals::Globals() {
98    DefineOptionalParameter(ElectrostaticScreeningMethod, "electrostaticScreeningMethod");
99    DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
100    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
101 –  DefineOptionalParameterWithDefaultValue(MixingRule, "mixingRule", "standard");
101    DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
102    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
103    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
# Line 130 | Line 129 | void Globals::validate() {
129  
130    CheckParameter(ForceField, isNotEmpty());
131    CheckParameter(TargetTemp, isPositive());
132 <  CheckParameter(Ensemble, isEqualIgnoreCase(std::string("NVE")) ||
134 <                 isEqualIgnoreCase(std::string("NVT")) ||
135 <                 isEqualIgnoreCase(std::string("NPTi")) ||
136 <                 isEqualIgnoreCase(std::string("NPTf")) ||
137 <                 isEqualIgnoreCase(std::string("NPTxyz")) );
132 >  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  );
133    CheckParameter(Dt, isPositive());
134    CheckParameter(RunTime, isPositive());
135    CheckParameter(InitialConfig, isNotEmpty());
# Line 152 | Line 147 | void Globals::validate() {
147    CheckParameter(ZconsTime, isPositive());
148    CheckParameter(ZconsTol, isPositive());
149    CheckParameter(Seed, isPositive());
150 <  CheckParameter(Minimizer, isEqualIgnoreCase(std::string("SD")) ||
156 <                 isEqualIgnoreCase(std::string("CG")));
150 >  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
151    CheckParameter(MinimizerMaxIter, isPositive());
152    CheckParameter(MinimizerWriteFrq, isPositive());
153    CheckParameter(MinimizerStepSize, isPositive());
# Line 171 | Line 165 | void Globals::validate() {
165    CheckParameter(ThermIntThetaSpringConst, isPositive());
166    CheckParameter(ThermIntOmegaSpringConst, isPositive());
167    CheckParameter(SurfaceTension, isPositive());
168 <  CheckParameter(ElectrostaticSummationMethod,
169 <                 isEqualIgnoreCase(std::string("NONE")) ||
170 <                 isEqualIgnoreCase(std::string("SHIFTED_POTENTIAL")) ||
171 <                 isEqualIgnoreCase(std::string("SHIFTED_FORCE")) ||
178 <                 isEqualIgnoreCase(std::string("REACTION_FIELD")));
179 <  CheckParameter(ElectrostaticScreeningMethod,
180 <                 isEqualIgnoreCase(std::string("UNDAMPED")) ||
181 <                 isEqualIgnoreCase(std::string("DAMPED")));
182 <  CheckParameter(CutoffPolicy, isEqualIgnoreCase(std::string("MIX")) ||
183 <                 isEqualIgnoreCase(std::string("MAX")) ||
184 <                 isEqualIgnoreCase(std::string("TRADITIONAL")));
185 <  CheckParameter(SwitchingFunctionType,
186 <                 isEqualIgnoreCase(std::string("CUBIC")) ||
187 <                 isEqualIgnoreCase(std::string("FIFTH_ORDER_POLYNOMIAL")));
168 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
169 >  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
170 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
171 >  CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
172    //CheckParameter(StatFileFormat,);    
189 –  //CheckParameter(MixingRule,);
173    CheckParameter(OrthoBoxTolerance, isPositive());  
174    CheckParameter(ThermIntDistSpringConst, isPositive());
175    CheckParameter(ThermIntThetaSpringConst, isPositive());

Diff Legend

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