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 1559 by skuang, Wed May 11 17:52:33 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 131 | Line 131 | Globals::Globals() {
131    DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale");
132    DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0);
133    DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
134 +  DefineOptionalParameterWithDefaultValue(RNEMD_binShift, "RNEMD_binShift", false);
135 +  DefineOptionalParameterWithDefaultValue(RNEMD_outputDimensionalTemperature, "RNEMD_outputDimensionalTemperature", false);
136    DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
137    DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
138    DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
# Line 159 | Line 161 | void Globals::validate() {
161  
162    CheckParameter(ForceField, isNotEmpty());
163    CheckParameter(TargetTemp, isPositive());
164 <  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"));
164 >  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"));
165    CheckParameter(Dt, isPositive());
166    CheckParameter(RunTime, isPositive());
167    CheckParameter(FinalConfig, isNotEmpty());
# Line 177 | 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 205 | Line 207 | void Globals::validate() {
207    CheckParameter(RNEMD_exchangeTime, isPositive());
208    CheckParameter(RNEMD_nBins, isPositive() && isEven());
209    CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
210 <  CheckParameter(RNEMD_targetFlux, isNonNegative());
210 >  //CheckParameter(RNEMD_targetFlux, isNonNegative());
211    CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
212    CheckParameter(Alpha, isPositive());
213  

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

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

Diff Legend

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