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

Comparing branches/development/src/io/Globals.cpp (file contents):
Revision 1616 by gezelter, Tue Aug 30 15:45:35 2011 UTC vs.
Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

# Line 119 | Line 119 | Globals::Globals() {
119    DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
120    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
121    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
122 +  DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", 0);
123    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
124    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
125    DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
# Line 131 | Line 132 | Globals::Globals() {
132    DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale");
133    DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0);
134    DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
135 +  DefineOptionalParameterWithDefaultValue(RNEMD_binShift, "RNEMD_binShift", false);
136 +  DefineOptionalParameterWithDefaultValue(RNEMD_outputDimensionalTemperature, "RNEMD_outputDimensionalTemperature", false);
137    DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
138    DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
139    DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
# Line 160 | Line 163 | void Globals::validate() {
163  
164    CheckParameter(ForceField, isNotEmpty());
165    CheckParameter(TargetTemp, isPositive());
166 <  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"));
166 >  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"));
167    CheckParameter(Dt, isPositive());
168    CheckParameter(RunTime, isPositive());
169    CheckParameter(FinalConfig, isNotEmpty());
# Line 206 | Line 209 | void Globals::validate() {
209    CheckParameter(RNEMD_exchangeTime, isPositive());
210    CheckParameter(RNEMD_nBins, isPositive() && isEven());
211    CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
209 –  CheckParameter(RNEMD_targetFlux, isNonNegative());
212    CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
213    CheckParameter(Alpha, isPositive());
214  

Diff Legend

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