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

Comparing branches/development/src/visitors/LipidTransVisitor.cpp (file contents):
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
Revision 1787 by gezelter, Wed Aug 29 18:13:11 2012 UTC

# Line 41 | Line 41
41   */
42  
43   #include "visitors/LipidTransVisitor.hpp"
44 + #include "types/MultipoleAdapter.hpp"
45   #include "utils/simError.h"
46  
47   namespace OpenMD {
# Line 90 | Line 91 | namespace OpenMD {
91      origin_ = originDatom_->getPos();
92      Vector3d v1 =  ref - origin_;
93      info_->getSnapshotManager()->getCurrentSnapshot()->wrapVector(v1);
94 <    Vector3d zaxis = originDatom_->getElectroFrame().getColumn(2);
94 >
95 >    MultipoleAdapter ma = MultipoleAdapter(originDatom_->getAtomType());
96 >    Vector3d zaxis;
97 >    if (ma.isDipole() ) {
98 >      zaxis = originDatom_->getDipole();
99 >    } else {
100 >      zaxis = originDatom_->getA().transpose()*V3Z;
101 >    }
102 >
103      Vector3d xaxis = cross(v1, zaxis);
104      Vector3d yaxis = cross(zaxis, xaxis);
105  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines