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

Comparing trunk/src/math/Triangle.hpp (file contents):
Revision 1316 by chuckv, Fri Nov 14 15:44:34 2008 UTC vs.
Revision 1344 by gezelter, Wed May 13 22:27:29 2009 UTC

# Line 44 | Line 44
44   *
45   *  Created by Charles F. Vardeman II on 29 July 2008.
46   *  @author  Charles F. Vardeman II
47 < *  @version $Id: Triangle.hpp,v 1.3 2008-11-14 15:44:34 chuckv Exp $
47 > *  @version $Id: Triangle.hpp,v 1.5 2009-05-13 22:27:29 gezelter Exp $
48   *
49   */
50  
# Line 53 | Line 53
53   #define MATH_FACET_HPP
54  
55   #include "math/Vector3.hpp"
56 + #include "math/SquareMatrix3.hpp"
57   #include "config.h"
58   #include "primitives/StuntDouble.hpp"
59  
# Line 176 | Line 177 | namespace oopse {
177        RealType t2 = -a1 + b1 + c1;
178        RealType t3 =  a1 - b1 + c1;
179        RealType t4 =  a1 + b1 - c1;
180 +      RealType junk = t1*t2*t3*t4;
181        return a1 * b1 * c1 / sqrt(t1 * t2 * t3 * t4);
182      }
183        
184 +    Mat3x3d computeHydrodynamicTensor(RealType viscosity);
185  
186  
187    private:
188 +    Mat3x3d hydro_tensor(const Vector3d& ri, const Vector3d& rj0, const Vector3d& rj1, const Vector3d& rj2,RealType s, RealType viscosity);
189 +    
190      /* Local Indentity of vertex atoms in pos array*/
191      std::vector <StuntDouble*> vertexSD_;
192      Vector3d normal_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines