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

Comparing trunk/src/primitives/Inversion.cpp (file contents):
Revision 1303 by cli2, Mon Oct 13 21:35:22 2008 UTC vs.
Revision 1890 by gezelter, Tue Jun 18 21:06:25 2013 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, 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/Inversion.hpp"
43 #include "fstream"
47  
48 < namespace oopse {
48 > namespace OpenMD {
49  
50    Inversion::Inversion(Atom *atom1, Atom *atom2, Atom *atom3,
51                         Atom *atom4, InversionType *it) :
52      atom1_(atom1), atom2_(atom2), atom3_(atom3), atom4_(atom4),
53 <    inversionType_(it) { }
53 >    inversionType_(it) {
54 >    inversionKey_ = inversionType_->getKey();
55 >  }
56    
57 <  void Inversion::calcForce(RealType& angle) {
57 >  void Inversion::calcForce(RealType& angle, bool doParticlePot) {
58      
59 <    // In OOPSE's version of an inversion, the central atom
59 >    // In OpenMD's version of an inversion, the central atom
60      // comes first.  However, to get the planarity in a typical cosine
61      // version of this potential (i.e. Amber-style), the central atom
62      // is treated as atom *3* in a standard torsion form:
# Line 61 | Line 66 | namespace oopse {
66      Vector3d pos3 = atom1_->getPos();
67      Vector3d pos4 = atom4_->getPos();
68  
64   /*std::ofstream myfile;
65   myfile.open("Inversion", std::ios::app);      
66   myfile << atom1_->getType() << " - atom1; "
67              << atom2_->getType() << " - atom2; "
68              << atom3_->getType() << " - atom3; "
69              << atom4_->getType() << " - atom4; "
70              << std::endl;
71 */
69      Vector3d r31 = pos1 - pos3;
70      Vector3d r23 = pos3 - pos2;
71      Vector3d r43 = pos3 - pos4;
# Line 87 | Line 84 | namespace oopse {
84      
85      //  Calculate the sin and cos
86      RealType cos_phi = dot(A, B) ;
87 <    if (cos_phi > 1.0) {cos_phi = 1.0; std::cout << "!!!! cos_phi is bigger than 1.0"
88 <                                                 << std::endl;}
92 <    if (cos_phi < -1.0) {cos_phi = -1.0; std::cout << "!!!! cos_phi is less than -1.0"
93 <                                                   << std::endl;}
94 <    //std::cout << "We actually use this inversion!!!!" << std::endl;
87 >    if (cos_phi > 1.0) cos_phi = 1.0;
88 >    if (cos_phi < -1.0) cos_phi = -1.0;
89  
90      RealType dVdcosPhi;
91 <    //cos_phi = 2.0*cos_phi*cos_phi - 1.0;
92 <    inversionType_->calcForce(cos_phi, potential_, dVdcosPhi);
91 >    switch (inversionKey_) {
92 >    case itCosAngle:
93 >      inversionType_->calcForce(cos_phi, potential_, dVdcosPhi);
94 >      break;
95 >    case itAngle:
96 >      RealType phi = acos(cos_phi);
97 >      RealType dVdPhi;
98 >      inversionType_->calcForce(phi, potential_, dVdPhi);
99 >      RealType sin_phi = sqrt(1.0 - cos_phi * cos_phi);  
100 >      if (fabs(sin_phi) < 1.0E-6) {
101 >        sin_phi = 1.0E-6;
102 >      }
103 >      dVdcosPhi = dVdPhi / sin_phi;
104 >      break;
105 >    }
106 >    
107      Vector3d f1 ;
108      Vector3d f2 ;
109      Vector3d f3 ;
# Line 107 | Line 115 | namespace oopse {
115      f2 = dVdcosPhi * ( cross(r23, dcosdB) - cross(r31, dcosdA));
116      f3 = dVdcosPhi * cross(dcosdB, r43);
117  
118 <    // In OOPSE's version of an improper torsion, the central atom
118 >    // In OpenMD's version of an improper torsion, the central atom
119      // comes first.  However, to get the planarity in a typical cosine
120      // version of this potential (i.e. Amber-style), the central atom
121      // is treated as atom *3* in a standard torsion form:
122  
123      //  AMBER:   I - J - K - L   (e.g. K is sp2 hybridized carbon)
124 <    //  OOPSE:   I - (J - K - L)  (e.g. I is sp2 hybridized carbon)
124 >    //  OpenMD:  I - (J - K - L)  (e.g. I is sp2 hybridized carbon)
125  
126      // Confusing enough?  Good.
127  
# Line 122 | Line 130 | namespace oopse {
130      atom4_->addFrc(-f2);
131      atom3_->addFrc(-f3);
132  
133 +    if (doParticlePot) {
134 +      atom1_->addParticlePot(potential_);
135 +      atom2_->addParticlePot(potential_);
136 +      atom3_->addParticlePot(potential_);
137 +      atom4_->addParticlePot(potential_);
138 +    }
139 +    
140      angle = acos(cos_phi) /M_PI * 180.0;
141    }
142  

Comparing trunk/src/primitives/Inversion.cpp (property svn:keywords):
Revision 1303 by cli2, Mon Oct 13 21:35:22 2008 UTC vs.
Revision 1890 by gezelter, Tue Jun 18 21:06:25 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines