--- trunk/src/io/Globals.cpp 2006/09/01 19:16:02 1032 +++ trunk/src/io/Globals.cpp 2006/09/22 22:19:59 1050 @@ -64,7 +64,6 @@ Globals::Globals() { DefineOptionalParameter(StatusTime, "statusTime"); DefineOptionalParameter(CutoffRadius, "cutoffRadius"); DefineOptionalParameter(SwitchingRadius, "switchingRadius"); - DefineOptionalParameter(Dielectric, "dielectric"); DefineOptionalParameter(TempSet, "tempSet"); DefineOptionalParameter(ThermalTime, "thermalTime"); DefineOptionalParameter(TargetPressure, "targetPressure"); @@ -113,7 +112,8 @@ Globals::Globals() { DefineOptionalParameterWithDefaultValue(ThermIntDistSpringConst, "thermIntDistSpringConst", 6.0); DefineOptionalParameterWithDefaultValue(ThermIntThetaSpringConst, "thermIntThetaSpringConst", 7.5); DefineOptionalParameterWithDefaultValue(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst", 13.5); - DefineOptionalParameterWithDefaultValue(DampingAlpha, "dampingAlpha", 0.2); + DefineOptionalParameter(DampingAlpha, "dampingAlpha"); + DefineOptionalParameterWithDefaultValue(Dielectric, "dielectric", 78.5); DefineOptionalParameterWithDefaultValue(CompressDumpFile, "compressDumpFile", 0); DefineOptionalParameterWithDefaultValue(OutputForceVector, "outputForceVector", 0); DefineOptionalParameterWithDefaultValue(SkinThickness, "skinThickness", 1.0);