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

Comparing:
trunk/src/primitives/Bend.cpp (file contents), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/primitives/Bend.cpp (file contents), Revision 1767 by gezelter, Fri Jul 6 22:01:58 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 "config.h"
44 + #include <cmath>
45   #include "primitives/Bend.hpp"
46  
47 < namespace oopse {
48 <
47 > namespace OpenMD {
48 >  
49    /**@todo still a lot left to improve*/
50 <  void Bend::calcForce(RealType& angle) {
50 >  void Bend::calcForce(RealType& angle, bool doParticlePot) {
51      Vector3d pos1 = atom1_->getPos();
52      Vector3d pos2 = atom2_->getPos();
53      Vector3d pos3 = atom3_->getPos();
54 <
54 >    
55      Vector3d r21 = pos1 - pos2;
56      RealType d21 = r21.length();
57 <
57 >    
58      RealType d21inv = 1.0 / d21;
59 <
59 >    
60      Vector3d r23 = pos3 - pos2;
61      RealType d23 = r23.length();
62 <
62 >    
63      RealType d23inv = 1.0 / d23;
64 <
64 >    
65      RealType cosTheta = dot(r21, r23) / (d21 * d23);
66 <
66 >    
67      //check roundoff    
68      if (cosTheta > 1.0) {
69        cosTheta = 1.0;
70      } else if (cosTheta < -1.0) {
71        cosTheta = -1.0;
72      }
73 <
73 >    
74      RealType theta = acos(cosTheta);
75 <
75 >    
76      RealType dVdTheta;
77  
78      bendType_->calcForce(theta, potential_, dVdTheta);
79 <    //std::cout << atom1_->getType() << "\t" << atom2_->getType() << "\t" << atom3_->getType() << "\t";
77 <    //std::cout << "theta = " << theta/M_PI * 180.0 <<", potential = " << potential_ << std::endl;
78 <
79 >    
80      RealType sinTheta = sqrt(1.0 - cosTheta * cosTheta);
81 <
81 >    
82      if (fabs(sinTheta) < 1.0E-6) {
83        sinTheta = 1.0E-6;
84      }
85 <
85 >    
86      RealType commonFactor1 = dVdTheta / sinTheta * d21inv;
87      RealType commonFactor2 = dVdTheta / sinTheta * d23inv;
88 <
88 >    
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
92 >    // Total force in current bend is zero
93      Vector3d force2 = force1 + force3;
94      force2 *= -1.0;
95 <
95 >    
96      atom1_->addFrc(force1);
97      atom2_->addFrc(force2);
98      atom3_->addFrc(force3);
99  
100 +    if (doParticlePot) {
101 +      atom1_->addParticlePot(potential_);
102 +      atom2_->addParticlePot(potential_);
103 +      atom3_->addParticlePot(potential_);
104 +    }
105 +  
106      angle = theta /M_PI * 180.0;
107    }
108  
109 < } //end namespace oopse
109 > } //end namespace OpenMD

Comparing:
trunk/src/primitives/Bend.cpp (property svn:keywords), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/primitives/Bend.cpp (property svn:keywords), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines