From 7191610e875f66a77b1f1dc0d5d359ba6e5fed1f Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Wed, 14 Aug 2013 16:25:31 +0200
Subject: [PATCH] Make Element::identifyFace() public for all element types.
---
MeshLib/Elements/Element.h | 7 +++----
MeshLib/Elements/TemplateHex.h | 6 +++---
MeshLib/Elements/TemplatePrism.h | 6 +++---
MeshLib/Elements/TemplatePyramid.h | 6 +++---
MeshLib/Elements/TemplateQuad.h | 6 +++---
MeshLib/Elements/TemplateTet.h | 7 +++----
MeshLib/Elements/TemplateTri.h | 6 +++---
7 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index 9e81ad10f68..7a62ff3a137 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -179,6 +179,9 @@ public:
*/
virtual double computeVolume() = 0;
+ /// Returns the ID of a face given an array of nodes.
+ virtual unsigned identifyFace(Node* nodes[3]) const = 0;
+
/**
* Checks if the node order of an element is correct by testing surface normals.
*/
@@ -192,13 +195,9 @@ protected:
/// Return a specific edge node.
virtual Node* getEdgeNode(unsigned edge_id, unsigned node_id) const = 0;
- /// Returns the ID of a face given an array of nodes.
- virtual unsigned identifyFace(Node* nodes[3]) const = 0;
-
/// Sets the element ID.
virtual void setID(std::size_t id) { this->_id = id; }
-
Node** _nodes;
std::size_t _id;
/**
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index f6d7840677b..a781c8b37c6 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -116,6 +116,9 @@ public:
*/
virtual Element* clone() const;
+ /// Returns the ID of a face given an array of nodes.
+ unsigned identifyFace(Node* nodes[3]) const;
+
protected:
/// Calculates the volume of a convex hexahedron by partitioning it into six tetrahedra.
double computeVolume();
@@ -123,9 +126,6 @@ protected:
/// Return a specific edge node.
inline Node* getEdgeNode(unsigned edge_id, unsigned node_id) const { return _nodes[_edge_nodes[edge_id][node_id]]; };
- /// Returns the ID of a face given an array of nodes.
- unsigned identifyFace(Node* nodes[3]) const;
-
static const unsigned _face_nodes[6][4];
static const unsigned _edge_nodes[12][2];
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index 002a5c9ae84..9c2b49d06fb 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -115,6 +115,9 @@ public:
*/
virtual Element* clone() const;
+ /// Returns the ID of a face given an array of nodes.
+ unsigned identifyFace(Node* nodes[3]) const;
+
protected:
/// Calculates the volume of a prism by subdividing it into three tetrahedra.
double computeVolume();
@@ -122,9 +125,6 @@ protected:
/// Return a specific edge node.
inline Node* getEdgeNode(unsigned edge_id, unsigned node_id) const { return _nodes[_edge_nodes[edge_id][node_id]]; };
- /// Returns the ID of a face given an array of nodes.
- unsigned identifyFace(Node* nodes[3]) const;
-
static const unsigned _face_nodes[5][4];
static const unsigned _edge_nodes[9][2];
static const unsigned _n_face_nodes[5];
diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h
index 1f6eb67cbcd..89d277593c1 100644
--- a/MeshLib/Elements/TemplatePyramid.h
+++ b/MeshLib/Elements/TemplatePyramid.h
@@ -113,6 +113,9 @@ public:
*/
virtual Element* clone() const;
+ /// Returns the ID of a face given an array of nodes.
+ unsigned identifyFace(Node* nodes[3]) const;
+
protected:
/// Calculates the volume of a prism by subdividing it into two tetrahedra.
double computeVolume();
@@ -120,9 +123,6 @@ protected:
/// Return a specific edge node.
inline Node* getEdgeNode(unsigned edge_id, unsigned node_id) const { return _nodes[_edge_nodes[edge_id][node_id]]; };
- /// Returns the ID of a face given an array of nodes.
- unsigned identifyFace(Node* nodes[3]) const;
-
static const unsigned _face_nodes[5][4];
static const unsigned _edge_nodes[8][2];
static const unsigned _n_face_nodes[5];
diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h
index e6619e86ddb..21d8dc7a7c9 100644
--- a/MeshLib/Elements/TemplateQuad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -109,6 +109,9 @@ public:
*/
virtual Element* clone() const;
+ /// Returns the ID of a face given an array of nodes.
+ unsigned identifyFace(Node* nodes[3]) const;
+
protected:
/// Calculates the area of a convex quadliteral by dividing it into two triangles.
double computeVolume();
@@ -117,9 +120,6 @@ protected:
/// Return a specific edge node.
inline Node* getEdgeNode(unsigned edge_id, unsigned node_id) const { return _nodes[_edge_nodes[edge_id][node_id]]; };
- /// Returns the ID of a face given an array of nodes.
- unsigned identifyFace(Node* nodes[3]) const;
-
static const unsigned _edge_nodes[4][2];
}; /* class */
diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h
index fc5fa63549f..8fd425d1110 100644
--- a/MeshLib/Elements/TemplateTet.h
+++ b/MeshLib/Elements/TemplateTet.h
@@ -111,6 +111,9 @@ public:
*/
virtual Element* clone() const;
+ /// Returns the ID of a face given an array of nodes.
+ unsigned identifyFace(Node* nodes[3]) const;
+
protected:
/// Calculates the volume of a tetrahedron via the determinant of the matrix given by its four points.
double computeVolume();
@@ -125,10 +128,6 @@ protected:
return _nodes[_edge_nodes[edge_id][node_id]];
}
- /// Returns the ID of a face given an array of nodes.
- unsigned identifyFace(Node* nodes[3]) const;
-
-
static const unsigned _face_nodes[4][3];
static const unsigned _edge_nodes[6][2];
diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h
index c91290193e2..25643b6de1e 100644
--- a/MeshLib/Elements/TemplateTri.h
+++ b/MeshLib/Elements/TemplateTri.h
@@ -118,6 +118,9 @@ public:
return new TemplateTri<NNODES,CELLTRITYPE>(*this);
}
+ /// Returns the ID of a face given an array of nodes.
+ unsigned identifyFace(Node* nodes[3]) const;
+
protected:
/// Calculates the area of the triangle by returning half of the area of the corresponding parallelogram.
double computeVolume()
@@ -132,9 +135,6 @@ protected:
return _nodes[_edge_nodes[edge_id][node_id]];
}
- /// Returns the ID of a face given an array of nodes.
- unsigned identifyFace(Node* nodes[3]) const;
-
static const unsigned _edge_nodes[3][2];
}; /* class */
--
GitLab