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 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 1981 by gezelter, Mon Apr 14 18:32:51 2014 UTC

# Line 111 | Line 111 | namespace OpenMD {
111      DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
112      DefineOptionalParameter(MTM_R, "MTM_R");
113      DefineOptionalParameter(Alpha, "alpha");
114 +    DefineOptionalParameter(ConstraintTime, "constraintTime");
115  
116    
117      DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions,
# Line 187 | Line 188 | namespace OpenMD {
188      MemoryUtils::deletePointers(components_);
189      MemoryUtils::deletePointers(zconstraints_);
190      MemoryUtils::deletePointers(restraints_);
191 +    delete flucQpars_;
192 +    delete rnemdPars_;
193 +    delete minimizerPars_;
194    }
195  
196    void Globals::validate() {
# Line 229 | Line 233 | namespace OpenMD {
233                     isEqualIgnoreCase("SWITCHED") ||
234                     isEqualIgnoreCase("SHIFTED_POTENTIAL") ||
235                     isEqualIgnoreCase("SHIFTED_FORCE") ||
236 <                   isEqualIgnoreCase("TAYLOR_SHIFTED"));
236 >                   isEqualIgnoreCase("TAYLOR_SHIFTED") ||
237 >                   isEqualIgnoreCase("EWALD_FULL"));
238      CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") ||
239                     isEqualIgnoreCase("MAX") ||
240                     isEqualIgnoreCase("TRADITIONAL"));

Diff Legend

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