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

Comparing:
trunk/src/restraints/MolecularRestraint.cpp (file contents), Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
branches/development/src/restraints/MolecularRestraint.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 "restraints/MolecularRestraint.hpp"
# Line 46 | Line 47
47  
48   //using namespace JAMA;
49  
50 < namespace oopse {
50 > namespace OpenMD {
51  
52 +
53    void MolecularRestraint::calcForce(std::vector<Vector3d> struc,
54                                       Vector3d molCom){
55  
# Line 84 | Line 86 | namespace oopse {
86        
87        Mat3x3d R(0.0);
88        
89 <      for (int n = 0; n < struc.size(); n++){
89 >      for (unsigned int n = 0; n < struc.size(); n++){
90  
91          /*
92           * correlation matrix R:  
# Line 136 | Line 138 | namespace oopse {
138        Vector3d eularAngles = A.toEulerAngles();
139  
140  
141 <      RealType twistAngle, swingAngle;
141 >      RealType twistAngle;
142        Vector3d swingAxis;
143  
144        Quat4d quat = A.toQuaternion();  
145  
146 <      quat.getTwistSwingAxisAngle(twistAngle, swingAngle, swingAxis);
146 >      RealType swingX, swingY;
147 >      quat.toSwingTwist(swingX, swingY, twistAngle);
148  
149 <      RealType tw, sx, sy, ttw, swingX, swingY;
150 <      quat.toTwistSwing(tw, sx, sy);
148 <      quat.toSwingTwist(swingX, swingY, ttw);
149 <
150 <      // std::cerr << eularAngles << "\t[" << twistAngle << "," << swingAngle <<
151 <      // "]\t[" << tw << "," << sx << "," << sy << "]\t[" << ttw <<
152 <      // "," << ssx << "," << ssy << "]" << std::endl;
153 <
154 <      RealType dVdtwist, dVdswing, dVdswingX, dVdswingY;
155 <      RealType dTwist, dSwing, dSwingX, dSwingY;
149 >      RealType dVdtwist, dVdswingX, dVdswingY;
150 >      RealType dTwist, dSwingX, dSwingY;
151        RealType p;
152  
153        if (restType_ & rtTwist){
# Line 195 | Line 190 | namespace oopse {
190        
191        Vector3d rLab, rBody, txr, fBody, fLab;
192  
193 <      for (int i = 0; i < struc.size(); i++) {
193 >      for (unsigned int i = 0; i < struc.size(); i++) {
194                    
195          rLab = struc[i];        
196          rBody = A * rLab;

Comparing:
trunk/src/restraints/MolecularRestraint.cpp (property svn:keywords), Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
branches/development/src/restraints/MolecularRestraint.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