diff --git a/MeshLib/Elements/HexRule8.cpp b/MeshLib/Elements/HexRule8.cpp index fa70fcd19add01131db03a17f82ced3505484e62..3ace9f859b73f6d7cb373d0ead00549e077b5c90 100644 --- a/MeshLib/Elements/HexRule8.cpp +++ b/MeshLib/Elements/HexRule8.cpp @@ -70,14 +70,22 @@ double HexRule8::computeVolume(Node const* const* _nodes) + MathLib::calcTetrahedronVolume(*_nodes[3], *_nodes[7], *_nodes[5], *_nodes[2]); } -bool HexRule8::isPntInElement(Node const* const* _nodes, MathLib::Point3d const& pnt, double eps) +bool HexRule8::isPntInElement(Node const* const* nodes, + MathLib::Point3d const& pnt, + double eps) { - return (MathLib::isPointInTetrahedron(pnt, *_nodes[4], *_nodes[7], *_nodes[5], *_nodes[0], eps) || - MathLib::isPointInTetrahedron(pnt, *_nodes[5], *_nodes[3], *_nodes[1], *_nodes[0], eps) || - MathLib::isPointInTetrahedron(pnt, *_nodes[5], *_nodes[7], *_nodes[3], *_nodes[0], eps) || - MathLib::isPointInTetrahedron(pnt, *_nodes[5], *_nodes[7], *_nodes[6], *_nodes[2], eps) || - MathLib::isPointInTetrahedron(pnt, *_nodes[1], *_nodes[3], *_nodes[5], *_nodes[2], eps) || - MathLib::isPointInTetrahedron(pnt, *_nodes[3], *_nodes[7], *_nodes[5], *_nodes[2], eps)); + return (MathLib::isPointInTetrahedron( + pnt, *nodes[4], *nodes[7], *nodes[5], *nodes[0], eps) || + MathLib::isPointInTetrahedron( + pnt, *nodes[5], *nodes[3], *nodes[1], *nodes[0], eps) || + MathLib::isPointInTetrahedron( + pnt, *nodes[5], *nodes[7], *nodes[3], *nodes[0], eps) || + MathLib::isPointInTetrahedron( + pnt, *nodes[5], *nodes[7], *nodes[6], *nodes[2], eps) || + MathLib::isPointInTetrahedron( + pnt, *nodes[1], *nodes[3], *nodes[5], *nodes[2], eps) || + MathLib::isPointInTetrahedron( + pnt, *nodes[3], *nodes[7], *nodes[5], *nodes[2], eps)); } unsigned HexRule8::identifyFace(Node const* const* _nodes, Node* nodes[3]) diff --git a/MeshLib/Elements/LineRule2.cpp b/MeshLib/Elements/LineRule2.cpp index c907b2110b66c9c7d6b5fd8c6c85f98457351a17..6f94d41fe633fd705ae4d2e7a65af60ccf419856 100644 --- a/MeshLib/Elements/LineRule2.cpp +++ b/MeshLib/Elements/LineRule2.cpp @@ -25,11 +25,14 @@ double LineRule2::computeVolume(Node const* const* _nodes) return sqrt(MathLib::sqrDist(_nodes[0]->getCoords(), _nodes[1]->getCoords())); } -bool LineRule2::isPntInElement(Node const* const* _nodes, MathLib::Point3d const& pnt, double eps) +bool LineRule2::isPntInElement(Node const* const* nodes, + MathLib::Point3d const& pnt, double eps) { double tmp; double tmp_dst(0); - double const dist =MathLib::calcProjPntToLineAndDists(pnt.getCoords(), _nodes[0]->getCoords(), _nodes[1]->getCoords(), tmp, tmp_dst); + double const dist = MathLib::calcProjPntToLineAndDists( + pnt.getCoords(), nodes[0]->getCoords(), nodes[1]->getCoords(), tmp, + tmp_dst); return (dist < eps); } diff --git a/MeshLib/Elements/PointRule1.cpp b/MeshLib/Elements/PointRule1.cpp index 15a69671c5ce6fbaf62ae78ce9546a0c6f0264bb..9b10b9b763667421351871c4c1e69b7dd4650da6 100644 --- a/MeshLib/Elements/PointRule1.cpp +++ b/MeshLib/Elements/PointRule1.cpp @@ -24,9 +24,10 @@ double PointRule1::computeVolume(Node const* const* /*_nodes*/) return 0; } -bool PointRule1::isPntInElement(Node const* const* _nodes, MathLib::Point3d const& pnt, double eps) +bool PointRule1::isPntInElement(Node const* const* nodes, + MathLib::Point3d const& pnt, double eps) { - double const dist = MathLib::sqrDist(*_nodes[0], pnt); + double const dist = MathLib::sqrDist(*nodes[0], pnt); return (dist < eps); } diff --git a/MeshLib/Elements/PrismRule6.cpp b/MeshLib/Elements/PrismRule6.cpp index 3c4821a3b1244998c3eef0f84a5de784a7dad1c4..c0c2ea0e984fbbe7c547dbcdbe6371302e3e4327 100644 --- a/MeshLib/Elements/PrismRule6.cpp +++ b/MeshLib/Elements/PrismRule6.cpp @@ -68,11 +68,16 @@ double PrismRule6::computeVolume(Node const* const* _nodes) + MathLib::calcTetrahedronVolume(*_nodes[2], *_nodes[4], *_nodes[5], *_nodes[3]); } -bool PrismRule6::isPntInElement(Node const* const* _nodes, MathLib::Point3d const& pnt, double eps) +bool PrismRule6::isPntInElement(Node const* const* nodes, + MathLib::Point3d const& pnt, + double eps) { - return (MathLib::isPointInTetrahedron(pnt, *_nodes[0], *_nodes[1], *_nodes[2], *_nodes[3], eps) || - MathLib::isPointInTetrahedron(pnt, *_nodes[1], *_nodes[4], *_nodes[2], *_nodes[3], eps) || - MathLib::isPointInTetrahedron(pnt, *_nodes[2], *_nodes[4], *_nodes[5], *_nodes[3], eps)); + return (MathLib::isPointInTetrahedron( + pnt, *nodes[0], *nodes[1], *nodes[2], *nodes[3], eps) || + MathLib::isPointInTetrahedron( + pnt, *nodes[1], *nodes[4], *nodes[2], *nodes[3], eps) || + MathLib::isPointInTetrahedron( + pnt, *nodes[2], *nodes[4], *nodes[5], *nodes[3], eps)); } unsigned PrismRule6::identifyFace(Node const* const* _nodes, Node* nodes[3]) diff --git a/MeshLib/Elements/PyramidRule5.cpp b/MeshLib/Elements/PyramidRule5.cpp index b149a98de88d85ce2f79c09cafa3f79e09f7b89c..8c2253ed3e2045325e07dd97e44879691b89fbe3 100644 --- a/MeshLib/Elements/PyramidRule5.cpp +++ b/MeshLib/Elements/PyramidRule5.cpp @@ -66,14 +66,14 @@ double PyramidRule5::computeVolume(Node const* const* _nodes) + MathLib::calcTetrahedronVolume(*_nodes[2], *_nodes[3], *_nodes[0], *_nodes[4]); } -bool PyramidRule5::isPntInElement(Node const* const* _nodes, +bool PyramidRule5::isPntInElement(Node const* const* nodes, MathLib::Point3d const& pnt, double eps) { return (MathLib::isPointInTetrahedron( - pnt, *_nodes[0], *_nodes[1], *_nodes[2], *_nodes[4], eps) || + pnt, *nodes[0], *nodes[1], *nodes[2], *nodes[4], eps) || MathLib::isPointInTetrahedron( - pnt, *_nodes[0], *_nodes[2], *_nodes[3], *_nodes[4], eps)); + pnt, *nodes[0], *nodes[2], *nodes[3], *nodes[4], eps)); } unsigned PyramidRule5::identifyFace(Node const* const* _nodes, Node* nodes[3]) diff --git a/MeshLib/Elements/QuadRule4.cpp b/MeshLib/Elements/QuadRule4.cpp index 0830672b5a59df67b7c325b79b6f9483031c8e19..afd9148029126222acb83fece48ef24a881e9ef5 100644 --- a/MeshLib/Elements/QuadRule4.cpp +++ b/MeshLib/Elements/QuadRule4.cpp @@ -31,10 +31,13 @@ double QuadRule4::computeVolume(Node const* const* _nodes) + MathLib::calcTriangleArea(*_nodes[2], *_nodes[3], *_nodes[0]); } -bool QuadRule4::isPntInElement(Node const* const* _nodes, MathLib::Point3d const& pnt, double eps) +bool QuadRule4::isPntInElement(Node const* const* nodes, + MathLib::Point3d const& pnt, + double eps) { - return (MathLib::isPointInTriangle(pnt, *_nodes[0], *_nodes[1], *_nodes[2], eps) || - MathLib::isPointInTriangle(pnt, *_nodes[0], *_nodes[2], *_nodes[3], eps)); + return ( + MathLib::isPointInTriangle(pnt, *nodes[0], *nodes[1], *nodes[2], eps) || + MathLib::isPointInTriangle(pnt, *nodes[0], *nodes[2], *nodes[3], eps)); } unsigned QuadRule4::identifyFace(Node const* const* _nodes, Node* nodes[3]) diff --git a/MeshLib/Elements/TetRule4.cpp b/MeshLib/Elements/TetRule4.cpp index bdaf677e8968d88442f57dcadafbcf54fb76edee..6d2df9109968544cacbd5ca278dc4a86ae4a9249 100644 --- a/MeshLib/Elements/TetRule4.cpp +++ b/MeshLib/Elements/TetRule4.cpp @@ -57,9 +57,11 @@ double TetRule4::computeVolume(Node const* const* _nodes) return MathLib::calcTetrahedronVolume(*_nodes[0], *_nodes[1], *_nodes[2], *_nodes[3]); } -bool TetRule4::isPntInElement(Node const* const* _nodes, MathLib::Point3d const& pnt, double eps) +bool TetRule4::isPntInElement(Node const* const* nodes, + MathLib::Point3d const& pnt, double eps) { - return MathLib::isPointInTetrahedron(pnt, *_nodes[0], *_nodes[1], *_nodes[2], *_nodes[3], eps); + return MathLib::isPointInTetrahedron(pnt, *nodes[0], *nodes[1], *nodes[2], + *nodes[3], eps); } unsigned TetRule4::identifyFace(Node const* const* _nodes, Node* nodes[3]) diff --git a/MeshLib/Elements/TriRule3.cpp b/MeshLib/Elements/TriRule3.cpp index 3046420ff2e9f90753793236b48c9409db46f5f1..e2815c531ea50bb0181f44244f576a06dca8135d 100644 --- a/MeshLib/Elements/TriRule3.cpp +++ b/MeshLib/Elements/TriRule3.cpp @@ -29,9 +29,11 @@ double TriRule3::computeVolume(Node const* const* _nodes) return MathLib::calcTriangleArea(*_nodes[0], *_nodes[1], *_nodes[2]); } -bool TriRule3::isPntInElement(Node const* const* _nodes, MathLib::Point3d const& pnt, double eps) +bool TriRule3::isPntInElement(Node const* const* nodes, + MathLib::Point3d const& pnt, double eps) { - return MathLib::isPointInTriangle(pnt, *_nodes[0], *_nodes[1], *_nodes[2], eps); + return MathLib::isPointInTriangle(pnt, *nodes[0], *nodes[1], *nodes[2], + eps); } unsigned TriRule3::identifyFace(Node const* const* _nodes, Node* nodes[3])