--- branches/new_design/OOPSE-3.0/src/brains/Thermo.cpp 2004/12/13 22:30:27 1883 +++ branches/new_design/OOPSE-3.0/src/brains/Thermo.cpp 2005/01/04 22:18:36 1901 @@ -71,14 +71,9 @@ double Thermo::getPotential() { double Thermo::getPotential() { double potential = 0.0; Snapshot* curSnapshot = info_->getSnapshotManager()->getCurrentSnapshot(); - double potential_local = curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL]; + double potential_local = curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] + + curSnapshot->statData[Stats::SHORT_RANGE_POTENTIAL] ; - SimInfo::MoleculeIterator i; - Molecule* mol; - for (mol = info_->beginMolecule(i); mol != NULL; mol = info_->nextMolecule(i)) { - potential_local += mol->getPotential(); - } - // Get total potential for entire system from MPI. #ifdef IS_MPI