diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h
index 48dc5a31aa5089275bc84c6ae85e1d16b2562a80..7663bc6c6d5f4ac091939f2d0feb828a42570933 100644
--- a/MeshLib/Elements/Element.h
+++ b/MeshLib/Elements/Element.h
@@ -124,7 +124,7 @@ public:
* Get the type of the element in context of the finite element method.
* @return a value of the enum FEMElemType::type
*/
- virtual CellType::type getCellType() const = 0;
+ virtual CellType getCellType() const = 0;
/**
* Get the value for this element. The value can be used to store a link
diff --git a/MeshLib/Elements/TemplateEdge.h b/MeshLib/Elements/TemplateEdge.h
index bff95fdc0e03491c536fd84498bd1d33493217cc..b48095243fa98bdc66f1c9527874a94473902fb5 100644
--- a/MeshLib/Elements/TemplateEdge.h
+++ b/MeshLib/Elements/TemplateEdge.h
@@ -33,7 +33,7 @@ namespace MeshLib {
* 0--------1
* @endcode
*/
-template<unsigned NNODES, CellType::type CELLEDGETYPE>
+template<unsigned NNODES, CellType CELLEDGETYPE>
class TemplateEdge : public Element
{
public:
@@ -95,7 +95,7 @@ public:
* Get the type of the element in context of the finite element method.
* @return a value of the enum FEMElemType::type
*/
- virtual CellType::type getCellType() const { return CELLEDGETYPE; }
+ virtual CellType getCellType() const { return CELLEDGETYPE; }
/// Returns true if these two indices form an edge and false otherwise
bool isEdge(unsigned idx1, unsigned idx2) const
diff --git a/MeshLib/Elements/TemplateEdge.tpp b/MeshLib/Elements/TemplateEdge.tpp
index 0b31fed5de5819eb281bdaf4e9c842380e092430..f3377073cd73b2a91226109decc6dc7c16abab4a 100644
--- a/MeshLib/Elements/TemplateEdge.tpp
+++ b/MeshLib/Elements/TemplateEdge.tpp
@@ -14,7 +14,7 @@
namespace MeshLib
{
-template<unsigned NNODES, CellType::type CELLEDGETYPE>
+template<unsigned NNODES, CellType CELLEDGETYPE>
TemplateEdge<NNODES,CELLEDGETYPE>::TemplateEdge(std::array<Node*, NNODES> const& nodes,
unsigned value)
: Element(value)
@@ -25,7 +25,7 @@ TemplateEdge<NNODES,CELLEDGETYPE>::TemplateEdge(std::array<Node*, NNODES> const&
this->_length = this->computeVolume();
}
-template<unsigned NNODES, CellType::type CELLEDGETYPE>
+template<unsigned NNODES, CellType CELLEDGETYPE>
TemplateEdge<NNODES,CELLEDGETYPE>::TemplateEdge(Node* nodes[NNODES], unsigned value) :
Element(value)
{
@@ -33,7 +33,7 @@ TemplateEdge<NNODES,CELLEDGETYPE>::TemplateEdge(Node* nodes[NNODES], unsigned va
this->_length = this->computeVolume();
}
-template <unsigned NNODES, CellType::type CELLEDGETYPE>
+template <unsigned NNODES, CellType CELLEDGETYPE>
TemplateEdge<NNODES,CELLEDGETYPE>::TemplateEdge(const TemplateEdge<NNODES,CELLEDGETYPE> &edge) :
Element(edge.getValue())
{
@@ -43,7 +43,7 @@ TemplateEdge<NNODES,CELLEDGETYPE>::TemplateEdge(const TemplateEdge<NNODES,CELLED
_length = edge.getLength();
}
-template <unsigned NNODES, CellType::type CELLEDGETYPE>
+template <unsigned NNODES, CellType CELLEDGETYPE>
TemplateEdge<NNODES,CELLEDGETYPE>::~TemplateEdge()
{}
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index 32972a9054221fb1eb1946778079f27c078cbc7c..b98f5b072dd41955ca88a2e18848fc38bcd5724a 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -46,7 +46,7 @@ namespace MeshLib {
*
* @endcode
*/
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
class TemplateHex : public Cell
{
public:
@@ -93,7 +93,7 @@ public:
* Method returns the FEM type of the element.
* @return
*/
- virtual CellType::type getCellType() const { return CELLHEXTYPE; }
+ virtual CellType getCellType() const { return CELLHEXTYPE; }
/// Returns true if these two indices form an edge and false otherwise
bool isEdge(unsigned i, unsigned j) const;
diff --git a/MeshLib/Elements/TemplateHex.tpp b/MeshLib/Elements/TemplateHex.tpp
index 1e5e56484002e183621014cece16f2f9b0b6144c..92d2075a67676865486b78f5605196fdb9fe1d30 100644
--- a/MeshLib/Elements/TemplateHex.tpp
+++ b/MeshLib/Elements/TemplateHex.tpp
@@ -22,7 +22,7 @@
namespace MeshLib {
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
const unsigned TemplateHex<NNODES,CELLHEXTYPE>::_face_nodes[6][4] =
{
{0, 3, 2, 1}, // Face 0
@@ -33,7 +33,7 @@ const unsigned TemplateHex<NNODES,CELLHEXTYPE>::_face_nodes[6][4] =
{4, 5, 6, 7} // Face 5
};
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
const unsigned TemplateHex<NNODES,CELLHEXTYPE>::_edge_nodes[12][2] =
{
{0, 1}, // Edge 0
@@ -50,7 +50,7 @@ const unsigned TemplateHex<NNODES,CELLHEXTYPE>::_edge_nodes[12][2] =
{4, 7} // Edge 11
};
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
TemplateHex<NNODES,CELLHEXTYPE>::TemplateHex(Node* nodes[NNODES], unsigned value)
: Cell(value)
{
@@ -62,7 +62,7 @@ TemplateHex<NNODES,CELLHEXTYPE>::TemplateHex(Node* nodes[NNODES], unsigned value
this->_volume = this->computeVolume();
}
-template<unsigned NNODES, CellType::type CELLHEXTYPE>
+template<unsigned NNODES, CellType CELLHEXTYPE>
TemplateHex<NNODES,CELLHEXTYPE>::TemplateHex(std::array<Node*, NNODES> const& nodes,
unsigned value)
: Cell(value)
@@ -76,7 +76,7 @@ TemplateHex<NNODES,CELLHEXTYPE>::TemplateHex(std::array<Node*, NNODES> const& no
this->_volume = this->computeVolume();
}
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
TemplateHex<NNODES,CELLHEXTYPE>::TemplateHex(const TemplateHex<NNODES,CELLHEXTYPE> &hex)
: Cell(hex.getValue())
{
@@ -91,12 +91,12 @@ TemplateHex<NNODES,CELLHEXTYPE>::TemplateHex(const TemplateHex<NNODES,CELLHEXTYP
_volume = hex.getVolume();
}
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
TemplateHex<NNODES,CELLHEXTYPE>::~TemplateHex()
{
}
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
double TemplateHex<NNODES,CELLHEXTYPE>::computeVolume()
{
return MathLib::calcTetrahedronVolume(_nodes[4]->getCoords(), _nodes[7]->getCoords(), _nodes[5]->getCoords(), _nodes[0]->getCoords())
@@ -107,7 +107,7 @@ double TemplateHex<NNODES,CELLHEXTYPE>::computeVolume()
+ MathLib::calcTetrahedronVolume(_nodes[3]->getCoords(), _nodes[7]->getCoords(), _nodes[5]->getCoords(), _nodes[2]->getCoords());
}
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
const Element* TemplateHex<NNODES,CELLHEXTYPE>::getFace(unsigned i) const
{
if (i<this->getNFaces())
@@ -122,7 +122,7 @@ const Element* TemplateHex<NNODES,CELLHEXTYPE>::getFace(unsigned i) const
return NULL;
}
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
bool TemplateHex<NNODES,CELLHEXTYPE>::isEdge(unsigned idx1, unsigned idx2) const
{
for (unsigned i(0); i<12; i++)
@@ -133,13 +133,13 @@ bool TemplateHex<NNODES,CELLHEXTYPE>::isEdge(unsigned idx1, unsigned idx2) const
return false;
}
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
Element* TemplateHex<NNODES,CELLHEXTYPE>::clone() const
{
return new TemplateHex<NNODES,CELLHEXTYPE>(*this);
}
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
unsigned TemplateHex<NNODES,CELLHEXTYPE>::identifyFace(Node* nodes[3]) const
{
for (unsigned i=0; i<6; i++)
@@ -155,7 +155,7 @@ unsigned TemplateHex<NNODES,CELLHEXTYPE>::identifyFace(Node* nodes[3]) const
return std::numeric_limits<unsigned>::max();
}
-template <unsigned NNODES, CellType::type CELLHEXTYPE>
+template <unsigned NNODES, CellType CELLHEXTYPE>
Element* TemplateHex<NNODES,CELLHEXTYPE>::reviseElement() const
{
std::vector<size_t> collapsed_edges;
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index ea2e85b426ac49900ce55e88a2da81cfc5b103cf..eb14f544dc2bb3b3ef98b23cb76d75f566c9bf3e 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -44,7 +44,7 @@ namespace MeshLib {
*
* @endcode
*/
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
class TemplatePrism : public Cell
{
public:
@@ -89,9 +89,9 @@ public:
/**
* Get the type of the element in context of the finite element method.
- * @return a value of the enum CellType::type
+ * @return a value of the enum CellType
*/
- virtual CellType::type getCellType() const { return CELLPRISMTYPE; };
+ virtual CellType getCellType() const { return CELLPRISMTYPE; };
/// Returns true if these two indeces form an edge and false otherwise
bool isEdge(unsigned i, unsigned j) const;
diff --git a/MeshLib/Elements/TemplatePrism.tpp b/MeshLib/Elements/TemplatePrism.tpp
index a2cd1843cf3a190cdd208190aedab0c8b24e2701..328e31a83146e7a1ffea47890ed2259cce37f0f2 100644
--- a/MeshLib/Elements/TemplatePrism.tpp
+++ b/MeshLib/Elements/TemplatePrism.tpp
@@ -24,7 +24,7 @@
namespace MeshLib {
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
const unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::_face_nodes[5][4] =
{
{0, 2, 1, 99}, // Face 0
@@ -34,7 +34,7 @@ const unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::_face_nodes[5][4] =
{3, 4, 5, 99} // Face 4
};
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
const unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::_edge_nodes[9][2] =
{
{0, 1}, // Edge 0
@@ -48,10 +48,10 @@ const unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::_edge_nodes[9][2] =
{3, 5} // Edge 8
};
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
const unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::_n_face_nodes[5] = { 3, 4, 4, 4, 3 };
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
TemplatePrism<NNODES,CELLPRISMTYPE>::TemplatePrism(Node* nodes[NNODES], unsigned value)
: Cell(value)
{
@@ -61,7 +61,7 @@ TemplatePrism<NNODES,CELLPRISMTYPE>::TemplatePrism(Node* nodes[NNODES], unsigned
this->_volume = this->computeVolume();
}
-template<unsigned NNODES, CellType::type CELLPRISMTYPE>
+template<unsigned NNODES, CellType CELLPRISMTYPE>
TemplatePrism<NNODES,CELLPRISMTYPE>::TemplatePrism(std::array<Node*, NNODES> const& nodes,
unsigned value)
: Cell(value)
@@ -75,7 +75,7 @@ TemplatePrism<NNODES,CELLPRISMTYPE>::TemplatePrism(std::array<Node*, NNODES> con
this->_volume = this->computeVolume();
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
TemplatePrism<NNODES,CELLPRISMTYPE>::TemplatePrism(const TemplatePrism<NNODES,CELLPRISMTYPE> &prism)
: Cell(prism.getValue())
{
@@ -90,12 +90,12 @@ TemplatePrism<NNODES,CELLPRISMTYPE>::TemplatePrism(const TemplatePrism<NNODES,CE
_volume = prism.getVolume();
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
TemplatePrism<NNODES,CELLPRISMTYPE>::~TemplatePrism()
{
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
double TemplatePrism<NNODES,CELLPRISMTYPE>::computeVolume()
{
return MathLib::calcTetrahedronVolume(_nodes[0]->getCoords(), _nodes[1]->getCoords(), _nodes[2]->getCoords(), _nodes[3]->getCoords())
@@ -103,7 +103,7 @@ double TemplatePrism<NNODES,CELLPRISMTYPE>::computeVolume()
+ MathLib::calcTetrahedronVolume(_nodes[2]->getCoords(), _nodes[4]->getCoords(), _nodes[5]->getCoords(), _nodes[3]->getCoords());
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
const Element* TemplatePrism<NNODES,CELLPRISMTYPE>::getFace(unsigned i) const
{
if (i<this->getNFaces())
@@ -122,7 +122,7 @@ const Element* TemplatePrism<NNODES,CELLPRISMTYPE>::getFace(unsigned i) const
return NULL;
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::getNFaceNodes(unsigned i) const
{
if (i<5)
@@ -131,7 +131,7 @@ unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::getNFaceNodes(unsigned i) const
return 0;
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
bool TemplatePrism<NNODES,CELLPRISMTYPE>::isEdge(unsigned idx1, unsigned idx2) const
{
for (unsigned i(0); i<9; i++)
@@ -142,13 +142,13 @@ bool TemplatePrism<NNODES,CELLPRISMTYPE>::isEdge(unsigned idx1, unsigned idx2) c
return false;
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
Element* TemplatePrism<NNODES,CELLPRISMTYPE>::clone() const
{
return new TemplatePrism<NNODES,CELLPRISMTYPE>(*this);
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::identifyFace(Node* nodes[3]) const
{
for (unsigned i=0; i<5; i++)
@@ -164,7 +164,7 @@ unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::identifyFace(Node* nodes[3]) const
return std::numeric_limits<unsigned>::max();
}
-template <unsigned NNODES, CellType::type CELLPRISMTYPE>
+template <unsigned NNODES, CellType CELLPRISMTYPE>
Element* TemplatePrism<NNODES,CELLPRISMTYPE>::reviseElement() const
{
// try to create Pyramid
diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h
index 1d3d13bf82e595143f7a48678b060d5ec9a98760..e38d6e8c764c6d85d63414891d84c97c67dbc3fb 100644
--- a/MeshLib/Elements/TemplatePyramid.h
+++ b/MeshLib/Elements/TemplatePyramid.h
@@ -42,7 +42,7 @@ namespace MeshLib {
* 0
* @endcode
*/
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
class TemplatePyramid : public Cell
{
public:
@@ -87,9 +87,9 @@ public:
/**
* Get the type of the element in context of the finite element method.
- * @return a value of the enum CellType::type
+ * @return a value of the enum CellType
*/
- virtual CellType::type getCellType() const { return CELLPYRAMIDTYPE; }
+ virtual CellType getCellType() const { return CELLPYRAMIDTYPE; }
/// Returns true if these two indeces form an edge and false otherwise
bool isEdge(unsigned i, unsigned j) const;
diff --git a/MeshLib/Elements/TemplatePyramid.tpp b/MeshLib/Elements/TemplatePyramid.tpp
index 852f245d47185e9a1a1128c75b4826365b31be45..8efa44a025cb13bd3cc41fed003f96034c7cce4d 100644
--- a/MeshLib/Elements/TemplatePyramid.tpp
+++ b/MeshLib/Elements/TemplatePyramid.tpp
@@ -24,7 +24,7 @@
namespace MeshLib {
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
const unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::_face_nodes[5][4] =
{
{0, 1, 4, 99}, // Face 0
@@ -34,7 +34,7 @@ const unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::_face_nodes[5][4] =
{0, 3, 2, 1} // Face 4
};
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
const unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::_edge_nodes[8][2] =
{
{0, 1}, // Edge 0
@@ -47,10 +47,10 @@ const unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::_edge_nodes[8][2] =
{3, 4} // Edge 7
};
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
const unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::_n_face_nodes[5] = { 3, 3, 3, 3, 4 };
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::TemplatePyramid(Node* nodes[NNODES], unsigned value)
: Cell(value)
{
@@ -62,7 +62,7 @@ TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::TemplatePyramid(Node* nodes[NNODES], un
this->_volume = this->computeVolume();
}
-template<unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template<unsigned NNODES, CellType CELLPYRAMIDTYPE>
TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::TemplatePyramid(std::array<Node*, NNODES> const& nodes,
unsigned value)
: Cell(value)
@@ -76,7 +76,7 @@ TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::TemplatePyramid(std::array<Node*, NNODE
this->_volume = this->computeVolume();
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::TemplatePyramid(const TemplatePyramid<NNODES,CELLPYRAMIDTYPE> &pyramid)
: Cell(pyramid.getValue())
{
@@ -93,19 +93,19 @@ TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::TemplatePyramid(const TemplatePyramid<N
_volume = pyramid.getVolume();
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::~TemplatePyramid()
{
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
double TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::computeVolume()
{
return MathLib::calcTetrahedronVolume(_nodes[0]->getCoords(), _nodes[1]->getCoords(), _nodes[2]->getCoords(), _nodes[4]->getCoords())
+ MathLib::calcTetrahedronVolume(_nodes[2]->getCoords(), _nodes[3]->getCoords(), _nodes[0]->getCoords(), _nodes[4]->getCoords());
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
const Element* TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::getFace(unsigned i) const
{
if (i<this->getNFaces())
@@ -124,7 +124,7 @@ const Element* TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::getFace(unsigned i) cons
return NULL;
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::getNFaceNodes(unsigned i) const
{
if (i<5)
@@ -133,7 +133,7 @@ unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::getNFaceNodes(unsigned i) cons
return 0;
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
bool TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::isEdge(unsigned idx1, unsigned idx2) const
{
for (unsigned i(0); i<8; i++)
@@ -144,13 +144,13 @@ bool TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::isEdge(unsigned idx1, unsigned idx
return false;
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
Element* TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::clone() const
{
return new TemplatePyramid<NNODES,CELLPYRAMIDTYPE>(*this);
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::identifyFace(Node* nodes[3]) const
{
for (unsigned i=0; i<5; i++)
@@ -166,7 +166,7 @@ unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::identifyFace(Node* nodes[3]) c
return std::numeric_limits<unsigned>::max();
}
-template <unsigned NNODES, CellType::type CELLPYRAMIDTYPE>
+template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
Element* TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::reviseElement() const
{
// try to create tetrahedron
diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h
index 2258b638369ad01cf2ace801a7bd65601028fa2a..2962cffe73a1249d2880e4e6701ea908969e6277 100644
--- a/MeshLib/Elements/TemplateQuad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -36,7 +36,7 @@ namespace MeshLib {
* 0
* @endcode
*/
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
class TemplateQuad : public Face
{
public:
@@ -76,9 +76,9 @@ public:
/**
* Get the type of the element in context of the finite element method.
- * @return a value of the enum CellType::type
+ * @return a value of the enum CellType
*/
- virtual CellType::type getCellType() const { return CELLQUADTYPE; }
+ virtual CellType getCellType() const { return CELLQUADTYPE; }
/// Returns true if these two indeces form an edge and false otherwise
bool isEdge(unsigned i, unsigned j) const;
@@ -124,7 +124,7 @@ protected:
}; /* class */
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
const unsigned TemplateQuad<NNODES, CELLQUADTYPE>::_edge_nodes[4][2] =
{
{0, 1}, // Edge 0
diff --git a/MeshLib/Elements/TemplateQuad.tpp b/MeshLib/Elements/TemplateQuad.tpp
index 963eb9710cef4f06a1536552ee780adf013cc073..f632083310db0d93c5e1f96e238ae98fe0073742 100644
--- a/MeshLib/Elements/TemplateQuad.tpp
+++ b/MeshLib/Elements/TemplateQuad.tpp
@@ -24,7 +24,7 @@
namespace MeshLib
{
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
TemplateQuad<NNODES,CELLQUADTYPE>::TemplateQuad(Node* nodes[NNODES], unsigned value)
: Face(value)
{
@@ -36,7 +36,7 @@ TemplateQuad<NNODES,CELLQUADTYPE>::TemplateQuad(Node* nodes[NNODES], unsigned va
this->_area = this->computeVolume();
}
-template<unsigned NNODES, CellType::type CELLQUADTYPE>
+template<unsigned NNODES, CellType CELLQUADTYPE>
TemplateQuad<NNODES,CELLQUADTYPE>::TemplateQuad(std::array<Node*, NNODES> const& nodes,
unsigned value)
: Face(value)
@@ -50,7 +50,7 @@ TemplateQuad<NNODES,CELLQUADTYPE>::TemplateQuad(std::array<Node*, NNODES> const&
this->_area = this->computeVolume();
}
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
TemplateQuad<NNODES,CELLQUADTYPE>::TemplateQuad(const TemplateQuad<NNODES,CELLQUADTYPE> &quad)
: Face(quad.getValue())
{
@@ -67,19 +67,19 @@ TemplateQuad<NNODES,CELLQUADTYPE>::TemplateQuad(const TemplateQuad<NNODES,CELLQU
_area = quad.getArea();
}
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
TemplateQuad<NNODES,CELLQUADTYPE>::~TemplateQuad()
{
}
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
double TemplateQuad<NNODES,CELLQUADTYPE>::computeVolume()
{
return MathLib::calcTriangleArea(_nodes[0]->getCoords(), _nodes[1]->getCoords(), _nodes[2]->getCoords())
+ MathLib::calcTriangleArea(_nodes[2]->getCoords(), _nodes[3]->getCoords(), _nodes[0]->getCoords());
}
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
bool TemplateQuad<NNODES,CELLQUADTYPE>::isEdge(unsigned idx1, unsigned idx2) const
{
for (unsigned i(0); i<4; i++)
@@ -90,20 +90,20 @@ bool TemplateQuad<NNODES,CELLQUADTYPE>::isEdge(unsigned idx1, unsigned idx2) con
return false;
}
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
bool TemplateQuad<NNODES,CELLQUADTYPE>::isPntInside(GeoLib::Point const& pnt, double eps) const
{
return (GeoLib::isPointInTriangle(pnt, *_nodes[0], *_nodes[1], *_nodes[2], eps) ||
GeoLib::isPointInTriangle(pnt, *_nodes[0], *_nodes[2], *_nodes[3], eps));
}
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
Element* TemplateQuad<NNODES,CELLQUADTYPE>::clone() const
{
return new TemplateQuad(*this);
}
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
unsigned TemplateQuad<NNODES,CELLQUADTYPE>::identifyFace(Node* nodes[3]) const
{
for (unsigned i=0; i<4; i++)
@@ -119,7 +119,7 @@ unsigned TemplateQuad<NNODES,CELLQUADTYPE>::identifyFace(Node* nodes[3]) const
return std::numeric_limits<unsigned>::max();
}
-template <unsigned NNODES, CellType::type CELLQUADTYPE>
+template <unsigned NNODES, CellType CELLQUADTYPE>
Element* TemplateQuad<NNODES,CELLQUADTYPE>::reviseElement() const
{
if (_nodes[0] == _nodes[1] || _nodes[1] == _nodes[2]) {
diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h
index 86797d1ff394035461bff344a1ec49df3afb61f5..72bc27b896167183cf4193571cdf44224270d17b 100644
--- a/MeshLib/Elements/TemplateTet.h
+++ b/MeshLib/Elements/TemplateTet.h
@@ -41,7 +41,7 @@ namespace MeshLib {
*
* @endcode
*/
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
class TemplateTet : public Cell
{
public:
@@ -86,9 +86,9 @@ public:
/**
* Get the type of the element in context of the finite element method.
- * @return a value of the enum CellType::type
+ * @return a value of the enum CellType
*/
- virtual CellType::type getCellType() const { return CELLTETTYPE; }
+ virtual CellType getCellType() const { return CELLTETTYPE; }
/// Returns true if these two indeces form an edge and false otherwise
bool isEdge(unsigned i, unsigned j) const;
diff --git a/MeshLib/Elements/TemplateTet.tpp b/MeshLib/Elements/TemplateTet.tpp
index 030c6cdb50b037d685e2fb892150d185d8ee6a36..bb88d8c463150e0776deba20ed0739c1df5ee2cd 100644
--- a/MeshLib/Elements/TemplateTet.tpp
+++ b/MeshLib/Elements/TemplateTet.tpp
@@ -21,7 +21,7 @@
namespace MeshLib {
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
const unsigned TemplateTet<NNODES,CELLTETTYPE>::_face_nodes[4][3] =
{
{0, 2, 1}, // Face 0
@@ -30,7 +30,7 @@ const unsigned TemplateTet<NNODES,CELLTETTYPE>::_face_nodes[4][3] =
{2, 0, 3} // Face 3
};
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
const unsigned TemplateTet<NNODES,CELLTETTYPE>::_edge_nodes[6][2] =
{
{0, 1}, // Edge 0
@@ -41,7 +41,7 @@ const unsigned TemplateTet<NNODES,CELLTETTYPE>::_edge_nodes[6][2] =
{2, 3} // Edge 5
};
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
TemplateTet<NNODES,CELLTETTYPE>::TemplateTet(Node* nodes[NNODES], unsigned value)
: Cell(value)
{
@@ -53,7 +53,7 @@ TemplateTet<NNODES,CELLTETTYPE>::TemplateTet(Node* nodes[NNODES], unsigned value
this->_volume = this->computeVolume();
}
-template<unsigned NNODES, CellType::type CELLTETTYPE>
+template<unsigned NNODES, CellType CELLTETTYPE>
TemplateTet<NNODES,CELLTETTYPE>::TemplateTet(std::array<Node*, NNODES> const& nodes,
unsigned value)
: Cell(value)
@@ -67,7 +67,7 @@ TemplateTet<NNODES,CELLTETTYPE>::TemplateTet(std::array<Node*, NNODES> const& no
this->_volume = this->computeVolume();
}
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
TemplateTet<NNODES,CELLTETTYPE>::TemplateTet(const TemplateTet<NNODES,CELLTETTYPE> &tet)
: Cell(tet.getValue())
{
@@ -85,18 +85,18 @@ TemplateTet<NNODES,CELLTETTYPE>::TemplateTet(const TemplateTet<NNODES,CELLTETTYP
_volume = tet.getVolume();
}
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
TemplateTet<NNODES,CELLTETTYPE>::~TemplateTet()
{
}
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
double TemplateTet<NNODES,CELLTETTYPE>::computeVolume()
{
return MathLib::calcTetrahedronVolume(_nodes[0]->getCoords(), _nodes[1]->getCoords(), _nodes[2]->getCoords(), _nodes[3]->getCoords());
}
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
const Element* TemplateTet<NNODES,CELLTETTYPE>::getFace(unsigned i) const
{
if (i<this->getNFaces())
@@ -111,7 +111,7 @@ const Element* TemplateTet<NNODES,CELLTETTYPE>::getFace(unsigned i) const
return NULL;
}
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
bool TemplateTet<NNODES,CELLTETTYPE>::isEdge(unsigned idx1, unsigned idx2) const
{
for (unsigned i(0); i<6; i++)
@@ -122,13 +122,13 @@ bool TemplateTet<NNODES,CELLTETTYPE>::isEdge(unsigned idx1, unsigned idx2) const
return false;
}
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
Element* TemplateTet<NNODES,CELLTETTYPE>::clone() const
{
return new TemplateTet<NNODES,CELLTETTYPE>(*this);
}
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
unsigned TemplateTet<NNODES,CELLTETTYPE>::identifyFace(Node* nodes[3]) const
{
for (unsigned i=0; i<4; i++)
@@ -144,7 +144,7 @@ unsigned TemplateTet<NNODES,CELLTETTYPE>::identifyFace(Node* nodes[3]) const
return std::numeric_limits<unsigned>::max();
}
-template <unsigned NNODES, CellType::type CELLTETTYPE>
+template <unsigned NNODES, CellType CELLTETTYPE>
Element* TemplateTet<NNODES,CELLTETTYPE>::reviseElement() const
{
if (_nodes[0] == _nodes[1] || _nodes[1] == _nodes[2]) {
diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h
index e19ffc9c6dcb6fae5fe86cf55974473549869346..cad54f56a0bfbce45e09adfee8a389f261417dc1 100644
--- a/MeshLib/Elements/TemplateTri.h
+++ b/MeshLib/Elements/TemplateTri.h
@@ -43,7 +43,7 @@ namespace MeshLib {
*
* @endcode
*/
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
class TemplateTri : public Face
{
public:
@@ -79,9 +79,9 @@ public:
/**
* Get the type of the element in context of the finite element method.
- * @return a value of the enum CellType::type
+ * @return a value of the enum CellType
*/
- virtual CellType::type getCellType() const { return CELLTRITYPE; }
+ virtual CellType getCellType() const { return CELLTRITYPE; }
/// Returns true if these two indices form an edge and false otherwise
bool isEdge(unsigned idx1, unsigned idx2) const;
@@ -134,7 +134,7 @@ protected:
static const unsigned _edge_nodes[3][2];
}; /* class */
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
const unsigned TemplateTri<NNODES,CELLTRITYPE>::_edge_nodes[3][2] = {
{0, 1}, // Edge 0
{1, 2}, // Edge 1
diff --git a/MeshLib/Elements/TemplateTri.tpp b/MeshLib/Elements/TemplateTri.tpp
index c9bc2567e1e0f674811bf15ace9ba6e458fdea4d..d719be6fe039e2e12c6d78a49037bceffe9e43eb 100644
--- a/MeshLib/Elements/TemplateTri.tpp
+++ b/MeshLib/Elements/TemplateTri.tpp
@@ -17,7 +17,7 @@
namespace MeshLib {
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
TemplateTri<NNODES,CELLTRITYPE>::TemplateTri(Node* nodes[NNODES], unsigned value) :
Face(value)
{
@@ -27,7 +27,7 @@ TemplateTri<NNODES,CELLTRITYPE>::TemplateTri(Node* nodes[NNODES], unsigned value
this->_area = this->computeVolume();
}
-template<unsigned NNODES, CellType::type CELLTRITYPE>
+template<unsigned NNODES, CellType CELLTRITYPE>
TemplateTri<NNODES,CELLTRITYPE>::TemplateTri(std::array<Node*, NNODES> const& nodes,
unsigned value)
: Face(value)
@@ -41,7 +41,7 @@ TemplateTri<NNODES,CELLTRITYPE>::TemplateTri(std::array<Node*, NNODES> const& no
this->_area = this->computeVolume();
}
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
TemplateTri<NNODES,CELLTRITYPE>::TemplateTri(const TemplateTri<NNODES,CELLTRITYPE> &tri) :
Face(tri.getValue())
{
@@ -59,11 +59,11 @@ TemplateTri<NNODES,CELLTRITYPE>::TemplateTri(const TemplateTri<NNODES,CELLTRITYP
_area = tri.getArea();
}
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
TemplateTri<NNODES,CELLTRITYPE>::~TemplateTri()
{}
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
bool TemplateTri<NNODES,CELLTRITYPE>::isEdge(unsigned idx1, unsigned idx2) const
{
for (unsigned i(0); i<3; i++)
@@ -74,13 +74,13 @@ bool TemplateTri<NNODES,CELLTRITYPE>::isEdge(unsigned idx1, unsigned idx2) const
return false;
}
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
bool TemplateTri<NNODES,CELLTRITYPE>::isPntInside(GeoLib::Point const& pnt, double eps) const
{
return GeoLib::isPointInTriangle(pnt, *_nodes[0], *_nodes[1], *_nodes[2], eps);
}
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
Element* TemplateTri<NNODES,CELLTRITYPE>::reviseElement() const
{
// try to create an edge
@@ -101,7 +101,7 @@ Element* TemplateTri<NNODES,CELLTRITYPE>::reviseElement() const
return NULL;
}
-template <unsigned NNODES, CellType::type CELLTRITYPE>
+template <unsigned NNODES, CellType CELLTRITYPE>
unsigned TemplateTri<NNODES,CELLTRITYPE>::identifyFace(Node* nodes[3]) const
{
for (unsigned i=0; i<3; i++)
diff --git a/MeshLib/MeshEnums.h b/MeshLib/MeshEnums.h
index 823a6cb36190129a150e477eafb51242877b31db..d4f72d4d5f7053d6e8d83ac6199515682f4578cd 100644
--- a/MeshLib/MeshEnums.h
+++ b/MeshLib/MeshEnums.h
@@ -35,27 +35,25 @@ enum class MeshElemType
/**
* \brief Types of mesh elements supported by OpenGeoSys.
*/
-struct CellType
+enum class CellType
{
- enum type {
- INVALID,
- EDGE2,
- EDGE3,
- TRI3,
- TRI6,
- QUAD4,
- QUAD8,
- QUAD9,
- TET4,
- TET10,
- HEX8,
- HEX20,
- HEX27,
- PRISM6,
- PRISM15,
- PRISM18,
- PYRAMID5
- };
+ INVALID,
+ EDGE2,
+ EDGE3,
+ TRI3,
+ TRI6,
+ QUAD4,
+ QUAD8,
+ QUAD9,
+ TET4,
+ TET10,
+ HEX8,
+ HEX20,
+ HEX27,
+ PRISM6,
+ PRISM15,
+ PRISM18,
+ PYRAMID5
};
/**