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

Comparing trunk/src/math/Vector3.hpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 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 54 | Line 55
55  
56   #include "Vector.hpp"
57  
58 < namespace oopse {
58 > namespace OpenMD {
59    
60    /**
61     * @class Vector3 Vector3.hpp "math/Vector3.hpp"
# Line 87 | Line 88 | namespace oopse {
88      }
89      
90      /**
91 <     * Retunrs reference of the first element of Vector3.
91 >     * Returns reference of the first element of Vector3.
92       * @return reference of the first element of Vector3
93       */
94      inline Real& x() {  return this->data_[0];}
95      
96      /**
97 <     * Retunrs the first element of Vector3.
97 >     * Returns the first element of Vector3.
98       * @return  the first element of Vector3
99       */
100      inline Real x() const {  return this->data_[0];}
101      
102      /**
103 <     * Retunrs reference of the second element of Vector3.
103 >     * Returns reference of the second element of Vector3.
104       * @return reference of the second element of Vector3
105       */
106      inline Real& y() {  return this->data_[1];}
107      
108      /**
109 <     * Retunrs  the second element of Vector3.
109 >     * Returns  the second element of Vector3.
110       * @return c the second element of Vector3
111       */
112      inline Real y() const {  return this->data_[1];}
113      
114      /**
115 <     * Retunrs reference of the third element of Vector3.
115 >     * Returns reference of the third element of Vector3.
116       * @return reference of the third element of Vector3
117       */
118      inline Real& z() {  return this->data_[2];}
119      
120      /**
121 <     * Retunrs  the third element of Vector3.
121 >     * Returns  the third element of Vector3.
122       * @return f the third element of Vector3
123       */
124      inline Real z() const {  return this->data_[2];}
# Line 129 | Line 130 | namespace oopse {
130     * @param v1 first vector
131     * @param v2 second vector
132     * @return the cross product  of v1 and v2
132   * @see #vector::dot
133     */
134    template<typename Real>
135 <  Vector3<Real> cross( const Vector3<Real>& v1, const Vector3<Real>& v2 ) {
135 >  inline Vector3<Real> cross( const Vector3<Real>& v1, const Vector3<Real>& v2 ) {
136      Vector3<Real> result;
137      
138      result.x() = v1.y() * v2.z() - v1.z() * v2.y();
# Line 142 | Line 142 | namespace oopse {
142      return result;
143    }
144  
145 +
146 +  /**
147 +   * Returns the linear indexing for integer vectors. Compare to
148 +   * Rapaport's VLinear
149 +   *
150 +   * @param p first vector
151 +   * @param s second vector
152 +   */
153 +  template<typename Real>
154 +  inline Real Vlinear( const Vector3<Real>& p, const Vector3<Real>& s ) {
155 +    return (p.z() * s.y() + p.y()) * s.x() + p.x();
156 +  }
157 +
158    typedef Vector3<int> Vector3i;
159    
160 <  typedef Vector3<double> Vector3d;    
160 >  typedef Vector3<RealType> Vector3d;    
161  
162    const Vector3d V3Zero(0.0 , 0.0, 0.0);
163    const Vector3d V3X( 1.0, 0.0, 0.0 ) ;
164    const Vector3d V3Y( 0.0, 1.0, 0.0 ) ;
165 <  const Vector3d V3Z ( 0.0, 0.0, 1.0 ) ;    
166 <  
165 >  const Vector3d V3Z ( 0.0, 0.0, 1.0 ) ;
166 >
167   }
168  
169   #endif

Comparing trunk/src/math/Vector3.hpp (property svn:keywords):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines