--- branches/development/src/brains/Thermo.cpp	2012/07/06 22:01:58	1767
+++ branches/development/src/brains/Thermo.cpp	2012/08/29 18:13:11	1787
@@ -372,12 +372,8 @@ namespace OpenMD {
             pCount++;
           }
           
-          MultipoleAdapter ma = MultipoleAdapter(atom->getAtomType());
-          if (ma.isDipole() ) {
-            Vector3d u_i = atom->getElectroFrame().getColumn(2);
-            moment = ma.getDipoleMoment();
-            moment *= debyeToCm;
-            dipoleVector += u_i * moment;
+          if (atom->isDipole()) {
+            dipoleVector += atom->getDipole() * debyeToCm;
           }
         }
       }