From 2ce6044554cfa0e62b4bb64507aca3c3b5e07383 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Tue, 22 Nov 2016 17:18:39 +0100
Subject: [PATCH] [MeL] Elements::isPntInElement. Fix parameter name
_node is not a private class member.
---
MeshLib/Elements/HexRule8.cpp | 22 +++++++++++++++-------
MeshLib/Elements/LineRule2.cpp | 7 +++++--
MeshLib/Elements/PointRule1.cpp | 5 +++--
MeshLib/Elements/PrismRule6.cpp | 13 +++++++++----
MeshLib/Elements/PyramidRule5.cpp | 6 +++---
MeshLib/Elements/QuadRule4.cpp | 9 ++++++---
MeshLib/Elements/TetRule4.cpp | 6 ++++--
MeshLib/Elements/TriRule3.cpp | 6 ++++--
8 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/MeshLib/Elements/HexRule8.cpp b/MeshLib/Elements/HexRule8.cpp
index fa70fcd19ad..3ace9f859b7 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 c907b2110b6..6f94d41fe63 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 15a69671c5c..9b10b9b7636 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 3c4821a3b12..c0c2ea0e984 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 b149a98de88..8c2253ed3e2 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 0830672b5a5..afd91480291 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 bdaf677e896..6d2df910996 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 3046420ff2e..e2815c531ea 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])
--
GitLab