--- branches/development/src/brains/Thermo.cpp	2012/05/18 21:44:02	1710
+++ branches/development/src/brains/Thermo.cpp	2012/05/22 21:55:31	1715
@@ -143,8 +143,44 @@ namespace OpenMD {
     
     RealType temperature = ( 2.0 * this->getKinetic() ) / (info_->getNdf()* PhysicalConstants::kb );
     return temperature;
+  }
+
+  RealType Thermo::getElectronicTemperature() {
+    SimInfo::MoleculeIterator miter;
+    std::vector<Atom*>::iterator iiter;
+    Molecule* mol;
+    Atom* atom;    
+    RealType cvel;
+    RealType cmass;
+    RealType kinetic = 0.0;
+    RealType kinetic_global = 0.0;
+    
+    for (mol = info_->beginMolecule(miter); mol != NULL; mol = info_->nextMolecule(miter)) {
+      for (atom = mol->beginFluctuatingCharge(iiter); atom != NULL; 
+	   atom = mol->nextFluctuatingCharge(iiter)) {
+        cmass = atom->getChargeMass();
+        cvel = atom->getFlucQVel();
+        
+        kinetic += cmass * cvel * cvel;
+        
+      }
+    }
+    
+#ifdef IS_MPI
+
+    MPI_Allreduce(&kinetic, &kinetic_global, 1, MPI_REALTYPE, MPI_SUM,
+                  MPI_COMM_WORLD);
+    kinetic = kinetic_global;
+
+#endif //is_mpi
+
+    kinetic = kinetic * 0.5 / PhysicalConstants::energyConvert;
+    return ( 2.0 * kinetic) / (info_->getNFluctuatingCharges()* PhysicalConstants::kb );    
   }
 
+
+
+
   RealType Thermo::getVolume() { 
     Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
     return curSnapshot->getVolume();