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

Comparing:
trunk/src/primitives/GhostBend.cpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/primitives/GhostBend.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 36 | Line 36
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).                        
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 "primitives/GhostBend.hpp"
# Line 49 | Line 50 | namespace OpenMD {
50      
51      Vector3d pos1 = atom1_->getPos();
52      Vector3d pos2 = ghostAtom->getPos();
53 +
54 +    Vector3d r21 = pos1 - pos2;  
55 +    RealType d21 = r21.length();
56      
57 <    Vector3d r12 = pos1 - pos2;
58 <    RealType d12 = r12.length();
57 >    RealType d21inv = 1.0 / d21;
58 >  
59 >    // we need the transpose of A to get the lab fixed vector:
60 >    Vector3d r23 = ghostAtom->getA().transpose().getColumn(2);
61 >    RealType d23 = r23.length();
62      
63 <    RealType d12inv = 1.0 / d12;
63 >    RealType d23inv = 1.0 / d23;
64      
65 <    Vector3d r32 = ghostAtom->getElectroFrame().getColumn(2);
66 <    RealType d32 = r32.length();
60 <    
61 <    RealType d32inv = 1.0 / d32;
62 <    
63 <    RealType cosTheta = dot(r12, r32) / (d12 * d32);
64 <    
65 >    RealType cosTheta = dot(r21, r23) / (d21 * d23);
66 >
67      //check roundoff    
68      if (cosTheta > 1.0) {
69        cosTheta = 1.0;
# Line 70 | Line 72 | namespace OpenMD {
72      }
73      
74      RealType theta = acos(cosTheta);
75 +
76 +    RealType dVdTheta;
77      
78 <    RealType firstDerivative;
78 >    bendType_->calcForce(theta, potential_, dVdTheta);
79      
76    bendType_->calcForce(theta, potential_, firstDerivative);
77    
80      RealType sinTheta = sqrt(1.0 - cosTheta * cosTheta);
81      
82 <    if (fabs(sinTheta) < 1.0E-12) {
83 <      sinTheta = 1.0E-12;
82 >    if (fabs(sinTheta) < 1.0E-6) {
83 >      sinTheta = 1.0E-6;
84      }
85      
86 <    RealType commonFactor1 = -firstDerivative / sinTheta * d12inv;
87 <    RealType commonFactor2 = -firstDerivative / sinTheta * d32inv;
86 >    RealType commonFactor1 = dVdTheta / sinTheta * d21inv;
87 >    RealType commonFactor2 = dVdTheta / sinTheta * d23inv;
88      
89 <    Vector3d force1 = commonFactor1*(r12*(d12inv*cosTheta) - r32*d32inv);
90 <    Vector3d force3 = commonFactor2*(r32*(d32inv*cosTheta) - r12*d12inv);
89 >    Vector3d force1 = commonFactor1 * (r23 * d23inv - r21*d21inv*cosTheta);
90 >    Vector3d force3 = commonFactor2 * (r21 * d21inv - r23*d23inv*cosTheta);
91 >
92 >    // Total force in current bend is zero
93 >
94      atom1_->addFrc(force1);
95      ghostAtom->addFrc(-force1);
91    /**@todo test correctness */
92    ghostAtom->addTrq(cross(r32, force3) );    
96  
97 +    ghostAtom->addTrq( cross(r23, force3) );    
98 +
99      atom1_->addParticlePot(potential_);
100      ghostAtom->addParticlePot(potential_);
101  
102      angle = theta /M_PI * 180.0;
103 <    
103 >  
104    }  
105   } //end namespace OpenMD
106  

Comparing:
trunk/src/primitives/GhostBend.cpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/primitives/GhostBend.cpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines