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

Comparing:
trunk/src/primitives/RigidBody.hpp (file contents), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/primitives/RigidBody.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 54 | Line 54
54   #include "primitives/StuntDouble.hpp"
55   #include "primitives/DirectionalAtom.hpp"
56   #include "types/AtomStamp.hpp"
57 < namespace oopse{
57 > namespace OpenMD{
58    class RigidBody : public StuntDouble {
59    public:
60  
# Line 110 | Line 110 | namespace oopse{
110  
111      void addAtom(Atom* at, AtomStamp* ats);
112  
113 <    /** calculate the reference coordinates */
113 >    /** calculates the reference coordinates */
114      void calcRefCoords();
115  
116 <    /** Convert Atomic forces and torques to total forces and torques */
116 >    /** Converts Atomic forces and torques to total forces and torques */
117      void calcForcesAndTorques();
118  
119 +    /** Converts Atomic forces and torques to total forces and torques and computes the rigid body contribution to the virial.  Returns the rigid body contribution to the virial as a 3x3 matrix. */
120 +    Mat3x3d calcForcesAndTorquesAndVirial();
121 +
122      /** update the positions of atoms belong to this rigidbody */
123      void updateAtoms();
124  
# Line 218 | Line 221 | namespace oopse{
221      std::vector<RotMat3x3d> refOrients_;
222    };
223  
224 < }//namepace oopse
224 > }//namespace OpenMD
225  
226   #endif //PRIMITIVES_RIGIDBODY_HPP
227  

Comparing:
trunk/src/primitives/RigidBody.hpp (property svn:keywords), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/primitives/RigidBody.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