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

Comparing:
trunk/src/primitives/Bend.hpp (file contents), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/primitives/Bend.hpp (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 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   /**
# Line 51 | Line 51
51   #define PRIMITIVES_BEND_HPP
52   #include "primitives/Atom.hpp"
53   #include "types/BendType.hpp"
54 < namespace oopse {
55 < struct BendData {
54 > namespace OpenMD {
55 >  struct BendData {
56      RealType angle;
57      RealType potential;
58 < };
59 <
60 < struct BendDataSet {
58 >  };
59 >  
60 >  struct BendDataSet {
61      RealType deltaV;
62      BendData prev;
63      BendData curr;
64 < };
65 <
64 >  };
65 >  
66    class Bend {
67    public:
68      Bend(Atom* atom1, Atom* atom2, Atom* atom3, BendType* bt)
69        : atom1_(atom1), atom2_(atom2), atom3_(atom3), bendType_(bt) {}
70 <
70 >    
71      virtual ~Bend() {}
72      virtual void calcForce(RealType& angle);
73 <        
73 >    
74      RealType getPotential() {
75        return potential_;
76      }
77 <
77 >    
78      Atom* getAtomA() {
79        return atom1_;
80      }
81 <
81 >    
82      Atom* getAtomB() {
83        return atom2_;
84      }
85 <
85 >    
86      Atom* getAtomC() {
87        return atom3_;
88      }
89 <
89 >    
90      BendType * getBendType() {
91        return bendType_;
92      }
93 <
93 >    
94    protected:
95 <        
95 >    
96      RealType potential_;
97      Atom* atom1_;
98      Atom* atom2_;
99      Atom* atom3_;
100      BendType* bendType_; /**< bend type */
101 <
101 >    
102    };    
103 <
104 <
105 <
106 < } //end namespace oopse
103 > } //end namespace OpenMD
104   #endif //PRIMITIVES_BEND_HPP
105  

Comparing:
trunk/src/primitives/Bend.hpp (property svn:keywords), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/primitives/Bend.hpp (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines