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 2011 by gezelter, Wed Aug 6 19:27:37 2014 UTC vs.
Revision 2034 by gezelter, Mon Nov 3 16:49:03 2014 UTC

# Line 91 | Line 91 | namespace OpenMD {
91      DefineOptionalParameter(SurfaceTension, "surfaceTension");
92      DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
93      DefineOptionalParameter(ElectricField, "electricField");
94 +    DefineOptionalParameter(UniformField, "uniformField");
95 +    DefineOptionalParameter(UniformGradientStrength, "uniformGradientStrength");
96 +    DefineOptionalParameter(UniformGradientDirection1, "uniformGradientDirection1");
97 +    DefineOptionalParameter(UniformGradientDirection2, "uniformGradientDirection2");
98 +    //DefineOptionalParameter(PeriodicField, "periodicField");
99 +    //DefineOptionalParameter(PeriodicFieldStrength, "periodicFieldStrength");
100 +    
101  
102      DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
103      DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
# Line 158 | Line 165 | namespace OpenMD {
165                                              false);
166      DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole,
167                                              "accumulateBoxDipole", false);
168 +    DefineOptionalParameterWithDefaultValue(AccumulateBoxQuadrupole,
169 +                                            "accumulateBoxQuadrupole", false);
170      DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints",
171                                              false);
172      DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file",
# Line 182 | Line 191 | namespace OpenMD {
191      deprecatedKeywords_.insert("minimizerGTol");
192      deprecatedKeywords_.insert("minimizerLSTol");
193      deprecatedKeywords_.insert("minimizerLSMaxIter");
194 +    deprecatedKeywords_.insert("electricField");
195  
196      
197    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines