--- trunk/src/io/Globals.cpp	2006/12/05 00:17:24	1095
+++ trunk/src/io/Globals.cpp	2008/10/16 18:25:36	1306
@@ -65,7 +65,7 @@ Globals::Globals() {
   DefineOptionalParameter(SwitchingRadius, "switchingRadius");
   DefineOptionalParameter(TempSet, "tempSet");
   DefineOptionalParameter(ThermalTime, "thermalTime");
-  DefineOptionalParameter(TargetPressure, "targetPressure");
+  DefineOptionalParameter(TargetPressure, "targetPressure");  
   DefineOptionalParameter(TauThermostat, "tauThermostat");
   DefineOptionalParameter(TauBarostat, "tauBarostat");
   DefineOptionalParameter(ZconsTime, "zconsTime");
@@ -93,6 +93,8 @@ Globals::Globals() {
   DefineOptionalParameter(ThermIntOmegaSpringConst, "thermIntOmegaSpringConst");
   DefineOptionalParameter(SurfaceTension, "surfaceTension");
   DefineOptionalParameter(PrintPressureTensor, "printPressureTensor");
+  DefineOptionalParameter(TaggedAtomPair, "taggedAtomPair");
+  DefineOptionalParameter(PrintTaggedPairDistance, "printTaggedPairDistance");
   DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
   DefineOptionalParameter(SwitchingFunctionType, "switchingFunctionType");
   DefineOptionalParameter(HydroPropFile, "HydroPropFile");
@@ -101,13 +103,16 @@ Globals::Globals() {
   DefineOptionalParameter(FrozenBufferRadius, "frozenBufferRadius");
   DefineOptionalParameter(LangevinBufferRadius, "langevinBufferRadius");
   DefineOptionalParameter(NeighborListNeighbors,"NeighborListNeighbors");
-  DefineOptionalParameter(TempDepViscosityA,"tempDepViscosityA");
-  DefineOptionalParameter(TempDepViscosityB,"tempDepViscosityB");
-  DefineOptionalParameter(TempDepViscosityC,"tempDepViscosityC");
-  DefineOptionalParameter(TempDepViscosityD,"tempDepViscosityD");
-
+  DefineOptionalParameter(UseMultipleTemperatureMethod, "useMultipleTemperatureMethod");
+  DefineOptionalParameter(MTM_Ce, "MTM_Ce");
+  DefineOptionalParameter(MTM_G, "MTM_G");
+  DefineOptionalParameter(MTM_Io, "MTM_Io");
+  DefineOptionalParameter(MTM_Sigma, "MTM_Sigma");
+  DefineOptionalParameter(MTM_R, "MTM_R");
   
+  
   DefineOptionalParameterWithDefaultValue(UsePeriodicBoundaryConditions, "usePeriodicBoundaryConditions", true);
+  DefineOptionalParameterWithDefaultValue(UseAtomicVirial, "useAtomicVirial", true);
   DefineOptionalParameterWithDefaultValue(UseInitalTime, "useInitialTime", false);
   DefineOptionalParameterWithDefaultValue(UseIntialExtendedSystemState, "useInitialExtendedSystemState", false);
   DefineOptionalParameterWithDefaultValue(OrthoBoxTolerance, "orthoBoxTolerance", 1E-6);  
@@ -142,7 +147,7 @@ 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") || isEqualIgnoreCase("NGammaT") || isEqualIgnoreCase("NGT"));
+  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") || isEqualIgnoreCase("SMIPD"));
   CheckParameter(Dt, isPositive());
   CheckParameter(RunTime, isPositive());
   CheckParameter(FinalConfig, isNotEmpty());