ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/Thermo.cpp
(Generate patch)

Comparing branches/development/src/brains/Thermo.cpp (file contents):
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC vs.
Revision 1787 by gezelter, Wed Aug 29 18:13:11 2012 UTC

# Line 372 | Line 372 | namespace OpenMD {
372              pCount++;
373            }
374            
375 <          MultipoleAdapter ma = MultipoleAdapter(atom->getAtomType());
376 <          if (ma.isDipole() ) {
377 <            Vector3d u_i = atom->getElectroFrame().getColumn(2);
378 <            moment = ma.getDipoleMoment();
379 <            moment *= debyeToCm;
380 <            dipoleVector += u_i * moment;
375 >          if (atom->isDipole()) {
376 >            dipoleVector += atom->getDipole() * debyeToCm;
377            }
378          }
379        }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines