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

Comparing:
trunk/src/math/Quaternion.hpp (file contents), Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
branches/development/src/math/Quaternion.hpp (file contents), Revision 1850 by gezelter, Wed Feb 20 15:39:39 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   /**
# Line 48 | Line 49
49  
50   #ifndef MATH_QUATERNION_HPP
51   #define MATH_QUATERNION_HPP
52 + #include "config.h"
53 + #include <cmath>
54  
55   #include "math/Vector3.hpp"
56   #include "math/SquareMatrix.hpp"
57   #define ISZERO(a,eps) ( (a)>-(eps) && (a)<(eps) )
58   const RealType tiny=1.0e-6;    
59  
60 < namespace oopse{
60 > namespace OpenMD{
61  
62    /**
63     * @class Quaternion Quaternion.hpp "math/Quaternion.hpp"
# Line 254 | Line 257 | namespace oopse{
257         return rotation angle from -PI to PI
258      */
259      inline Real get_rotation_angle() const{
260 <      if( w < (Real)0.0 )
260 >      if( w() < (Real)0.0 )
261          return 2.0*atan2(-sqrt( x()*x() + y()*y() + z()*z() ), -w() );
262        else
263          return 2.0*atan2( sqrt( x()*x() + y()*y() + z()*z() ),  w() );
# Line 273 | Line 276 | namespace oopse{
276                                 v.x()*sin_a,
277                                 v.y()*sin_a,
278                                 v.z()*sin_a);
279 +      return *this;
280      }
281      
282      /**
# Line 311 | Line 315 | namespace oopse{
315                                 c.z());
316  
317        this->normalize();    // if "from" or "to" not unit, normalize quat
318 <      w += 1.0f;            // reducing angle to halfangle
319 <      if( w <= 1e-6 ) {     // angle close to PI
318 >      w() += 1.0f;            // reducing angle to halfangle
319 >      if( w() <= 1e-6 ) {     // angle close to PI
320          if( ( from.z()*from.z() ) > ( from.x()*from.x() ) ) {
321 <          this->data_[0] =  w;    
321 >          this->data_[0] =  w();    
322            this->data_[1] =  0.0;       //cross(from , Vector3d(1,0,0))
323            this->data_[2] =  from.z();
324            this->data_[3] = -from.y();
325          } else {
326 <          this->data_[0] =  w;
326 >          this->data_[0] =  w();
327            this->data_[1] =  from.y();  //cross(from, Vector3d(0,0,1))
328            this->data_[2] = -from.x();
329            this->data_[3] =  0.0;

Comparing:
trunk/src/math/Quaternion.hpp (property svn:keywords), Revision 1360 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
branches/development/src/math/Quaternion.hpp (property svn:keywords), Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines