ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/io/Globals.cpp
(Generate patch)

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 2026 by gezelter, Wed Oct 22 12:23:59 2014 UTC vs.
Revision 2057 by gezelter, Tue Mar 3 15:22:26 2015 UTC

# Line 92 | Line 92 | namespace OpenMD {
92      DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
93      DefineOptionalParameter(ElectricField, "electricField");
94      DefineOptionalParameter(UniformField, "uniformField");
95 <    DefineOptionalParameter(UniformGradient, "uniformGradient");
95 >    DefineOptionalParameter(UniformGradientStrength, "uniformGradientStrength");
96 >    DefineOptionalParameter(UniformGradientDirection1, "uniformGradientDirection1");
97 >    DefineOptionalParameter(UniformGradientDirection2, "uniformGradientDirection2");
98      //DefineOptionalParameter(PeriodicField, "periodicField");
99      //DefineOptionalParameter(PeriodicFieldStrength, "periodicFieldStrength");
100      
# Line 190 | Line 192 | namespace OpenMD {
192      deprecatedKeywords_.insert("minimizerLSTol");
193      deprecatedKeywords_.insert("minimizerLSMaxIter");
194      deprecatedKeywords_.insert("electricField");
195 <
194 <    
195 >    deprecatedKeywords_.insert("cutoffPolicy");
196    }
197  
198    Globals::~Globals() {
# Line 246 | Line 247 | namespace OpenMD {
247                     isEqualIgnoreCase("SHIFTED_FORCE") ||
248                     isEqualIgnoreCase("TAYLOR_SHIFTED") ||
249                     isEqualIgnoreCase("EWALD_FULL"));
250 <    CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") ||
251 <                   isEqualIgnoreCase("MAX") ||
252 <                   isEqualIgnoreCase("TRADITIONAL"));
252 <    CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") ||
253 <                   isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") ||
250 >    CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("NONE") ||
251 >                   isEqualIgnoreCase("HARD") ||
252 >                   isEqualIgnoreCase("SWITCHED") ||
253                     isEqualIgnoreCase("SHIFTED_POTENTIAL") ||
254                     isEqualIgnoreCase("SHIFTED_FORCE") ||
255                     isEqualIgnoreCase("REACTION_FIELD") ||
256                     isEqualIgnoreCase("TAYLOR_SHIFTED"));
257      CheckParameter(ElectrostaticScreeningMethod,
258 <                   isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
258 >                   isEqualIgnoreCase("UNDAMPED") ||
259 >                   isEqualIgnoreCase("DAMPED"));
260      CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") ||
261                     isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
262      CheckParameter(OrthoBoxTolerance, isPositive());  

Diff Legend

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