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

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 1402 by chuckv, Fri Jan 8 17:15:27 2010 UTC vs.
Revision 1557 by kstocke1, Wed May 11 15:25:39 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 159 | Line 159 | void Globals::validate() {
159  
160    CheckParameter(ForceField, isNotEmpty());
161    CheckParameter(TargetTemp, isPositive());
162 <  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT") || isEqualIgnoreCase("SMIPD"));
162 >  CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPTsz") || isEqualIgnoreCase("NPAT")  || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT") || isEqualIgnoreCase("LANGEVINHULL") || isEqualIgnoreCase("LHULL") || isEqualIgnoreCase("SMIPD"));
163    CheckParameter(Dt, isPositive());
164    CheckParameter(RunTime, isPositive());
165    CheckParameter(FinalConfig, isNotEmpty());
# Line 177 | Line 177 | void Globals::validate() {
177    CheckParameter(Seed, isPositive());
178    CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
179    CheckParameter(MinimizerMaxIter, isPositive());
180 <  CheckParameter(MinimizerWriteFrq, isPositive());
180 >  CheckParameter(MinimizerWriteFreq, isPositive());
181    CheckParameter(MinimizerStepSize, isPositive());
182    CheckParameter(MinimizerFTol, isPositive());
183    CheckParameter(MinimizerGTol, isPositive());

Comparing trunk/src/io/Globals.cpp (property svn:keywords):
Revision 1402 by chuckv, Fri Jan 8 17:15:27 2010 UTC vs.
Revision 1557 by kstocke1, Wed May 11 15:25:39 2011 UTC

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

Diff Legend

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