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 1746 by gezelter, Wed Jun 6 02:18:54 2012 UTC vs.
Revision 1780 by jmarr, Mon Aug 20 18:28:22 2012 UTC

# Line 88 | Line 88 | Globals::Globals() {
88    DefineOptionalParameter(DampingAlpha, "dampingAlpha");
89    DefineOptionalParameter(SurfaceTension, "surfaceTension");
90    DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
91 <  DefineOptionalParameter(PrintHeatFlux, "printHeatFlux");
91 >  DefineOptionalParameter(ElectricField, "electricField");
92 >
93    DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
94    DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
95    DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
# Line 117 | Line 118 | Globals::Globals() {
118    DefineOptionalParameterWithDefaultValue(ElectrostaticScreeningMethod, "electrostaticScreeningMethod", "DAMPED");
119    DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 80.0);
120    DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", false);
121 +  DefineOptionalParameterWithDefaultValue(PrintHeatFlux, "printHeatFlux", false);
122    DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", false);
123    DefineOptionalParameterWithDefaultValue(OutputParticlePotential, "outputParticlePotential", false);
124    DefineOptionalParameterWithDefaultValue(OutputElectricField, "outputElectricField", false);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines