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

Comparing trunk/src/primitives/Bend.cpp (file contents):
Revision 1211 by gezelter, Wed Jan 23 16:38:22 2008 UTC vs.
Revision 1953 by gezelter, Thu Dec 5 18:19:26 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   #include "primitives/Bend.hpp"
46  
47 < namespace oopse {
47 > namespace OpenMD {
48    
49    /**@todo still a lot left to improve*/
50 <  void Bend::calcForce(RealType& angle) {
51 <    Vector3d pos1 = atom1_->getPos();
52 <    Vector3d pos2 = atom2_->getPos();
53 <    Vector3d pos3 = atom3_->getPos();
50 >  void Bend::calcForce(RealType& angle, bool doParticlePot) {
51 >    Vector3d pos1 = atoms_[0]->getPos();
52 >    Vector3d pos2 = atoms_[1]->getPos();
53 >    Vector3d pos3 = atoms_[2]->getPos();
54      
55      Vector3d r21 = pos1 - pos2;
56      RealType d21 = r21.length();
# Line 90 | Line 93 | namespace oopse {
93      Vector3d force2 = force1 + force3;
94      force2 *= -1.0;
95      
96 <    atom1_->addFrc(force1);
97 <    atom2_->addFrc(force2);
98 <    atom3_->addFrc(force3);
99 <    
96 >    atoms_[0]->addFrc(force1);
97 >    atoms_[1]->addFrc(force2);
98 >    atoms_[2]->addFrc(force3);
99 >
100 >    if (doParticlePot) {
101 >      atoms_[0]->addParticlePot(potential_);
102 >      atoms_[1]->addParticlePot(potential_);
103 >      atoms_[2]->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 1211 by gezelter, Wed Jan 23 16:38:22 2008 UTC vs.
Revision 1953 by gezelter, Thu Dec 5 18:19:26 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines