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 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC vs.
Revision 1877 by gezelter, Thu Jun 6 15:43:35 2013 UTC

# Line 228 | Line 228 | namespace OpenMD {
228      CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") ||
229                     isEqualIgnoreCase("SWITCHED") ||
230                     isEqualIgnoreCase("SHIFTED_POTENTIAL") ||
231 <                   isEqualIgnoreCase("SHIFTED_FORCE"));
231 >                   isEqualIgnoreCase("SHIFTED_FORCE") ||
232 >                   isEqualIgnoreCase("TAYLOR_SHIFTED"));
233      CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") ||
234                     isEqualIgnoreCase("MAX") ||
235                     isEqualIgnoreCase("TRADITIONAL"));
# Line 236 | Line 237 | namespace OpenMD {
237                     isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") ||
238                     isEqualIgnoreCase("SHIFTED_POTENTIAL") ||
239                     isEqualIgnoreCase("SHIFTED_FORCE") ||
240 <                   isEqualIgnoreCase("REACTION_FIELD"));
240 >                   isEqualIgnoreCase("REACTION_FIELD") ||
241 >                   isEqualIgnoreCase("TAYLOR_SHIFTED"));
242      CheckParameter(ElectrostaticScreeningMethod,
243                     isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED"));
244      CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") ||

Diff Legend

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