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 1749 by gezelter, Thu Jun 7 02:47:21 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 95 | Line 88 | Globals::Globals() {
88    DefineOptionalParameter(DampingAlpha, "dampingAlpha");
89    DefineOptionalParameter(SurfaceTension, "surfaceTension");
90    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
91 <  DefineOptionalParameter(PrintHeatFlux, "printHeatFlux");
91 >
92    DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
93    DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
94    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
# Line 124 | Line 117 | Globals::Globals() {
117    DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
118    DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
119    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
120 +  DefineOptionalParameterWithDefaultValue(PrintHeatFlux, "printHeatFlux", false);
121    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
122    DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
123    DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);
# Line 146 | Line 140 | Globals::Globals() {
140    deprecatedKeywords_.insert("thermIntOmegaSpringConst");
141    deprecatedKeywords_.insert("useSolidThermInt");  
142    deprecatedKeywords_.insert("useLiquidThermInt");
143 +  deprecatedKeywords_.insert("minimizerMaxIter");
144 +  deprecatedKeywords_.insert("minimizerWriteFreq");
145 +  deprecatedKeywords_.insert("minimizerStepSize");
146 +  deprecatedKeywords_.insert("minimizerFTol");
147 +  deprecatedKeywords_.insert("minimizerGTol");
148 +  deprecatedKeywords_.insert("minimizerLSTol");
149 +  deprecatedKeywords_.insert("minimizerLSMaxIter");
150 +
151      
152   }
153  
# Line 176 | Line 178 | void Globals::validate() {
178    CheckParameter(ZconsTime, isPositive());
179    CheckParameter(ZconsTol, isPositive());
180    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());
181    CheckParameter(ZconsGap, isPositive());
182    CheckParameter(ZconsFixtime, isPositive());
183    CheckParameter(ThermodynamicIntegrationLambda, isNonNegative());
# Line 246 | Line 240 | bool Globals::addRNEMDParameters(RNEMDParameters* rnem
240    return true;
241   }
242  
243 + bool Globals::addMinimizerParameters(MinimizerParameters* miniPars) {
244 +  if (minimizerPars_ != NULL)
245 +    delete minimizerPars_;
246 +    
247 +  minimizerPars_ = miniPars;
248 +  return true;
249 + }
250 +
251   bool Globals::addMoleculeStamp(MoleculeStamp* molStamp) {
252      std::string molStampName = molStamp->getName();
253      std::map<std::string, MoleculeStamp*>::iterator i;

Diff Legend

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