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 1744 by gezelter, Tue Jun 5 18:07:08 2012 UTC vs.
Revision 1746 by gezelter, Wed Jun 6 02:18:54 2012 UTC

# Line 55 | Line 55 | Globals::Globals() {
55    
56    flucQpars_ = new FluctuatingChargeParameters();
57    rnemdPars_ = new RNEMDParameters();
58 +  minimizerPars_ = new MinimizerParameters();
59  
60    DefineParameter(ForceField, "forceField")
61  
# Line 77 | Line 78 | Globals::Globals() {
78    DefineOptionalParameter(ZconsTol, "zconsTol");
79    DefineOptionalParameter(ZconsForcePolicy, "zconsForcePolicy");
80    DefineOptionalParameter(Seed, "seed");
80 –  DefineOptionalParameter(Minimizer, "minimizer");
81 –  DefineOptionalParameter(MinimizerMaxIter,"minimizerMaxIter");
82 –  DefineOptionalParameter(MinimizerWriteFreq, "minimizerWriteFreq");
83 –  DefineOptionalParameter(MinimizerStepSize, "minimizerStepSize");
84 –  DefineOptionalParameter(MinimizerFTol, "minimizerFTol");
85 –  DefineOptionalParameter(MinimizerGTol, "minimizerGTol");
86 –  DefineOptionalParameter(MinimizerLSTol, "minimizerLSTol");
87 –  DefineOptionalParameter(MinimizerLSMaxIter, "minimizerLSMaxIter");
81    DefineOptionalParameter(ZconsGap, "zconsGap");
82    DefineOptionalParameter(ZconsFixtime, "zconsFixtime");
83    DefineOptionalParameter(ZconsUsingSMD, "zconsUsingSMD");
# Line 146 | Line 139 | Globals::Globals() {
139    deprecatedKeywords_.insert("thermIntOmegaSpringConst");
140    deprecatedKeywords_.insert("useSolidThermInt");  
141    deprecatedKeywords_.insert("useLiquidThermInt");
142 +  deprecatedKeywords_.insert("minimizerMaxIter");
143 +  deprecatedKeywords_.insert("minimizerWriteFreq");
144 +  deprecatedKeywords_.insert("minimizerStepSize");
145 +  deprecatedKeywords_.insert("minimizerFTol");
146 +  deprecatedKeywords_.insert("minimizerGTol");
147 +  deprecatedKeywords_.insert("minimizerLSTol");
148 +  deprecatedKeywords_.insert("minimizerLSMaxIter");
149 +
150      
151   }
152  
# Line 176 | Line 177 | void Globals::validate() {
177    CheckParameter(ZconsTime, isPositive());
178    CheckParameter(ZconsTol, isPositive());
179    CheckParameter(Seed, isPositive());
179 –  CheckParameter(Minimizer, isEqualIgnoreCase("SD") || isEqualIgnoreCase("CG"));
180 –  CheckParameter(MinimizerMaxIter, isPositive());
181 –  CheckParameter(MinimizerWriteFreq, isPositive());
182 –  CheckParameter(MinimizerStepSize, isPositive());
183 –  CheckParameter(MinimizerFTol, isPositive());
184 –  CheckParameter(MinimizerGTol, isPositive());
185 –  CheckParameter(MinimizerLSTol, isPositive());
186 –  CheckParameter(MinimizerLSMaxIter, isPositive());
180    CheckParameter(ZconsGap, isPositive());
181    CheckParameter(ZconsFixtime, isPositive());
182    CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
# Line 246 | Line 239 | bool Globals::addRNEMDParameters(RNEMDParameters* rnem
239    return true;
240   }
241  
242 + bool Globals::addMinimizerParameters(MinimizerParameters* miniPars) {
243 +  if (minimizerPars_ != NULL)
244 +    delete minimizerPars_;
245 +    
246 +  minimizerPars_ = miniPars;
247 +  return true;
248 + }
249 +
250   bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
251      std::string molStampName = molStamp->getName();
252      std::map<std::string, MoleculeStamp*>::iterator i;

Diff Legend

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