--- trunk/src/brains/Thermo.cpp	2006/05/17 21:51:42	963
+++ trunk/src/brains/Thermo.cpp	2007/04/06 21:53:43	1126
@@ -64,6 +64,7 @@ namespace oopse {
     int i;
     int j;
     int k;
+    RealType mass;
     RealType kinetic = 0.0;
     RealType kinetic_global = 0.0;
     
@@ -71,8 +72,8 @@ namespace oopse {
       for (integrableObject = mol->beginIntegrableObject(iiter); integrableObject != NULL; 
 	   integrableObject = mol->nextIntegrableObject(iiter)) {
         
-	RealType mass = integrableObject->getMass();
-	Vector3d vel = integrableObject->getVel();
+	mass = integrableObject->getMass();
+	vel = integrableObject->getVel();
         
 	kinetic += mass * (vel[0]*vel[0] + vel[1]*vel[1] + vel[2]*vel[2]);
         
@@ -177,8 +178,6 @@ namespace oopse {
     return pressure;
   }
 
-
-
   Mat3x3d Thermo::getPressureTensor() {
     // returns pressure tensor in units amu*fs^-2*Ang^-1
     // routine derived via viral theorem description in:
@@ -212,10 +211,11 @@ namespace oopse {
     Mat3x3d tau = curSnapshot->statData.getTau();
 
     pressureTensor =  (p_global + OOPSEConstant::energyConvert* tau)/volume;
-
+    
     return pressureTensor;
   }
 
+
   void Thermo::saveStat(){
     Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
     Stats& stat = currSnapshot->statData;
@@ -228,9 +228,15 @@ namespace oopse {
     stat[Stats::VOLUME] = getVolume();      
 
     Mat3x3d tensor =getPressureTensor();
-    stat[Stats::PRESSURE_TENSOR_X] = tensor(0, 0);      
-    stat[Stats::PRESSURE_TENSOR_Y] = tensor(1, 1);      
-    stat[Stats::PRESSURE_TENSOR_Z] = tensor(2, 2);      
+    stat[Stats::PRESSURE_TENSOR_XX] = tensor(0, 0);      
+    stat[Stats::PRESSURE_TENSOR_XY] = tensor(0, 1);      
+    stat[Stats::PRESSURE_TENSOR_XZ] = tensor(0, 2);      
+    stat[Stats::PRESSURE_TENSOR_YX] = tensor(1, 0);      
+    stat[Stats::PRESSURE_TENSOR_YY] = tensor(1, 1);      
+    stat[Stats::PRESSURE_TENSOR_YZ] = tensor(1, 2);      
+    stat[Stats::PRESSURE_TENSOR_ZX] = tensor(2, 0);      
+    stat[Stats::PRESSURE_TENSOR_ZY] = tensor(2, 1);      
+    stat[Stats::PRESSURE_TENSOR_ZZ] = tensor(2, 2);      
 
 
     /**@todo need refactorying*/