ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.cpp
(Generate patch)

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 1354 by gezelter, Mon Jun 15 20:12:09 2009 UTC vs.
Revision 1355 by gezelter, Mon Jul 20 17:50:40 2009 UTC

# Line 102 | Line 102 | Globals::Globals() {
102    DefineOptionalParameter(BeadSize, "beadSize");
103    DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
104    DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
105 +  DefineOptionalParameter(ThermalConductivity, "thermalConductivity");
106 +  DefineOptionalParameter(ThermalLength, "thermalLength");
107    DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
108    DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
109    DefineOptionalParameter(MTM_Ce, "MTM_Ce");
# Line 208 | Line 210 | void Globals::validate() {
210    CheckParameter(DampingAlpha,isNonNegative());
211    CheckParameter(SkinThickness, isPositive());
212    CheckParameter(Viscosity, isNonNegative());
213 +  CheckParameter(ThermalConductivity, isNonNegative());
214 +  CheckParameter(ThermalLength, isNonNegative());
215    CheckParameter(BeadSize, isPositive());
216    CheckParameter(FrozenBufferRadius, isPositive());
217    CheckParameter(LangevinBufferRadius, isPositive());

Diff Legend

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