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

Comparing trunk/src/restraints/ObjectRestraint.cpp (file contents):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 2024 by gezelter, Thu Oct 16 19:13:51 2014 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 "restraints/ObjectRestraint.hpp"
# Line 46 | Line 47 | namespace OpenMD {
47    void ObjectRestraint::calcForce(Vector3d struc) {
48  
49      pot_ = 0.0;
49    
50      if (restType_ & rtDisplacement) {
51        Vector3d del = struc - refPos_;
52 <      RealType r = del.length();  
52 >      RealType r = del.length();
53        Vector3d frc = -kDisp_ * del;
54        RealType p = 0.5 * kDisp_ * del.lengthSquare();
55 <      pot_ += p;
55 >
56 >      pot_ = p;
57        force_ = frc * scaleFactor_;
58 <      restInfo_[rtDisplacement] = std::make_pair(r,p);
58 >      if (printRest_) restInfo_[rtDisplacement] = std::make_pair(r,p);
59      }
60    }
61      
# Line 69 | Line 70 | namespace OpenMD {
70        
71        RotMat3x3d temp = A * refA_.transpose();
72  
73 +      Vector3d euler = temp.toEulerAngles();
74 +
75        Quat4d quat = temp.toQuaternion();
76  
77 <      RealType twistAngle, swingAngle;
77 >      RealType twistAngle;
78        Vector3d swingAxis;
79 <      RealType tw, swingX, swingY;
79 >      RealType swingX, swingY;
80        
81 <      quat.getTwistSwingAxisAngle(twistAngle, swingAngle, swingAxis);
82 <      quat.toSwingTwist(tw, swingX, swingY);
83 <      
81 <      RealType dVdtwist, dVdswingX, dVdswingY;
82 <      RealType dTwist, dSwingX, dSwingY;
81 >      quat.toSwingTwist(swingX, swingY, twistAngle);
82 >
83 >
84        RealType p;
85        Vector3d tTwist, tSwing;
86  
87        if (restType_ & rtTwist){
88 <        dTwist = twistAngle - twist0_;
89 <        dVdtwist = kTwist_ * sin(dTwist);
90 <        p = kTwist_ * (1.0 - cos(dTwist) );
88 >        RealType dTwist = twistAngle - twist0_;      
89 >        /// RealType dVdtwist = kTwist_ * sin(dTwist);
90 >        /// p = kTwist_ * (1.0 - cos(dTwist) );
91 >        RealType dVdtwist = kTwist_ * dTwist;
92 >        p = 0.5 * kTwist_ * dTwist * dTwist;
93          pot_ += p;
94          tBody -= dVdtwist * V3Z;
95 <        restInfo_[rtTwist] = std::make_pair(twistAngle, p);
95 >        if (printRest_) restInfo_[rtTwist] = std::make_pair(twistAngle, p);
96        }
97  
98        if (restType_ & rtSwingX){
99 <        dSwingX = swingX - swingX0_;
100 <        dVdswingX = kSwingX_ * 0.5 * sin(2.0 * dSwingX);
101 <        p = 0.25 * kSwingX_ * (1.0 - cos(2.0 * dSwingX));
99 >        RealType dSwingX = swingX - swingX0_;
100 >        /// RealType dVdswingX = kSwingX_ * 0.5 * sin(2.0 * dSwingX);
101 >        /// p = 0.25 * kSwingX_ * (1.0 - cos(2.0 * dSwingX));
102 >        RealType dVdswingX = kSwingX_ * dSwingX;        
103 >        p = 0.5 * kSwingX_ * dSwingX * dSwingX;
104          pot_ += p;
105          tBody -= dVdswingX * V3X;
106 <        restInfo_[rtSwingX] = std::make_pair(swingX, p);
106 >        if (printRest_) restInfo_[rtSwingX] = std::make_pair(swingX, p);
107        }
108  
109        if (restType_ & rtSwingY){
110 <        dSwingY = swingY - swingY0_;
111 <        dVdswingY = kSwingY_ * 0.5 * sin(2.0 * dSwingY);
112 <        p = 0.25 * kSwingY_ * (1.0 - cos(2.0 * dSwingY));
110 >        RealType dSwingY = swingY - swingY0_;
111 >        /// RealType dVdswingY = kSwingY_ * 0.5 * sin(2.0 * dSwingY);
112 >        /// p = 0.25 * kSwingY_ * (1.0 - cos(2.0 * dSwingY));
113 >        RealType dVdswingY = kSwingY_ * dSwingY;        
114 >        p = 0.5 * kSwingX_ * dSwingY * dSwingY;
115          pot_ += p;
116          tBody -= dVdswingY * V3Y;
117 <        restInfo_[rtSwingY] = std::make_pair(swingY, p);
117 >        if (printRest_) restInfo_[rtSwingY] = std::make_pair(swingY, p);
118        }
119  
120        Vector3d tLab = A.transpose() * tBody;      

Comparing trunk/src/restraints/ObjectRestraint.cpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 2024 by gezelter, Thu Oct 16 19:13:51 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines