--- trunk/src/io/Globals.cpp 2009/11/25 20:02:06 1390 +++ trunk/src/io/Globals.cpp 2009/12/08 22:17:02 1398 @@ -99,8 +99,6 @@ 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"); @@ -199,8 +197,6 @@ 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());