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

Comparing trunk/src/primitives/Bond.hpp (file contents):
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 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   /**
# Line 53 | Line 53
53   #include "primitives/Atom.hpp"
54   #include "types/BondType.hpp"
55  
56 < namespace oopse {
57 <
56 > namespace OpenMD {
57 >  
58    class Bond {
59    public:
60 <    Bond(Atom* atom1, Atom* atom2, BondType* bt) : atom1_(atom1), atom2_(atom2), bondType_(bt) {}
60 >    Bond(Atom* atom1, Atom* atom2, BondType* bt) : atom1_(atom1),
61 >                                                   atom2_(atom2),
62 >                                                   bondType_(bt) {}
63      virtual ~Bond() {}
64      void calcForce() {
65        RealType len;
66        RealType dvdr;
67        Vector3d r12;
68        Vector3d force;
69 <
69 >      
70        r12 = atom2_->getPos() - atom1_->getPos();
71        len = r12.length();            
72        bondType_->calcForce(len,  potential_, dvdr);
73 <
73 >      
74        force = r12 * (-dvdr / len);
75 <            
75 >
76        atom1_->addFrc(-force);
77        atom2_->addFrc(force);
78 +    
79 +      atom1_->addParticlePot(potential_);
80 +      atom2_->addParticlePot(potential_);
81      }
82 <        
82 >    
83      RealType getPotential() {
84        return potential_;
85      }
86 <
86 >    
87      Atom* getAtomA() {
88        return atom1_;
89      }
90 <
90 >    
91      Atom* getAtomB() {
92        return atom2_;
93      }
94 <
94 >    
95      BondType* getBondType() {
96        return bondType_;
97      }
98 <        
98 >    
99    private:
100      RealType potential_;
101      Atom* atom1_;
102      Atom* atom2_;        
103      BondType* bondType_; /**< bond type */
104 <
104 >    
105    };    
106 <
102 <
103 <
104 < } //end namespace oopse
106 > } //end namespace OpenMD
107   #endif //PRIMITIVES_BOND_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines