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 1528 by gezelter, Fri Dec 17 20:11:05 2010 UTC vs.
Revision 1616 by gezelter, Tue Aug 30 15:45:35 2011 UTC

# Line 146 | Line 146 | Globals::Globals() {
146    deprecatedKeywords_.insert("thermIntOmegaSpringConst");
147    deprecatedKeywords_.insert("useSolidThermInt");  
148    deprecatedKeywords_.insert("useLiquidThermInt");
149 –  deprecatedKeywords_.insert("cutoffPolicy");
149      
150   }
151  
# Line 192 | Line 191 | void Globals::validate() {
191    CheckParameter(ForceFieldVariant, isNotEmpty());
192    CheckParameter(ForceFieldFileName, isNotEmpty());
193    CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
194 <  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
194 >  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
195 >  CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") || isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
196    CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
197    CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
198    CheckParameter(OrthoBoxTolerance, isPositive());  
# Line 219 | Line 219 | void Globals::validate() {
219      }
220    }
221   }
222 <  
222 >
223   bool Globals::addComponent(Component* comp) {
224      components_.push_back(comp);
225      return true;

Diff Legend

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