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

Comparing:
trunk/src/visitors/LipidTransVisitor.cpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/visitors/LipidTransVisitor.cpp (file contents), Revision 1787 by gezelter, Wed Aug 29 18:13:11 2012 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "visitors/LipidTransVisitor.hpp"
44 + #include "types/MultipoleAdapter.hpp"
45   #include "utils/simError.h"
46  
47 < namespace oopse {
47 > namespace OpenMD {
48    LipidTransVisitor::LipidTransVisitor(SimInfo* info, const std::string& originSeleScript, const std::string& refSeleScript)
49      : BaseVisitor(), info_(info), originEvaluator_(info), originSeleMan_(info), refEvaluator_(info), refSeleMan_(info), refSd_(NULL) {
50  
# Line 89 | Line 91 | namespace oopse {
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  
# Line 127 | Line 137 | namespace oopse {
137        Vector3d tmp= atomInfo->pos - origin_;
138        currSnapshot->wrapVector(tmp);
139        atomInfo->pos = rotMat_ * tmp;;
140 <      atomInfo->dipole = rotMat_ * atomInfo->dipole;
140 >      atomInfo->vec = rotMat_ * atomInfo->vec;
141      }
142    }
143  

Comparing:
trunk/src/visitors/LipidTransVisitor.cpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/visitors/LipidTransVisitor.cpp (property svn:keywords), Revision 1787 by gezelter, Wed Aug 29 18:13:11 2012 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines