--- trunk/src/io/Globals.cpp 2009/06/15 20:12:09 1354 +++ trunk/src/io/Globals.cpp 2009/07/20 17:50:40 1355 @@ -102,6 +102,8 @@ Globals::Globals() { DefineOptionalParameter(BeadSize, "beadSize"); DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius"); DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius"); + DefineOptionalParameter(ThermalConductivity, "thermalConductivity"); + DefineOptionalParameter(ThermalLength, "thermalLength"); DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors"); DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod"); DefineOptionalParameter(MTM_Ce, "MTM_Ce"); @@ -208,6 +210,8 @@ void Globals::validate() { CheckParameter(DampingAlpha,isNonNegative()); CheckParameter(SkinThickness, isPositive()); CheckParameter(Viscosity, isNonNegative()); + CheckParameter(ThermalConductivity, isNonNegative()); + CheckParameter(ThermalLength, isNonNegative()); CheckParameter(BeadSize, isPositive()); CheckParameter(FrozenBufferRadius, isPositive()); CheckParameter(LangevinBufferRadius, isPositive());