move dimension constant to Edge,Face,Cell. delete unused

MeshLib/Elements/Cell.cpp

@@ -20,6 +20,8 @@
 
 namespace MeshLib {
 
+const unsigned Cell::dimension;
+
 Cell::Cell(unsigned value, std::size_t id)
 	: Element(value, id)
 {

MeshLib/Elements/Cell.h

@@ -25,6 +25,9 @@ namespace MeshLib {
 class Cell : public Element
 {
 public:
+	/// Constant: Dimension of this mesh element
+	static const unsigned dimension = 3u;
+
 	/// Get the volume of this 3d element.
 	virtual double getVolume() const { return getContent(); }
 

MeshLib/Elements/CellRule.cpp

-/**
- * \copyright
- * Copyright (c) 2012-2015, 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 "CellRule.h"
-
-#include "logog/include/logog.hpp"
-
-#include "GeoLib/AnalyticalGeometry.h"
-
-#include "MeshLib/Node.h"
-#include "Face.h"
-
-namespace MeshLib
-{
-
-const unsigned CellRule::dimension;
-
-} // end namespace MeshLib

MeshLib/Elements/CellRule.h

-/**
- * \copyright
- * Copyright (c) 2012-2015, OpenGeoSys Community (http://www.opengeosys.org)
- *            Distributed under a Modified BSD License.
- *              See accompanying file LICENSE.txt or
- *              http://www.opengeosys.org/project/license
- *
- */
-
-#ifndef CELLRULE_H_
-#define CELLRULE_H_
-
-#include "MeshLib/MeshEnums.h"
-#include "Element.h"
-
-namespace MeshLib {
-
-/**
- */
-class CellRule
-{
-public:
-	/// Constant: Dimension of this mesh element
-	static const unsigned dimension = 3u;
-
-}; /* class */
-
-} /* namespace */
-
-#endif /* HEXRULE_H_ */
-

MeshLib/Elements/FaceRule.cpp → MeshLib/Elements/Edge.cpp

@@ -7,11 +7,11 @@
  *
  */
 
-#include "FaceRule.h"
+#include "Edge.h"
 
 namespace MeshLib {
 
-const unsigned FaceRule::dimension;
+const unsigned Edge::dimension;
 
 } /* namespace */
 

MeshLib/Elements/Edge.h

@@ -25,6 +25,9 @@ namespace MeshLib {
 class Edge : public Element
 {
 public:
+	/// Constant: Dimension of this mesh element
+	static const unsigned dimension = 1u;
+
 	/// Get the length of this 1d element.
 	virtual double getLength() const { return _content; }
 

MeshLib/Elements/Face.cpp

@@ -21,6 +21,8 @@
 
 namespace MeshLib {
 
+const unsigned Face::dimension;
+
 Face::Face(unsigned value, std::size_t id)
 	: Element(value, id)
 {

MeshLib/Elements/Face.h

@@ -29,6 +29,9 @@ namespace MeshLib {
 class Face : public Element
 {
 public:
+	/// Constant: Dimension of this mesh element
+	static const unsigned dimension = 2u;
+
 	/// Get the area of this 2d element.
 	virtual double getArea() const { return _content; }
 

MeshLib/Elements/FaceRule.h

@@ -20,9 +20,6 @@ namespace MeshLib {
 class FaceRule
 {
 public:
-	/// Constant: Dimension of this mesh element
-	static const unsigned dimension = 2;
-
 	/// Returns the face i of the element.
 	static const Element* getFace(const Element* e, unsigned i) { return e->getEdge(i); }
 

MeshLib/Elements/HexRule8.h

@@ -12,7 +12,6 @@
 
 #include "MeshLib/MeshEnums.h"
 #include "Element.h"
-#include "CellRule.h"
 #include "EdgeReturn.h"
 
 namespace MeshLib
@@ -43,7 +42,7 @@ namespace MeshLib
  *
  * @endcode
  */
-class HexRule8 : public CellRule
+class HexRule8
 {
 public:
 	/// Constant: The number of base nodes for this element

MeshLib/Elements/PrismRule6.h

@@ -12,7 +12,6 @@
 
 #include "MeshLib/MeshEnums.h"
 #include "Element.h"
-#include "CellRule.h"
 #include "EdgeReturn.h"
 
 namespace MeshLib
@@ -41,7 +40,7 @@ namespace MeshLib
  *
  * @endcode
  */
-class PrismRule6 : public CellRule
+class PrismRule6
 {
 public:
 	/// Constant: The number of base nodes for this element

MeshLib/Elements/PyramidRule5.h

@@ -12,7 +12,6 @@
 
 #include "MeshLib/MeshEnums.h"
 #include "Element.h"
-#include "CellRule.h"
 #include "EdgeReturn.h"
 
 namespace MeshLib
@@ -40,7 +39,7 @@ namespace MeshLib
  * @endcode
 
  */
-class PyramidRule5 : public CellRule
+class PyramidRule5
 {
 public:
 	/// Constant: The number of base nodes for this element

MeshLib/Elements/TemplateElement-impl.h

@@ -18,9 +18,6 @@ const unsigned TemplateElement<T_BASE, ELEMENT_RULE>::n_all_nodes;
 template <class T_BASE, class ELEMENT_RULE>
 const unsigned TemplateElement<T_BASE, ELEMENT_RULE>::n_base_nodes;
 
-template <class T_BASE, class ELEMENT_RULE>
-const unsigned TemplateElement<T_BASE, ELEMENT_RULE>::dimension;
-
 template <class T_BASE, class ELEMENT_RULE>
 TemplateElement<T_BASE, ELEMENT_RULE>::TemplateElement(Node* nodes[n_all_nodes], unsigned value, std::size_t id)
 : T_BASE(value, id)

MeshLib/Elements/TemplateElement.h

@@ -39,7 +39,7 @@ public:
 	static const unsigned n_base_nodes = ELEMENT_RULE::n_base_nodes;
 
 	/// Constant: The dimension of this element
-	static const unsigned dimension = ELEMENT_RULE::dimension;
+	using T_BASE::dimension;
 
 	/**
 	 * Constructor with an array of mesh nodes.

MeshLib/Elements/TetRule4.h

@@ -12,7 +12,6 @@
 
 #include "MeshLib/MeshEnums.h"
 #include "Element.h"
-#include "CellRule.h"
 #include "EdgeReturn.h"
 
 namespace MeshLib
@@ -38,7 +37,7 @@ namespace MeshLib
  *
  * @endcode
  */
-class TetRule4 : public CellRule
+class TetRule4
 {
 public:
 	/// Constant: The number of base nodes for this element