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 1993 by gezelter, Tue Apr 29 17:32:31 2014 UTC vs.
Revision 2026 by gezelter, Wed Oct 22 12:23:59 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(UniformGradient, "uniformGradient");
96 +    //DefineOptionalParameter(PeriodicField, "periodicField");
97 +    //DefineOptionalParameter(PeriodicFieldStrength, "periodicFieldStrength");
98 +    
99  
100      DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
101      DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
# Line 158 | Line 163 | namespace OpenMD {
163                                              false);
164      DefineOptionalParameterWithDefaultValue(AccumulateBoxDipole,
165                                              "accumulateBoxDipole", false);
166 +    DefineOptionalParameterWithDefaultValue(AccumulateBoxQuadrupole,
167 +                                            "accumulateBoxQuadrupole", false);
168      DefineOptionalParameterWithDefaultValue(UseRestraints, "useRestraints",
169                                              false);
170      DefineOptionalParameterWithDefaultValue(Restraint_file, "Restraint_file",
# Line 182 | Line 189 | namespace OpenMD {
189      deprecatedKeywords_.insert("minimizerGTol");
190      deprecatedKeywords_.insert("minimizerLSTol");
191      deprecatedKeywords_.insert("minimizerLSMaxIter");
192 +    deprecatedKeywords_.insert("electricField");
193  
194      
195    }
# Line 204 | Line 212 | namespace OpenMD {
212                     isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") ||
213                     isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") ||
214                     isEqualIgnoreCase("NPTsz") || isEqualIgnoreCase("NPAT")  ||
215 +                   isEqualIgnoreCase("NPA") ||
216                     isEqualIgnoreCase("LANGEVINDYNAMICS") ||
217                     isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") ||
218                     isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") ||

Diff Legend

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