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 1731 by gezelter, Thu May 31 12:25:30 2012 UTC vs.
Revision 1780 by jmarr, Mon Aug 20 18:28:22 2012 UTC

# Line 52 | Line 52 | Globals::Globals() {
52  
53   namespace OpenMD {
54   Globals::Globals() {
55 +  
56 +  flucQpars_ = new FluctuatingChargeParameters();
57 +  rnemdPars_ = new RNEMDParameters();
58 +  minimizerPars_ = new MinimizerParameters();
59 +
60    DefineParameter(ForceField, "forceField")
61  
62    DefineOptionalParameter(TargetTemp, "targetTemp");
# Line 73 | Line 78 | Globals::Globals() {
78    DefineOptionalParameter(ZconsTol, "zconsTol");
79    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
80    DefineOptionalParameter(Seed, "seed");
76 –  DefineOptionalParameter(Minimizer, "minimizer");
77 –  DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
78 –  DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq");
79 –  DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
80 –  DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
81 –  DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
82 –  DefineOptionalParameter(MinimizerLSTol, "minimizerLSTol");
83 –  DefineOptionalParameter(MinimizerLSMaxIter, "minimizerLSMaxIter");
81    DefineOptionalParameter(ZconsGap, "zconsGap");
82    DefineOptionalParameter(ZconsFixtime, "zconsFixtime");
83    DefineOptionalParameter(ZconsUsingSMD, "zconsUsingSMD");
# Line 91 | Line 88 | Globals::Globals() {
88    DefineOptionalParameter(DampingAlpha, "dampingAlpha");
89    DefineOptionalParameter(SurfaceTension, "surfaceTension");
90    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
91 <  DefineOptionalParameter(PrintHeatFlux, "printHeatFlux");
91 >  DefineOptionalParameter(ElectricField, "electricField");
92 >
93    DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
94    DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
95    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
# Line 120 | Line 118 | Globals::Globals() {
118    DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
119    DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
120    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
121 +  DefineOptionalParameterWithDefaultValue(PrintHeatFlux, "printHeatFlux", false);
122    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
123    DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
124    DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);
# Line 142 | Line 141 | Globals::Globals() {
141    deprecatedKeywords_.insert("thermIntOmegaSpringConst");
142    deprecatedKeywords_.insert("useSolidThermInt");  
143    deprecatedKeywords_.insert("useLiquidThermInt");
144 +  deprecatedKeywords_.insert("minimizerMaxIter");
145 +  deprecatedKeywords_.insert("minimizerWriteFreq");
146 +  deprecatedKeywords_.insert("minimizerStepSize");
147 +  deprecatedKeywords_.insert("minimizerFTol");
148 +  deprecatedKeywords_.insert("minimizerGTol");
149 +  deprecatedKeywords_.insert("minimizerLSTol");
150 +  deprecatedKeywords_.insert("minimizerLSMaxIter");
151 +
152      
153   }
154  
# Line 172 | Line 179 | void Globals::validate() {
179    CheckParameter(ZconsTime, isPositive());
180    CheckParameter(ZconsTol, isPositive());
181    CheckParameter(Seed, isPositive());
175 –  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
176 –  CheckParameter(MinimizerMaxIter, isPositive());
177 –  CheckParameter(MinimizerWriteFreq, isPositive());
178 –  CheckParameter(MinimizerStepSize, isPositive());
179 –  CheckParameter(MinimizerFTol, isPositive());
180 –  CheckParameter(MinimizerGTol, isPositive());
181 –  CheckParameter(MinimizerLSTol, isPositive());
182 –  CheckParameter(MinimizerLSMaxIter, isPositive());
182    CheckParameter(ZconsGap, isPositive());
183    CheckParameter(ZconsFixtime, isPositive());
184    CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
# Line 242 | Line 241 | bool Globals::addRNEMDParameters(RNEMDParameters* rnem
241    return true;
242   }
243  
244 + bool Globals::addMinimizerParameters(MinimizerParameters* miniPars) {
245 +  if (minimizerPars_ != NULL)
246 +    delete minimizerPars_;
247 +    
248 +  minimizerPars_ = miniPars;
249 +  return true;
250 + }
251 +
252   bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
253      std::string molStampName = molStamp->getName();
254      std::map<std::string, MoleculeStamp*>::iterator i;

Diff Legend

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