--- trunk/src/io/Globals.cpp 2006/08/24 17:42:35 1023 +++ trunk/src/io/Globals.cpp 2006/09/01 19:16:02 1032 @@ -57,7 +57,7 @@ Globals::Globals() { DefineOptionalParameter(Ensemble, "ensemble"); DefineOptionalParameter(Dt, "dt"); DefineOptionalParameter(RunTime, "runTime"); - DefineOptionalParameter(InitialConfig, "initialConfig"); + //DefineOptionalParameter(InitialConfig, "initialConfig"); DefineOptionalParameter(FinalConfig, "finalConfig"); DefineOptionalParameter(SampleTime, "sampleTime"); DefineOptionalParameter(ResetTime, "resetTime"); @@ -124,6 +124,7 @@ Globals::Globals() { deprecatedKeywords_.insert("nComponents"); deprecatedKeywords_.insert("nZconstraints"); + deprecatedKeywords_.insert("initialConfig"); } @@ -137,10 +138,10 @@ void Globals::validate() { CheckParameter(ForceField, isNotEmpty()); CheckParameter(TargetTemp, isPositive()); - CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT") || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT")); + CheckParameter(Ensemble, isEqualIgnoreCase("NVE") || isEqualIgnoreCase("NVT") || isEqualIgnoreCase("NPTi") || isEqualIgnoreCase("NPTf") || isEqualIgnoreCase("NPTxyz") || isEqualIgnoreCase("NPAT") || isEqualIgnoreCase("LANGEVINDYNAMICS") || isEqualIgnoreCase("LD") || isEqualIgnoreCase("NPRT") || isEqualIgnoreCase("NPGT") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT")); CheckParameter(Dt, isPositive()); CheckParameter(RunTime, isPositive()); - CheckParameter(InitialConfig, isNotEmpty()); + //CheckParameter(InitialConfig, isNotEmpty()); CheckParameter(FinalConfig, isNotEmpty()); CheckParameter(SampleTime, isNonNegative()); CheckParameter(ResetTime, isNonNegative());