ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/primitives/GhostTorsion.cpp
(Generate patch)

Comparing trunk/src/primitives/GhostTorsion.cpp (file contents):
Revision 1446 by gezelter, Thu Jun 17 14:48:02 2010 UTC vs.
Revision 1953 by gezelter, Thu Dec 5 18:19:26 2013 UTC

# Line 35 | Line 35
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]  Vardeman & Gezelter, in progress (2009).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (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 "config.h"
44 + #include <cmath>
45 +
46   #include "primitives/GhostTorsion.hpp"
47  
48   namespace OpenMD {
# Line 47 | Line 51 | namespace OpenMD {
51                               DirectionalAtom* ghostAtom, TorsionType *tt)
52      : Torsion(atom1, atom2, ghostAtom, ghostAtom, tt) {}
53    
54 <  void GhostTorsion::calcForce(RealType& angle) {
55 <    DirectionalAtom* ghostAtom = static_cast<DirectionalAtom*>(atom3_);    
54 >  void GhostTorsion::calcForce(RealType& angle, bool doParticlePot) {
55 >    DirectionalAtom* ghostAtom = static_cast<DirectionalAtom*>(atoms_[2]);    
56      
57 <    Vector3d pos1 = atom1_->getPos();
58 <    Vector3d pos2 = atom2_->getPos();
57 >    Vector3d pos1 = atoms_[0]->getPos();
58 >    Vector3d pos2 = atoms_[1]->getPos();
59      Vector3d pos3 = ghostAtom->getPos();
60      
61      Vector3d r21 = pos1 - pos2;
62      Vector3d r32 = pos2 - pos3;
63 <    Vector3d r43 = ghostAtom->getA().getColumn(2);
63 >    Vector3d r43 = ghostAtom->getA().transpose().getColumn(2);
64      
65      //  Calculate the cross products and distances
66      Vector3d A = cross(r21, r32);
# Line 88 | Line 92 | namespace OpenMD {
92      Vector3d f2 = dVdcosPhi * ( cross(r43, dcosdB) - cross(r21, dcosdA));
93      Vector3d f3 = dVdcosPhi * cross(dcosdB, r32);
94      
95 <    atom1_->addFrc(f1);
96 <    atom2_->addFrc(f2 - f1);
95 >    atoms_[0]->addFrc(f1);
96 >    atoms_[1]->addFrc(f2 - f1);
97      
98      ghostAtom->addFrc(-f2);
99      
100      f3.negate();
101      ghostAtom->addTrq(cross(r43, f3));    
102      
103 <    atom1_->addParticlePot(potential_);
104 <    atom2_->addParticlePot(potential_);
105 <    ghostAtom->addParticlePot(potential_);
103 >    if (doParticlePot) {
104 >      atoms_[0]->addParticlePot(potential_);
105 >      atoms_[1]->addParticlePot(potential_);
106 >      ghostAtom->addParticlePot(potential_);
107 >    }
108  
109      angle = acos(cos_phi) /M_PI * 180.0;
110    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines