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 1402 by chuckv, Fri Jan 8 17:15:27 2010 UTC vs.
branches/development/src/io/Globals.cpp (file contents), Revision 1714 by gezelter, Sat May 19 18:12:46 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include <stdlib.h>
# Line 74 | Line 75 | Globals::Globals() {
75    DefineOptionalParameter(Seed, "seed");
76    DefineOptionalParameter(Minimizer, "minimizer");
77    DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
78 <  DefineOptionalParameter(MinimizerWriteFrq, "minimizerWriteFrq");
78 >  DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq");
79    DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
80    DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
81    DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
# Line 92 | Line 93 | Globals::Globals() {
93    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
94    DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
95    DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
95 –  DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
96    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
97    DefineOptionalParameter(HydroPropFile, "HydroPropFile");
98    DefineOptionalParameter(Viscosity, "viscosity");
# Line 101 | Line 101 | Globals::Globals() {
101    DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
102    DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
103    DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
104 +  DefineOptionalParameter(ElectrostaticSummationMethod, "electrostaticSummationMethod");
105    DefineOptionalParameter(MTM_Ce, "MTM_Ce");
106    DefineOptionalParameter(MTM_G, "MTM_G");
107    DefineOptionalParameter(MTM_Io, "MTM_Io");
# Line 114 | Line 115 | Globals::Globals() {
115    DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
116    DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
117    DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
118 <  DefineOptionalParameterWithDefaultValue(ElectrostaticSummationMethod, "electrostaticSummationMethod", "SHIFTED_FORCE");
118 >  DefineOptionalParameterWithDefaultValue(CutoffMethod, "cutoffMethod", "SHIFTED_FORCE");
119    DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
120 <  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5);
121 <  DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0);
122 <  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0);
120 >  DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
121 >  DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
122 >  DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
123 >  DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
124 >  DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);
125 >  DefineOptionalParameterWithDefaultValue(OutputFluctuatingCharges, "outputFluctuatingCharges", false);
126    DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);
127    DefineOptionalParameterWithDefaultValue(StatFileFormat, "statFileFormat", "TIME|TOTAL_ENERGY|POTENTIAL_ENERGY|KINETIC_ENERGY|TEMPERATURE|PRESSURE|VOLUME|CONSERVED_QUANTITY");    
128    DefineOptionalParameterWithDefaultValue(UseSphericalBoundaryConditions, "useSphericalBoundaryConditions", false);
# Line 131 | Line 135 | Globals::Globals() {
135    DefineOptionalParameterWithDefaultValue(RNEMD_exchangeType, "RNEMD_exchangeType", "KineticScale");
136    DefineOptionalParameterWithDefaultValue(RNEMD_targetFlux, "RNEMD_targetFlux", 0.0);
137    DefineOptionalParameterWithDefaultValue(RNEMD_objectSelection, "RNEMD_objectSelection", "select all");
138 +  DefineOptionalParameterWithDefaultValue(RNEMD_binShift, "RNEMD_binShift", false);
139 +  DefineOptionalParameterWithDefaultValue(RNEMD_outputDimensionalTemperature, "RNEMD_outputDimensionalTemperature", false);
140    DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints", false);
141    DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file", "idealCrystal.in");
142    DefineOptionalParameterWithDefaultValue(UseThermodynamicIntegration, "useThermodynamicIntegration", false);
143    DefineOptionalParameterWithDefaultValue(HULL_Method,"HULL_Method","Convex");
144  
145  
146 +
147    deprecatedKeywords_.insert("nComponents");
148    deprecatedKeywords_.insert("nZconstraints");
149    deprecatedKeywords_.insert("initialConfig");
# Line 159 | Line 166 | void Globals::validate() {
166  
167    CheckParameter(ForceField, isNotEmpty());
168    CheckParameter(TargetTemp, isPositive());
169 <  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"));
169 >  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"));
170    CheckParameter(Dt, isPositive());
171    CheckParameter(RunTime, isPositive());
172    CheckParameter(FinalConfig, isNotEmpty());
# Line 177 | Line 184 | void Globals::validate() {
184    CheckParameter(Seed, isPositive());
185    CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
186    CheckParameter(MinimizerMaxIter, isPositive());
187 <  CheckParameter(MinimizerWriteFrq, isPositive());
187 >  CheckParameter(MinimizerWriteFreq, isPositive());
188    CheckParameter(MinimizerStepSize, isPositive());
189    CheckParameter(MinimizerFTol, isPositive());
190    CheckParameter(MinimizerGTol, isPositive());
# Line 189 | Line 196 | void Globals::validate() {
196    CheckParameter(ThermodynamicIntegrationK, isPositive());
197    CheckParameter(ForceFieldVariant, isNotEmpty());
198    CheckParameter(ForceFieldFileName, isNotEmpty());
199 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
193 <  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
199 >  CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
200    CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
201 +  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
202 +  CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
203    CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
196 –  //CheckParameter(StatFileFormat,);    
204    CheckParameter(OrthoBoxTolerance, isPositive());  
205    CheckParameter(DampingAlpha,isNonNegative());
206    CheckParameter(SkinThickness, isPositive());
# Line 205 | Line 212 | void Globals::validate() {
212    CheckParameter(RNEMD_exchangeTime, isPositive());
213    CheckParameter(RNEMD_nBins, isPositive() && isEven());
214    CheckParameter(RNEMD_exchangeType, isEqualIgnoreCase("KineticSwap") || isEqualIgnoreCase("KineticScale") || isEqualIgnoreCase("Px") || isEqualIgnoreCase("Py") || isEqualIgnoreCase("Pz") || isEqualIgnoreCase("PxScale") || isEqualIgnoreCase("PyScale") || isEqualIgnoreCase("PzScale"));
208 –  CheckParameter(RNEMD_targetFlux, isNonNegative());
215    CheckParameter(HULL_Method, isEqualIgnoreCase("Convex") || isEqualIgnoreCase("AlphaShape"));
216    CheckParameter(Alpha, isPositive());
217  
# Line 218 | Line 224 | void Globals::validate() {
224      }
225    }
226   }
227 <  
227 >
228   bool Globals::addComponent(Component* comp) {
229      components_.push_back(comp);
230      return true;

Comparing:
trunk/src/io/Globals.cpp (property svn:keywords), Revision 1402 by chuckv, Fri Jan 8 17:15:27 2010 UTC vs.
branches/development/src/io/Globals.cpp (property svn:keywords), Revision 1714 by gezelter, Sat May 19 18:12:46 2012 UTC

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

Diff Legend

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