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 1211 by gezelter, Wed Jan 23 16:38:22 2008 UTC vs.
Revision 1446 by gezelter, Thu Jun 17 14:48:02 2010 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #include "primitives/GhostTorsion.hpp"
43  
44 < namespace oopse {
44 > namespace OpenMD {
45    
46    GhostTorsion::GhostTorsion(Atom *atom1, Atom *atom2,  
47                               DirectionalAtom* ghostAtom, TorsionType *tt)
# Line 56 | Line 56 | namespace oopse {
56      
57      Vector3d r21 = pos1 - pos2;
58      Vector3d r32 = pos2 - pos3;
59 <    Vector3d r43 = ghostAtom->getElectroFrame().getColumn(2);
59 >    Vector3d r43 = ghostAtom->getA().getColumn(2);
60      
61      //  Calculate the cross products and distances
62      Vector3d A = cross(r21, r32);
63      RealType rA = A.length();
64      Vector3d B = cross(r32, r43);
65      RealType rB = B.length();
66 <    Vector3d C = cross(r32, A);
67 <    RealType rC = C.length();
66 >
67 >    /*
68 >       If either of the two cross product vectors is tiny, that means
69 >       the three atoms involved are colinear, and the torsion angle is
70 >       going to be undefined.  The easiest check for this problem is
71 >       to use the product of the two lengths.
72 >    */
73 >    if (rA * rB < OpenMD::epsilon) return;
74      
75      A.normalize();
76      B.normalize();
71    C.normalize();
77      
78      //  Calculate the sin and cos
79      RealType cos_phi = dot(A, B) ;
# Line 91 | Line 96 | namespace oopse {
96      f3.negate();
97      ghostAtom->addTrq(cross(r43, f3));    
98      
99 +    atom1_->addParticlePot(potential_);
100 +    atom2_->addParticlePot(potential_);
101 +    ghostAtom->addParticlePot(potential_);
102 +
103      angle = acos(cos_phi) /M_PI * 180.0;
104    }
105   }

Comparing trunk/src/primitives/GhostTorsion.cpp (property svn:keywords):
Revision 1211 by gezelter, Wed Jan 23 16:38:22 2008 UTC vs.
Revision 1446 by gezelter, Thu Jun 17 14:48:02 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines