--- trunk/src/math/Vector3.hpp 2009/11/25 20:02:06 1390 +++ trunk/src/math/Vector3.hpp 2012/08/22 02:28:28 1782 @@ -36,7 +36,8 @@ * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). - * [4] Vardeman & Gezelter, in progress (2009). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ /** @@ -132,7 +133,7 @@ namespace OpenMD { * @see #vector::dot */ template - Vector3 cross( const Vector3& v1, const Vector3& v2 ) { + inline Vector3 cross( const Vector3& v1, const Vector3& v2 ) { Vector3 result; result.x() = v1.y() * v2.z() - v1.z() * v2.y(); @@ -142,6 +143,19 @@ namespace OpenMD { return result; } + + /** + * Returns the linear indexing for integer vectors. Compare to + * Rapaport's VLinear + * + * @param p first vector + * @param s second vector + */ + template + inline Real Vlinear( const Vector3& p, const Vector3& s ) { + return (p.z() * s.y() + p.y()) * s.x() + p.x(); + } + typedef Vector3 Vector3i; typedef Vector3 Vector3d; @@ -149,8 +163,8 @@ namespace OpenMD { const Vector3d V3Zero(0.0 , 0.0, 0.0); const Vector3d V3X( 1.0, 0.0, 0.0 ) ; const Vector3d V3Y( 0.0, 1.0, 0.0 ) ; - const Vector3d V3Z ( 0.0, 0.0, 1.0 ) ; - + const Vector3d V3Z ( 0.0, 0.0, 1.0 ) ; + } #endif