--- trunk/src/math/Triangle.hpp 2008/11/14 15:44:34 1316 +++ trunk/src/math/Triangle.hpp 2009/05/13 22:27:29 1344 @@ -44,7 +44,7 @@ * * Created by Charles F. Vardeman II on 29 July 2008. * @author Charles F. Vardeman II - * @version $Id: Triangle.hpp,v 1.3 2008-11-14 15:44:34 chuckv Exp $ + * @version $Id: Triangle.hpp,v 1.5 2009-05-13 22:27:29 gezelter Exp $ * */ @@ -53,6 +53,7 @@ #define MATH_FACET_HPP #include "math/Vector3.hpp" +#include "math/SquareMatrix3.hpp" #include "config.h" #include "primitives/StuntDouble.hpp" @@ -176,12 +177,16 @@ namespace oopse { RealType t2 = -a1 + b1 + c1; RealType t3 = a1 - b1 + c1; RealType t4 = a1 + b1 - c1; + RealType junk = t1*t2*t3*t4; return a1 * b1 * c1 / sqrt(t1 * t2 * t3 * t4); } + Mat3x3d computeHydrodynamicTensor(RealType viscosity); private: + Mat3x3d hydro_tensor(const Vector3d& ri, const Vector3d& rj0, const Vector3d& rj1, const Vector3d& rj2,RealType s, RealType viscosity); + /* Local Indentity of vertex atoms in pos array*/ std::vector vertexSD_; Vector3d normal_;