Skip to content
Snippets Groups Projects
Commit 2ce60445 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

[MeL] Elements::isPntInElement. Fix parameter name

_node is not a private class member.
parent a7dacf6a
No related branches found
No related tags found
No related merge requests found
......@@ -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])
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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])
......
......@@ -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])
......
......@@ -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])
......
......@@ -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])
......
......@@ -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])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment