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 1709 by gezelter, Tue May 15 13:04:08 2012 UTC vs.
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

# Line 51 | Line 51
51   #include "primitives/Molecule.hpp"
52   #include "utils/simError.h"
53   #include "utils/PhysicalConstants.hpp"
54 + #include "types/MultipoleAdapter.hpp"
55  
56   namespace OpenMD {
57  
# Line 364 | Line 365 | namespace OpenMD {
365            }
366          }
367          
368 <        if (atom->isDipole() ) {
368 >        MultipoleAdapter ma = MultipoleAdapter(atom->getAtomType());
369 >        if (ma.isDipole() ) {
370            Vector3d u_i = atom->getElectroFrame().getColumn(2);
371 <          GenericData* data = dynamic_cast<DirectionalAtomType*>(atom->getAtomType())->getPropertyByName("Dipole");
372 <          if (data != NULL) {
373 <            moment = (dynamic_cast<DoubleGenericData*>(data))->getData();
372 <            
373 <            moment *= debyeToCm;
374 <            dipoleVector += u_i * moment;
375 <          }
371 >          moment = ma.getDipoleMoment();
372 >          moment *= debyeToCm;
373 >          dipoleVector += u_i * moment;
374          }
375        }
376      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines