diff --git a/MeshLib/Elements/PrismRule.cpp b/MeshLib/Elements/PrismRule.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..219c6b7d8cc2abdbf20f30dbf7295dcbaadb3f6a
--- /dev/null
+++ b/MeshLib/Elements/PrismRule.cpp
@@ -0,0 +1,62 @@
+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2023, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ */
+
+#include "PrismRule.h"
+
+#include "MathLib/GeometricBasics.h"
+#include "MeshLib/Node.h"
+#include "Quad.h"
+
+namespace MeshLib
+{
+double PrismRule::computeVolume(Node const* const* _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]);
+}
+
+bool PrismRule::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));
+}
+
+ElementErrorCode PrismRule::validate(const Element* e)
+{
+ ElementErrorCode error_code;
+ error_code[ElementErrorFlag::ZeroVolume] = hasZeroVolume(*e);
+
+ for (unsigned i = 1; i < 4; ++i)
+ {
+ const auto* quad(dynamic_cast<const MeshLib::Quad*>(e->getFace(i)));
+ if (quad)
+ {
+ error_code |= quad->validate();
+ }
+ else
+ {
+ error_code.set(ElementErrorFlag::NodeOrder);
+ }
+ delete quad;
+ }
+ error_code[ElementErrorFlag::NodeOrder] = !e->testElementNodeOrder();
+ return error_code;
+}
+
+} // end namespace MeshLib
diff --git a/MeshLib/Elements/PrismRule.h b/MeshLib/Elements/PrismRule.h
new file mode 100644
index 0000000000000000000000000000000000000000..d4ef88a753e907bb185e4f692c19006b4e3ea8af
--- /dev/null
+++ b/MeshLib/Elements/PrismRule.h
@@ -0,0 +1,81 @@
+/**
+ * \file
+ * \copyright
+ * Copyright (c) 2012-2023, OpenGeoSys Community (http://www.opengeosys.org)
+ * Distributed under a Modified BSD License.
+ * See accompanying file LICENSE.txt or
+ * http://www.opengeosys.org/project/license
+ *
+ */
+
+#pragma once
+
+#include "CellRule.h"
+#include "Element.h"
+#include "MeshLib/MeshEnums.h"
+
+namespace MeshLib
+{
+class PrismRule : public CellRule
+{
+public:
+ /// Constant: The number of base nodes for this element
+ static const unsigned n_base_nodes = 6u;
+
+ /// Constant: The geometric type of the element
+ static const MeshElemType mesh_elem_type = MeshElemType::PRISM;
+
+ /// Constant: The number of faces
+ static const unsigned n_faces = 5;
+
+ /// Constant: The number of edges
+ static const unsigned n_edges = 9;
+
+ /// Constant: The number of neighbors
+ static const unsigned n_neighbors = 5;
+
+ /**
+ * \copydoc MeshLib::Element::isPntInElement()
+ * \param nodes the nodes of the element.
+ */
+ static bool isPntInElement(Node const* const* nodes,
+ MathLib::Point3d const& pnt, double eps);
+
+ /**
+ * Tests if the element is geometrically valid.
+ */
+ static ElementErrorCode validate(const Element* e);
+
+ /// Calculates the volume of a convex hexahedron by partitioning it into six
+ /// tetrahedra.
+ static double computeVolume(Node const* const* _nodes);
+
+protected:
+ template <std::size_t N>
+ static unsigned identifyFace(Node const* const* _nodes,
+ Node const* nodes[3],
+ unsigned const face_nodes[5][N])
+ {
+ for (unsigned i = 0; i < 5; i++)
+ {
+ unsigned flag(0);
+ for (unsigned j = 0; j < 4; j++)
+ {
+ for (unsigned k = 0; k < 3; k++)
+ {
+ if (face_nodes[i][j] != 99 &&
+ _nodes[face_nodes[i][j]] == nodes[k])
+ {
+ flag++;
+ }
+ }
+ }
+ if (flag == 3)
+ {
+ return i;
+ }
+ }
+ return std::numeric_limits<unsigned>::max();
+ }
+};
+} // namespace MeshLib
diff --git a/MeshLib/Elements/PrismRule15.h b/MeshLib/Elements/PrismRule15.h
index a6ae0de9307d10cdfe1ec6af4facd351cc36646f..de747689bfefbf1940e52bb55edd7759c5ec6b16 100644
--- a/MeshLib/Elements/PrismRule15.h
+++ b/MeshLib/Elements/PrismRule15.h
@@ -10,10 +10,9 @@
#pragma once
-#include "MeshLib/MeshEnums.h"
-#include "Element.h"
#include "EdgeReturn.h"
-#include "PrismRule6.h"
+#include "Element.h"
+#include "PrismRule.h"
namespace MeshLib
{
@@ -42,7 +41,7 @@ namespace MeshLib
*
* \endcode
*/
-class PrismRule15 : public PrismRule6
+class PrismRule15 : public PrismRule
{
public:
/// Constant: The number of all nodes for this element
@@ -66,6 +65,12 @@ public:
/// Returns the i-th face of the element.
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,
+ Node const* nodes[3])
+ {
+ return PrismRule::identifyFace(_nodes, nodes, face_nodes);
+ }
}; /* class */
} // namespace MeshLib
diff --git a/MeshLib/Elements/PrismRule6.cpp b/MeshLib/Elements/PrismRule6.cpp
index df8df0f510d69b628ea917b04dec6eb1200750d0..84024442e45f53adcf0e31eeb953d44118817d8c 100644
--- a/MeshLib/Elements/PrismRule6.cpp
+++ b/MeshLib/Elements/PrismRule6.cpp
@@ -11,7 +11,6 @@
#include "PrismRule6.h"
#include "BaseLib/Logging.h"
-#include "MathLib/GeometricBasics.h"
#include "MeshLib/Node.h"
#include "Quad.h"
#include "Tri.h"
@@ -61,74 +60,4 @@ const Element* PrismRule6::getFace(const Element* e, unsigned i)
ERR("Error in MeshLib::Element::getFace() - Index {:d} does not exist.", i);
return nullptr;
}
-
-double PrismRule6::computeVolume(Node const* const* _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]);
-}
-
-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));
-}
-
-unsigned PrismRule6::identifyFace(Node const* const* _nodes,
- Node const* nodes[3])
-{
- for (unsigned i = 0; i < 5; i++)
- {
- unsigned flag(0);
- for (unsigned j = 0; j < 4; j++)
- {
- for (unsigned k = 0; k < 3; k++)
- {
- if (face_nodes[i][j] != 99 &&
- _nodes[face_nodes[i][j]] == nodes[k])
- {
- flag++;
- }
- }
- }
- if (flag == 3)
- {
- return i;
- }
- }
- return std::numeric_limits<unsigned>::max();
-}
-
-ElementErrorCode PrismRule6::validate(const Element* e)
-{
- ElementErrorCode error_code;
- error_code[ElementErrorFlag::ZeroVolume] = hasZeroVolume(*e);
-
- for (unsigned i = 1; i < 4; ++i)
- {
- const auto* quad(dynamic_cast<const MeshLib::Quad*>(e->getFace(i)));
- if (quad)
- {
- error_code |= quad->validate();
- }
- else
- {
- error_code.set(ElementErrorFlag::NodeOrder);
- }
- delete quad;
- }
- error_code[ElementErrorFlag::NodeOrder] = !e->testElementNodeOrder();
- return error_code;
-}
-
} // end namespace MeshLib
diff --git a/MeshLib/Elements/PrismRule6.h b/MeshLib/Elements/PrismRule6.h
index 42190daed1c46756ed6c25747060cd102ab87f48..37393b4eec99caa0d7f8a52e5eeaf1de5ce2b80a 100644
--- a/MeshLib/Elements/PrismRule6.h
+++ b/MeshLib/Elements/PrismRule6.h
@@ -10,17 +10,16 @@
#pragma once
-#include "MeshLib/MeshEnums.h"
-#include "Element.h"
#include "EdgeReturn.h"
-#include "CellRule.h"
+#include "Element.h"
+#include "PrismRule.h"
namespace MeshLib
{
/**
- * This class represents a 3d prism element. The following sketch shows the node
- * and edge numbering.
+ * This class represents a 3d prism element with 6 nodes.
+ * The following sketch shows the node and edge numbering.
* \anchor Prism6NodeAndEdgeNumbering
* \code
* 5
@@ -42,30 +41,15 @@ namespace MeshLib
*
* \endcode
*/
-class PrismRule6 : public CellRule
+class PrismRule6 : public PrismRule
{
public:
- /// Constant: The number of base nodes for this element
- static const unsigned n_base_nodes = 6u;
-
/// Constant: The number of all nodes for this element
static const unsigned n_all_nodes = 6u;
- /// Constant: The geometric type of the element
- static const MeshElemType mesh_elem_type = MeshElemType::PRISM;
-
/// Constant: The FEM type of the element
static const CellType cell_type = CellType::PRISM6;
- /// Constant: The number of faces
- static const unsigned n_faces = 5;
-
- /// Constant: The number of edges
- static const unsigned n_edges = 9;
-
- /// Constant: The number of neighbors
- static const unsigned n_neighbors = 5;
-
/// Constant: Local node index table for faces
static const unsigned face_nodes[5][4];
@@ -81,25 +65,12 @@ public:
/// Returns the i-th face of the element.
static const Element* getFace(const Element* e, unsigned i);
- /**
- * \copydoc MeshLib::Element::isPntInElement()
- * \param nodes the nodes of the element.
- */
- static bool isPntInElement(Node const* const* nodes,
- MathLib::Point3d const& pnt, double eps);
-
- /**
- * Tests if the element is geometrically valid.
- */
- static ElementErrorCode validate(const Element* e);
-
/// Returns the ID of a face given an array of nodes.
- static unsigned identifyFace(Node const* const* /*_nodes*/,
- Node const* nodes[3]);
-
- /// Calculates the volume of a convex hexahedron by partitioning it into six tetrahedra.
- static double computeVolume(Node const* const* _nodes);
-
+ static unsigned identifyFace(Node const* const* _nodes,
+ Node const* nodes[3])
+ {
+ return PrismRule::identifyFace(_nodes, nodes, face_nodes);
+ }
}; /* class */
} // namespace MeshLib