diff --git a/MeshLib/Elements/CellRule.h b/MeshLib/Elements/CellRule.h
index 239de9ba1aed0891e05c308e1a45db167665043c..b404188cedb95624a100f30511b6c92b8a842c95 100644
--- a/MeshLib/Elements/CellRule.h
+++ b/MeshLib/Elements/CellRule.h
@@ -36,7 +36,7 @@ public:
protected:
/// Returns the ID of a face given an array of nodes.
template <typename ElementRule>
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[ElementRule::dimension])
{
for (unsigned i = 0; i < ElementRule::n_faces; i++)
@@ -49,7 +49,8 @@ protected:
for (unsigned k = 0; k < ElementRule::dimension; k++)
{
if (ElementRule::face_nodes[i][j] != 99 &&
- _nodes[ElementRule::face_nodes[i][j]] == nodes[k])
+ element_nodes[ElementRule::face_nodes[i][j]] ==
+ nodes[k])
{
flag++;
}
diff --git a/MeshLib/Elements/FaceRule.h b/MeshLib/Elements/FaceRule.h
index 0cfe9c41982272877400e185ae6a5b77c67c3625..8a81e7a98f2fbd6c4267610004f8fe77ed94b69a 100644
--- a/MeshLib/Elements/FaceRule.h
+++ b/MeshLib/Elements/FaceRule.h
@@ -45,7 +45,7 @@ public:
protected:
/// Returns the ID of an edge given an array of nodes.
template <typename ElementRule>
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[ElementRule::dimension])
{
for (unsigned i = 0; i < ElementRule::n_edges; i++)
@@ -57,7 +57,8 @@ protected:
{
for (unsigned k = 0; k < ElementRule::dimension; k++)
{
- if (_nodes[ElementRule::edge_nodes[i][j]] == nodes[k])
+ if (element_nodes[ElementRule::edge_nodes[i][j]] ==
+ nodes[k])
{
flag++;
}
diff --git a/MeshLib/Elements/HexRule.cpp b/MeshLib/Elements/HexRule.cpp
index 6210426f4a9a9b55ebbdfe2652d4af1c37c4ca9f..962e36d355e0eb8e5a310e11f83a9e3dd99aeacc 100644
--- a/MeshLib/Elements/HexRule.cpp
+++ b/MeshLib/Elements/HexRule.cpp
@@ -15,20 +15,32 @@
namespace MeshLib
{
-double HexRule::computeVolume(Node const* const* _nodes)
+double HexRule::computeVolume(Node const* const* element_nodes)
{
- return MathLib::calcTetrahedronVolume(
- *_nodes[4], *_nodes[7], *_nodes[5], *_nodes[0]) +
- MathLib::calcTetrahedronVolume(
- *_nodes[5], *_nodes[3], *_nodes[1], *_nodes[0]) +
- MathLib::calcTetrahedronVolume(
- *_nodes[5], *_nodes[7], *_nodes[3], *_nodes[0]) +
- MathLib::calcTetrahedronVolume(
- *_nodes[5], *_nodes[7], *_nodes[6], *_nodes[2]) +
- MathLib::calcTetrahedronVolume(
- *_nodes[1], *_nodes[3], *_nodes[5], *_nodes[2]) +
- MathLib::calcTetrahedronVolume(
- *_nodes[3], *_nodes[7], *_nodes[5], *_nodes[2]);
+ return MathLib::calcTetrahedronVolume(*element_nodes[4],
+ *element_nodes[7],
+ *element_nodes[5],
+ *element_nodes[0]) +
+ MathLib::calcTetrahedronVolume(*element_nodes[5],
+ *element_nodes[3],
+ *element_nodes[1],
+ *element_nodes[0]) +
+ MathLib::calcTetrahedronVolume(*element_nodes[5],
+ *element_nodes[7],
+ *element_nodes[3],
+ *element_nodes[0]) +
+ MathLib::calcTetrahedronVolume(*element_nodes[5],
+ *element_nodes[7],
+ *element_nodes[6],
+ *element_nodes[2]) +
+ MathLib::calcTetrahedronVolume(*element_nodes[1],
+ *element_nodes[3],
+ *element_nodes[5],
+ *element_nodes[2]) +
+ MathLib::calcTetrahedronVolume(*element_nodes[3],
+ *element_nodes[7],
+ *element_nodes[5],
+ *element_nodes[2]);
}
bool HexRule::isPntInElement(Node const* const* nodes,
diff --git a/MeshLib/Elements/HexRule.h b/MeshLib/Elements/HexRule.h
index 30ba9c469cbea31105fe63dcf6e46e4cdd442005..6a69f7bc7b787b858b5b5e32c2bb317c8bbd5b90 100644
--- a/MeshLib/Elements/HexRule.h
+++ b/MeshLib/Elements/HexRule.h
@@ -48,6 +48,6 @@ public:
/// Calculates the volume of a convex hexahedron by partitioning it into six
/// tetrahedra.
- static double computeVolume(Node const* const* _nodes);
+ static double computeVolume(Node const* const* element_nodes);
};
} // namespace MeshLib
diff --git a/MeshLib/Elements/HexRule20.h b/MeshLib/Elements/HexRule20.h
index cfa67d6d6c53edbdddbcf38786506da139d3abf7..15268954b19f5c303f129a7097859789df493688 100644
--- a/MeshLib/Elements/HexRule20.h
+++ b/MeshLib/Elements/HexRule20.h
@@ -63,10 +63,10 @@ public:
static const Element* getFace(const Element* e, unsigned i);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return CellRule::identifyFace<HexRule20>(_nodes, nodes);
+ return CellRule::identifyFace<HexRule20>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/HexRule8.h b/MeshLib/Elements/HexRule8.h
index c4e5fdb9fbd46c1e1539df05c53317239ab0834d..7f94faa37c71ee91a1430d154de7bef023bfed61 100644
--- a/MeshLib/Elements/HexRule8.h
+++ b/MeshLib/Elements/HexRule8.h
@@ -62,10 +62,10 @@ public:
static const Element* getFace(const Element* e, unsigned i);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return CellRule::identifyFace<HexRule8>(_nodes, nodes);
+ return CellRule::identifyFace<HexRule8>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/LineRule.cpp b/MeshLib/Elements/LineRule.cpp
index 849fed49ac1656e2709a7e43039da36d96fac469..aed1a61aea5bff6636cb4017d3ebf7a8efda62be 100644
--- a/MeshLib/Elements/LineRule.cpp
+++ b/MeshLib/Elements/LineRule.cpp
@@ -14,9 +14,9 @@
namespace MeshLib
{
-double LineRule::computeVolume(Node const* const* _nodes)
+double LineRule::computeVolume(Node const* const* element_nodes)
{
- return std::sqrt(MathLib::sqrDist(*_nodes[0], *_nodes[1]));
+ return std::sqrt(MathLib::sqrDist(*element_nodes[0], *element_nodes[1]));
}
bool LineRule::isPntInElement(Node const* const* nodes,
@@ -52,13 +52,14 @@ bool LineRule::isPntInElement(Node const* const* nodes,
}
}
-unsigned LineRule::identifyFace(Node const* const* _nodes, Node const* nodes[1])
+unsigned LineRule::identifyFace(Node const* const* element_nodes,
+ Node const* nodes[1])
{
- if (nodes[0] == _nodes[0])
+ if (nodes[0] == element_nodes[0])
{
return 0;
}
- if (nodes[0] == _nodes[1])
+ if (nodes[0] == element_nodes[1])
{
return 1;
}
diff --git a/MeshLib/Elements/LineRule.h b/MeshLib/Elements/LineRule.h
index 67f51220cb80e0f8a9f1adbcf71295ef4432d70c..061dc99fc3dbf373af48f8581280da13e848423e 100644
--- a/MeshLib/Elements/LineRule.h
+++ b/MeshLib/Elements/LineRule.h
@@ -44,10 +44,10 @@ public:
static ElementErrorCode validate(const Element* e);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* /*_nodes*/,
+ static unsigned identifyFace(Node const* const* /*element_nodes*/,
Node const* nodes[1]);
/// Calculates the length of a line.
- static double computeVolume(Node const* const* _nodes);
+ static double computeVolume(Node const* const* element_nodes);
};
} // namespace MeshLib
diff --git a/MeshLib/Elements/PointRule1.cpp b/MeshLib/Elements/PointRule1.cpp
index 38ec9c4c20539e805df138b4548c63dc1cd3c09b..cb51e2323b101befa1c355d73259d63f37b9051d 100644
--- a/MeshLib/Elements/PointRule1.cpp
+++ b/MeshLib/Elements/PointRule1.cpp
@@ -17,7 +17,7 @@ namespace MeshLib
{
const unsigned PointRule1::edge_nodes[1][1] = {{0}};
-double PointRule1::computeVolume(Node const* const* /*_nodes*/)
+double PointRule1::computeVolume(Node const* const* /*element_nodes*/)
{
return 0;
}
@@ -29,10 +29,10 @@ bool PointRule1::isPntInElement(Node const* const* nodes,
return (dist < eps);
}
-unsigned PointRule1::identifyFace(Node const* const* _nodes,
+unsigned PointRule1::identifyFace(Node const* const* element_nodes,
Node const* nodes[1])
{
- if (nodes[0] == _nodes[0])
+ if (nodes[0] == element_nodes[0])
{
return 0;
}
diff --git a/MeshLib/Elements/PointRule1.h b/MeshLib/Elements/PointRule1.h
index 2fa7e57dd342b49a8e68e014cedfd8bdcb5741aa..46d3f308f29da83f15cf4bef60af5305b331eb62 100644
--- a/MeshLib/Elements/PointRule1.h
+++ b/MeshLib/Elements/PointRule1.h
@@ -56,10 +56,10 @@ public:
static ElementErrorCode validate(const Element* e);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* /*_nodes*/,
+ static unsigned identifyFace(Node const* const* /*element_nodes*/,
Node const* nodes[1]);
/// Calculates the length of a line
- static double computeVolume(Node const* const* _nodes);
+ static double computeVolume(Node const* const* element_nodes);
};
} // namespace MeshLib
diff --git a/MeshLib/Elements/PrismRule.cpp b/MeshLib/Elements/PrismRule.cpp
index 219c6b7d8cc2abdbf20f30dbf7295dcbaadb3f6a..e1bb52cd07ad0bb60b189cf740ad3dbf46da0ba6 100644
--- a/MeshLib/Elements/PrismRule.cpp
+++ b/MeshLib/Elements/PrismRule.cpp
@@ -15,14 +15,20 @@
namespace MeshLib
{
-double PrismRule::computeVolume(Node const* const* _nodes)
+double PrismRule::computeVolume(Node const* const* element_nodes)
{
- return MathLib::calcTetrahedronVolume(
- *_nodes[0], *_nodes[1], *_nodes[2], *_nodes[3]) +
- MathLib::calcTetrahedronVolume(
- *_nodes[1], *_nodes[4], *_nodes[2], *_nodes[3]) +
- MathLib::calcTetrahedronVolume(
- *_nodes[2], *_nodes[4], *_nodes[5], *_nodes[3]);
+ return MathLib::calcTetrahedronVolume(*element_nodes[0],
+ *element_nodes[1],
+ *element_nodes[2],
+ *element_nodes[3]) +
+ MathLib::calcTetrahedronVolume(*element_nodes[1],
+ *element_nodes[4],
+ *element_nodes[2],
+ *element_nodes[3]) +
+ MathLib::calcTetrahedronVolume(*element_nodes[2],
+ *element_nodes[4],
+ *element_nodes[5],
+ *element_nodes[3]);
}
bool PrismRule::isPntInElement(Node const* const* nodes,
diff --git a/MeshLib/Elements/PrismRule.h b/MeshLib/Elements/PrismRule.h
index 343c7630c5e0bfd8cfc786395fba14d184e44b58..98e020b012ebfae3b44fd1c59714592f7bb0d7ae 100644
--- a/MeshLib/Elements/PrismRule.h
+++ b/MeshLib/Elements/PrismRule.h
@@ -48,6 +48,6 @@ public:
/// Calculates the volume of a prism with flat faces by partitioning it into
/// three tetrahedra.
- static double computeVolume(Node const* const* _nodes);
+ static double computeVolume(Node const* const* element_nodes);
};
} // namespace MeshLib
diff --git a/MeshLib/Elements/PrismRule15.h b/MeshLib/Elements/PrismRule15.h
index b277b84ee0828319b075c87162b65eece601da58..89a65cecd4d471a7e84ce4a3223b1ce0a6f2547a 100644
--- a/MeshLib/Elements/PrismRule15.h
+++ b/MeshLib/Elements/PrismRule15.h
@@ -66,10 +66,10 @@ public:
static const Element* getFace(const Element* e, unsigned i);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return CellRule::identifyFace<PrismRule15>(_nodes, nodes);
+ return CellRule::identifyFace<PrismRule15>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/PrismRule6.h b/MeshLib/Elements/PrismRule6.h
index c115ef586aed917859ff28c349256a70b1e75608..27b00a983e92704df5c5acd4830d1a2d5b400582 100644
--- a/MeshLib/Elements/PrismRule6.h
+++ b/MeshLib/Elements/PrismRule6.h
@@ -66,10 +66,10 @@ public:
static const Element* getFace(const Element* e, unsigned i);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return CellRule::identifyFace<PrismRule6>(_nodes, nodes);
+ return CellRule::identifyFace<PrismRule6>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/PyramidRule.cpp b/MeshLib/Elements/PyramidRule.cpp
index 1431b44777c23ed5ccdd2d9880ac5b854abdaeb2..008b7fd73507e092f100c3f413024137914293c3 100644
--- a/MeshLib/Elements/PyramidRule.cpp
+++ b/MeshLib/Elements/PyramidRule.cpp
@@ -15,12 +15,16 @@
namespace MeshLib
{
-double PyramidRule::computeVolume(Node const* const* _nodes)
+double PyramidRule::computeVolume(Node const* const* element_nodes)
{
- return MathLib::calcTetrahedronVolume(
- *_nodes[0], *_nodes[1], *_nodes[2], *_nodes[4]) +
- MathLib::calcTetrahedronVolume(
- *_nodes[2], *_nodes[3], *_nodes[0], *_nodes[4]);
+ return MathLib::calcTetrahedronVolume(*element_nodes[0],
+ *element_nodes[1],
+ *element_nodes[2],
+ *element_nodes[4]) +
+ MathLib::calcTetrahedronVolume(*element_nodes[2],
+ *element_nodes[3],
+ *element_nodes[0],
+ *element_nodes[4]);
}
bool PyramidRule::isPntInElement(Node const* const* nodes,
diff --git a/MeshLib/Elements/PyramidRule.h b/MeshLib/Elements/PyramidRule.h
index 332e03fc56042fc70a50c0160a01e200105f1414..75e777a082d2c4c21fa92e31c2505ed24c80b92d 100644
--- a/MeshLib/Elements/PyramidRule.h
+++ b/MeshLib/Elements/PyramidRule.h
@@ -49,6 +49,6 @@ public:
/// Calculates the volume of a flat-sided pyramid by partitioning it into
/// two tetrahedra.
- static double computeVolume(Node const* const* _nodes);
+ static double computeVolume(Node const* const* element_nodes);
};
} // namespace MeshLib
diff --git a/MeshLib/Elements/PyramidRule13.h b/MeshLib/Elements/PyramidRule13.h
index f8da93345786f342a83046d329648c625d9bd940..d9fa51cbb2198e3fc0dbbd84f358c43e2901956b 100644
--- a/MeshLib/Elements/PyramidRule13.h
+++ b/MeshLib/Elements/PyramidRule13.h
@@ -65,10 +65,10 @@ public:
static const Element* getFace(const Element* e, unsigned i);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return CellRule::identifyFace<PyramidRule13>(_nodes, nodes);
+ return CellRule::identifyFace<PyramidRule13>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/PyramidRule5.h b/MeshLib/Elements/PyramidRule5.h
index 9cd1f8c433400743787f3e2a23f2da555effb4a0..1fa2ac1fbb02c2796146100b28f28b048c53134e 100644
--- a/MeshLib/Elements/PyramidRule5.h
+++ b/MeshLib/Elements/PyramidRule5.h
@@ -65,10 +65,10 @@ public:
static const Element* getFace(const Element* e, unsigned i);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return CellRule::identifyFace<PyramidRule5>(_nodes, nodes);
+ return CellRule::identifyFace<PyramidRule5>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/QuadRule.cpp b/MeshLib/Elements/QuadRule.cpp
index 26276cdc500b030d877c35447e4bfb09c2a05ec8..fd22330e199f71e0deb5a46dbe49bd3911ceeb56 100644
--- a/MeshLib/Elements/QuadRule.cpp
+++ b/MeshLib/Elements/QuadRule.cpp
@@ -14,10 +14,12 @@
namespace MeshLib
{
-double QuadRule::computeVolume(Node const* const* _nodes)
+double QuadRule::computeVolume(Node const* const* element_nodes)
{
- return MathLib::calcTriangleArea(*_nodes[0], *_nodes[1], *_nodes[2]) +
- MathLib::calcTriangleArea(*_nodes[2], *_nodes[3], *_nodes[0]);
+ return MathLib::calcTriangleArea(
+ *element_nodes[0], *element_nodes[1], *element_nodes[2]) +
+ MathLib::calcTriangleArea(
+ *element_nodes[2], *element_nodes[3], *element_nodes[0]);
}
bool QuadRule::isPntInElement(Node const* const* nodes,
@@ -33,18 +35,25 @@ ElementErrorCode QuadRule::validate(const Element* e)
{
ElementErrorCode error_code;
error_code[ElementErrorFlag::ZeroVolume] = hasZeroVolume(*e);
- Node const* const* _nodes = e->getNodes();
+ Node const* const* element_nodes = e->getNodes();
error_code[ElementErrorFlag::NonCoplanar] =
- (!MathLib::isCoplanar(*_nodes[0], *_nodes[1], *_nodes[2], *_nodes[3]));
+ (!MathLib::isCoplanar(*element_nodes[0],
+ *element_nodes[1],
+ *element_nodes[2],
+ *element_nodes[3]));
// for collapsed quads (i.e. reduced to a line) this test might result
// "false" as all four points are actually located on a line.
if (!error_code[ElementErrorFlag::ZeroVolume])
{
error_code[ElementErrorFlag::NonConvex] =
- (!(MathLib::dividedByPlane(
- *_nodes[0], *_nodes[2], *_nodes[1], *_nodes[3]) &&
- MathLib::dividedByPlane(
- *_nodes[1], *_nodes[3], *_nodes[0], *_nodes[2])));
+ (!(MathLib::dividedByPlane(*element_nodes[0],
+ *element_nodes[2],
+ *element_nodes[1],
+ *element_nodes[3]) &&
+ MathLib::dividedByPlane(*element_nodes[1],
+ *element_nodes[3],
+ *element_nodes[0],
+ *element_nodes[2])));
}
error_code[ElementErrorFlag::NodeOrder] = !e->testElementNodeOrder();
return error_code;
diff --git a/MeshLib/Elements/QuadRule.h b/MeshLib/Elements/QuadRule.h
index 0cb382cdd54dbf7bff1a5701444a630b719242df..53cf5b3fada492f3739ab5e59fe7f78562e93f13 100644
--- a/MeshLib/Elements/QuadRule.h
+++ b/MeshLib/Elements/QuadRule.h
@@ -48,6 +48,6 @@ public:
static ElementErrorCode validate(const Element* e);
/// Calculates the area of a quad with straight edges.
- static double computeVolume(Node const* const* _nodes);
+ static double computeVolume(Node const* const* element_nodes);
};
} // namespace MeshLib
diff --git a/MeshLib/Elements/QuadRule4.h b/MeshLib/Elements/QuadRule4.h
index c315e5b05ede7677751f212be925292397f2ccda..4f53fcc9bee22405b827208a2d941a94288cc63c 100644
--- a/MeshLib/Elements/QuadRule4.h
+++ b/MeshLib/Elements/QuadRule4.h
@@ -48,10 +48,10 @@ public:
/// Returns the i-th edge of the element.
using EdgeReturn = MeshLib::LinearEdgeReturn;
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return FaceRule::identifyFace<QuadRule4>(_nodes, nodes);
+ return FaceRule::identifyFace<QuadRule4>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/QuadRule8.h b/MeshLib/Elements/QuadRule8.h
index f80f6650a0842773ec2e5b4dc69b0f5d0ebf9aaf..cc0e26811e77a68b4caa2e5f4a46b38e00553f10 100644
--- a/MeshLib/Elements/QuadRule8.h
+++ b/MeshLib/Elements/QuadRule8.h
@@ -48,10 +48,10 @@ public:
/// Returns the i-th edge of the element.
using EdgeReturn = MeshLib::QuadraticEdgeReturn;
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return FaceRule::identifyFace<QuadRule8>(_nodes, nodes);
+ return FaceRule::identifyFace<QuadRule8>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/QuadRule9.h b/MeshLib/Elements/QuadRule9.h
index 97c81301cee53722badc039e7dca1d04432ecc96..7dda72ddfdeb040968b36eb2e7207fe32cd96640 100644
--- a/MeshLib/Elements/QuadRule9.h
+++ b/MeshLib/Elements/QuadRule9.h
@@ -48,10 +48,10 @@ public:
/// Returns the i-th edge of the element.
using EdgeReturn = MeshLib::QuadraticEdgeReturn;
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return FaceRule::identifyFace<QuadRule9>(_nodes, nodes);
+ return FaceRule::identifyFace<QuadRule9>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/TetRule.cpp b/MeshLib/Elements/TetRule.cpp
index 8f5682f5b32c4571968f1fc273fd842684cab7db..5af7e5a85adcd136ae66a4ddf2a1256956c60679 100644
--- a/MeshLib/Elements/TetRule.cpp
+++ b/MeshLib/Elements/TetRule.cpp
@@ -14,10 +14,10 @@
namespace MeshLib
{
-double TetRule::computeVolume(Node const* const* _nodes)
+double TetRule::computeVolume(Node const* const* element_nodes)
{
- return MathLib::calcTetrahedronVolume(*_nodes[0], *_nodes[1], *_nodes[2],
- *_nodes[3]);
+ return MathLib::calcTetrahedronVolume(*element_nodes[0], *element_nodes[1],
+ *element_nodes[2], *element_nodes[3]);
}
bool TetRule::isPntInElement(Node const* const* nodes,
diff --git a/MeshLib/Elements/TetRule.h b/MeshLib/Elements/TetRule.h
index a0c7da5ede12663b3a9d1c8254f9d26925418bac..2b1bbc61395d50938df6b10cc2125afa8c113919 100644
--- a/MeshLib/Elements/TetRule.h
+++ b/MeshLib/Elements/TetRule.h
@@ -48,6 +48,6 @@ public:
static ElementErrorCode validate(const Element* e);
/// Calculates the volume of a tetrahedron.
- static double computeVolume(Node const* const* _nodes);
+ static double computeVolume(Node const* const* element_nodes);
};
} // namespace MeshLib
diff --git a/MeshLib/Elements/TetRule10.h b/MeshLib/Elements/TetRule10.h
index 9eeea81b5d307af8305c57aaca3266bafb5afaeb..213212ba6519fb961cbb88afe8c8c5dbba430e0f 100644
--- a/MeshLib/Elements/TetRule10.h
+++ b/MeshLib/Elements/TetRule10.h
@@ -60,10 +60,10 @@ public:
static const Element* getFace(const Element* e, unsigned i);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return CellRule::identifyFace<TetRule10>(_nodes, nodes);
+ return CellRule::identifyFace<TetRule10>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/TetRule4.h b/MeshLib/Elements/TetRule4.h
index 707d792c0ce47fc1d9ece774434026261100855b..5f17de0db83ecdaabc2619b88b2e1752b380d20a 100644
--- a/MeshLib/Elements/TetRule4.h
+++ b/MeshLib/Elements/TetRule4.h
@@ -60,10 +60,10 @@ public:
static const Element* getFace(const Element* e, unsigned i);
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[3])
{
- return CellRule::identifyFace<TetRule4>(_nodes, nodes);
+ return CellRule::identifyFace<TetRule4>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/TriRule.cpp b/MeshLib/Elements/TriRule.cpp
index 681bd0cc716bc480981046f38d73ae0e746dace7..a6222815f66579116dc0efe3e4baf168f299e1e6 100644
--- a/MeshLib/Elements/TriRule.cpp
+++ b/MeshLib/Elements/TriRule.cpp
@@ -14,9 +14,10 @@
namespace MeshLib
{
-double TriRule::computeVolume(Node const* const* _nodes)
+double TriRule::computeVolume(Node const* const* element_nodes)
{
- return MathLib::calcTriangleArea(*_nodes[0], *_nodes[1], *_nodes[2]);
+ return MathLib::calcTriangleArea(*element_nodes[0], *element_nodes[1],
+ *element_nodes[2]);
}
bool TriRule::isPntInElement(Node const* const* nodes,
diff --git a/MeshLib/Elements/TriRule.h b/MeshLib/Elements/TriRule.h
index 1519d3acedfc6e72638c50ff3d5f443aef986d3f..3ec6505cf4c1a5682d062d333a335e6680b3b0f3 100644
--- a/MeshLib/Elements/TriRule.h
+++ b/MeshLib/Elements/TriRule.h
@@ -47,6 +47,6 @@ public:
static ElementErrorCode validate(const Element* e);
/// Calculates the area of the triangle with straight edges.
- static double computeVolume(Node const* const* _nodes);
+ static double computeVolume(Node const* const* element_nodes);
};
} // namespace MeshLib
diff --git a/MeshLib/Elements/TriRule3.h b/MeshLib/Elements/TriRule3.h
index 54c10ff46c80cab53a8c828ce94ee26dafe0eaa5..7aa0865aa51adcf14cad50ef73ecec472e3c2d59 100644
--- a/MeshLib/Elements/TriRule3.h
+++ b/MeshLib/Elements/TriRule3.h
@@ -52,10 +52,10 @@ public:
using EdgeReturn = MeshLib::LinearEdgeReturn;
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[2])
{
- return FaceRule::identifyFace<TriRule3>(_nodes, nodes);
+ return FaceRule::identifyFace<TriRule3>(element_nodes, nodes);
}
}; /* class */
diff --git a/MeshLib/Elements/TriRule6.h b/MeshLib/Elements/TriRule6.h
index 4c7b256e41a9cba9f8e333242d39bcebb06d357f..13d69f602654a861c6e8fa29cb9a0c8cda744030 100644
--- a/MeshLib/Elements/TriRule6.h
+++ b/MeshLib/Elements/TriRule6.h
@@ -52,10 +52,10 @@ public:
using EdgeReturn = MeshLib::QuadraticEdgeReturn;
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* _nodes,
+ static unsigned identifyFace(Node const* const* element_nodes,
Node const* nodes[2])
{
- return FaceRule::identifyFace<TriRule6>(_nodes, nodes);
+ return FaceRule::identifyFace<TriRule6>(element_nodes, nodes);
}
}; /* class */