Skip to content
Snippets Groups Projects
Commit a928ba37 authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge pull request #403 from norihiro-w/fix-fe_errors 

fix compiling errors in MSVC
parents 296f8cd6 70622a2a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 30 deletions
MeshLib/Elements/TemplateHex-impl.h
+ 2
− 2
View file @ a928ba37
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
namespace MeshLib { namespace MeshLib {
template <unsigned NNODES, CellType CELLHEXTYPE> template <unsigned NNODES, CellType CELLHEXTYPE>
const unsigned TemplateHex<NNODES, CELLHEXTYPE>::n_all_nodes = NNODES; const unsigned TemplateHex<NNODES, CELLHEXTYPE>::n_all_nodes;
template <unsigned NNODES, CellType CELLHEXTYPE> template <unsigned NNODES, CellType CELLHEXTYPE>
const unsigned TemplateHex<NNODES, CELLHEXTYPE>::n_base_nodes = 8; const unsigned TemplateHex<NNODES, CELLHEXTYPE>::n_base_nodes;
template <unsigned NNODES, CellType CELLHEXTYPE> template <unsigned NNODES, CellType CELLHEXTYPE>
const unsigned TemplateHex<NNODES,CELLHEXTYPE>::_face_nodes[6][4] = const unsigned TemplateHex<NNODES,CELLHEXTYPE>::_face_nodes[6][4] =
......
MeshLib/Elements/TemplateHex.h
+ 2
− 2
View file @ a928ba37
...@@ -51,10 +51,10 @@ class TemplateHex : public Cell ...@@ -51,10 +51,10 @@ class TemplateHex : public Cell
{ {
public: public:
/// Constant: The number of all nodes for this element /// Constant: The number of all nodes for this element
static const unsigned n_all_nodes; static const unsigned n_all_nodes = NNODES;
/// Constant: The number of base nodes for this element /// Constant: The number of base nodes for this element
static const unsigned n_base_nodes; static const unsigned n_base_nodes = 8u;
/// Constructor with an array of mesh nodes. /// Constructor with an array of mesh nodes.
TemplateHex(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max()); TemplateHex(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max());
......
MeshLib/Elements/TemplateLine-impl.h
+ 3
− 3
View file @ a928ba37
...@@ -64,13 +64,13 @@ ElementErrorCode TemplateLine<NNODES,CELLLINETYPE>::validate() const ...@@ -64,13 +64,13 @@ ElementErrorCode TemplateLine<NNODES,CELLLINETYPE>::validate() const
} }
template <unsigned NNODES, CellType CELLLINETYPE> template <unsigned NNODES, CellType CELLLINETYPE>
const unsigned TemplateLine<NNODES, CELLLINETYPE>::dimension = 1u; const unsigned TemplateLine<NNODES, CELLLINETYPE>::dimension;
template <unsigned NNODES, CellType CELLLINETYPE> template <unsigned NNODES, CellType CELLLINETYPE>
const unsigned TemplateLine<NNODES, CELLLINETYPE>::n_all_nodes = NNODES; const unsigned TemplateLine<NNODES, CELLLINETYPE>::n_all_nodes;
template <unsigned NNODES, CellType CELLLINETYPE> template <unsigned NNODES, CellType CELLLINETYPE>
const unsigned TemplateLine<NNODES, CELLLINETYPE>::n_base_nodes = 2u; const unsigned TemplateLine<NNODES, CELLLINETYPE>::n_base_nodes;
} // namespace MeshLib } // namespace MeshLib
MeshLib/Elements/TemplateLine.h
+ 3
− 3
View file @ a928ba37
...@@ -39,13 +39,13 @@ class TemplateLine : public Element ...@@ -39,13 +39,13 @@ class TemplateLine : public Element
{ {
public: public:
/// Constant: Dimension of this mesh element /// Constant: Dimension of this mesh element
static const unsigned dimension; static const unsigned dimension = 1u;
/// Constant: The number of all nodes for this element /// Constant: The number of all nodes for this element
static const unsigned n_all_nodes; static const unsigned n_all_nodes = NNODES;
/// Constant: The number of base nodes for this element /// Constant: The number of base nodes for this element
static const unsigned n_base_nodes; static const unsigned n_base_nodes = 2u;
/// Constructor with an array of mesh nodes. /// Constructor with an array of mesh nodes.
TemplateLine(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max()); TemplateLine(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max());
......
MeshLib/Elements/TemplatePrism-impl.h
+ 2
− 2
View file @ a928ba37
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
namespace MeshLib { namespace MeshLib {
template <unsigned NNODES, CellType CELLPRISMTYPE> template <unsigned NNODES, CellType CELLPRISMTYPE>
const unsigned TemplatePrism<NNODES, CELLPRISMTYPE>::n_all_nodes = NNODES; const unsigned TemplatePrism<NNODES, CELLPRISMTYPE>::n_all_nodes;
template <unsigned NNODES, CellType CELLPRISMTYPE> template <unsigned NNODES, CellType CELLPRISMTYPE>
const unsigned TemplatePrism<NNODES, CELLPRISMTYPE>::n_base_nodes = 6; const unsigned TemplatePrism<NNODES, CELLPRISMTYPE>::n_base_nodes;
template <unsigned NNODES, CellType CELLPRISMTYPE> template <unsigned NNODES, CellType CELLPRISMTYPE>
const unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::_face_nodes[5][4] = const unsigned TemplatePrism<NNODES,CELLPRISMTYPE>::_face_nodes[5][4] =
......
MeshLib/Elements/TemplatePrism.h
+ 2
− 2
View file @ a928ba37
...@@ -49,10 +49,10 @@ class TemplatePrism : public Cell ...@@ -49,10 +49,10 @@ class TemplatePrism : public Cell
{ {
public: public:
/// Constant: The number of all nodes for this element /// Constant: The number of all nodes for this element
static const unsigned n_all_nodes; static const unsigned n_all_nodes = NNODES;
/// Constant: The number of base nodes for this element /// Constant: The number of base nodes for this element
static const unsigned n_base_nodes; static const unsigned n_base_nodes = 6u;
/// Constructor with an array of mesh nodes. /// Constructor with an array of mesh nodes.
TemplatePrism(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max()); TemplatePrism(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max());
......
MeshLib/Elements/TemplatePyramid-impl.h
+ 2
− 2
View file @ a928ba37
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
namespace MeshLib { namespace MeshLib {
template <unsigned NNODES, CellType CELLPYRAMIDTYPE> template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
const unsigned TemplatePyramid<NNODES, CELLPYRAMIDTYPE>::n_all_nodes = NNODES; const unsigned TemplatePyramid<NNODES, CELLPYRAMIDTYPE>::n_all_nodes;
template <unsigned NNODES, CellType CELLPYRAMIDTYPE> template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
const unsigned TemplatePyramid<NNODES, CELLPYRAMIDTYPE>::n_base_nodes = 5; const unsigned TemplatePyramid<NNODES, CELLPYRAMIDTYPE>::n_base_nodes;
template <unsigned NNODES, CellType CELLPYRAMIDTYPE> template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
const unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::_face_nodes[5][4] = const unsigned TemplatePyramid<NNODES,CELLPYRAMIDTYPE>::_face_nodes[5][4] =
......
MeshLib/Elements/TemplatePyramid.h
+ 2
− 2
View file @ a928ba37
...@@ -47,10 +47,10 @@ class TemplatePyramid : public Cell ...@@ -47,10 +47,10 @@ class TemplatePyramid : public Cell
{ {
public: public:
/// Constant: The number of all nodes for this element /// Constant: The number of all nodes for this element
static const unsigned n_all_nodes; static const unsigned n_all_nodes = NNODES;
/// Constant: The number of base nodes for this element /// Constant: The number of base nodes for this element
static const unsigned n_base_nodes; static const unsigned n_base_nodes = 5u;
/// Constructor with an array of mesh nodes. /// Constructor with an array of mesh nodes.
TemplatePyramid(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max()); TemplatePyramid(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max());
......
MeshLib/Elements/TemplateQuad-impl.h
+ 2
− 2
View file @ a928ba37
...@@ -25,10 +25,10 @@ namespace MeshLib ...@@ -25,10 +25,10 @@ namespace MeshLib
{ {
template <unsigned NNODES, CellType CELLQUADTYPE> template <unsigned NNODES, CellType CELLQUADTYPE>
const unsigned TemplateQuad<NNODES, CELLQUADTYPE>::n_all_nodes = NNODES; const unsigned TemplateQuad<NNODES, CELLQUADTYPE>::n_all_nodes;
template <unsigned NNODES, CellType CELLQUADTYPE> template <unsigned NNODES, CellType CELLQUADTYPE>
const unsigned TemplateQuad<NNODES, CELLQUADTYPE>::n_base_nodes = 4; const unsigned TemplateQuad<NNODES, CELLQUADTYPE>::n_base_nodes;
template <unsigned NNODES, CellType CELLQUADTYPE> template <unsigned NNODES, CellType CELLQUADTYPE>
const unsigned TemplateQuad<NNODES, CELLQUADTYPE>::_edge_nodes[4][2] = const unsigned TemplateQuad<NNODES, CELLQUADTYPE>::_edge_nodes[4][2] =
......
MeshLib/Elements/TemplateQuad.h
+ 2
− 2
View file @ a928ba37
...@@ -41,10 +41,10 @@ class TemplateQuad : public Face ...@@ -41,10 +41,10 @@ class TemplateQuad : public Face
{ {
public: public:
/// Constant: The number of all nodes for this element /// Constant: The number of all nodes for this element
static const unsigned n_all_nodes; static const unsigned n_all_nodes = NNODES;
/// Constant: The number of base nodes for this element /// Constant: The number of base nodes for this element
static const unsigned n_base_nodes; static const unsigned n_base_nodes = 4u;
/// Constructor with an array of mesh nodes. /// Constructor with an array of mesh nodes.
TemplateQuad(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max()); TemplateQuad(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max());
......
MeshLib/Elements/TemplateTet-impl.h
+ 2
− 2
View file @ a928ba37
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
namespace MeshLib { namespace MeshLib {
template <unsigned NNODES, CellType CELLTETTYPE> template <unsigned NNODES, CellType CELLTETTYPE>
const unsigned TemplateTet<NNODES, CELLTETTYPE>::n_all_nodes = NNODES; const unsigned TemplateTet<NNODES, CELLTETTYPE>::n_all_nodes;
template <unsigned NNODES, CellType CELLTETTYPE> template <unsigned NNODES, CellType CELLTETTYPE>
const unsigned TemplateTet<NNODES, CELLTETTYPE>::n_base_nodes = 4; const unsigned TemplateTet<NNODES, CELLTETTYPE>::n_base_nodes;
template <unsigned NNODES, CellType CELLTETTYPE> template <unsigned NNODES, CellType CELLTETTYPE>
const unsigned TemplateTet<NNODES,CELLTETTYPE>::_face_nodes[4][3] = const unsigned TemplateTet<NNODES,CELLTETTYPE>::_face_nodes[4][3] =
......
MeshLib/Elements/TemplateTet.h
+ 2
− 2
View file @ a928ba37
...@@ -46,10 +46,10 @@ class TemplateTet : public Cell ...@@ -46,10 +46,10 @@ class TemplateTet : public Cell
{ {
public: public:
/// Constant: The number of all nodes for this element /// Constant: The number of all nodes for this element
static const unsigned n_all_nodes; static const unsigned n_all_nodes = NNODES;
/// Constant: The number of base nodes for this element /// Constant: The number of base nodes for this element
static const unsigned n_base_nodes; static const unsigned n_base_nodes = 4u;
/// Constructor with an array of mesh nodes. /// Constructor with an array of mesh nodes.
TemplateTet(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max()); TemplateTet(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max());
......
MeshLib/Elements/TemplateTri-impl.h
+ 2
− 2
View file @ a928ba37
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
namespace MeshLib { namespace MeshLib {
template <unsigned NNODES, CellType CELLTRITYPE> template <unsigned NNODES, CellType CELLTRITYPE>
const unsigned TemplateTri<NNODES, CELLTRITYPE>::n_all_nodes = NNODES; const unsigned TemplateTri<NNODES, CELLTRITYPE>::n_all_nodes;
template <unsigned NNODES, CellType CELLTRITYPE> template <unsigned NNODES, CellType CELLTRITYPE>
const unsigned TemplateTri<NNODES, CELLTRITYPE>::n_base_nodes = 3; const unsigned TemplateTri<NNODES, CELLTRITYPE>::n_base_nodes;
template <unsigned NNODES, CellType CELLTRITYPE> template <unsigned NNODES, CellType CELLTRITYPE>
const unsigned TemplateTri<NNODES,CELLTRITYPE>::_edge_nodes[3][2] = { const unsigned TemplateTri<NNODES,CELLTRITYPE>::_edge_nodes[3][2] = {
......
MeshLib/Elements/TemplateTri.h
+ 2
− 2
View file @ a928ba37
...@@ -48,10 +48,10 @@ class TemplateTri : public Face ...@@ -48,10 +48,10 @@ class TemplateTri : public Face
{ {
public: public:
/// Constant: The number of all nodes for this element /// Constant: The number of all nodes for this element
static const unsigned n_all_nodes; static const unsigned n_all_nodes = NNODES;
/// Constant: The number of base nodes for this element /// Constant: The number of base nodes for this element
static const unsigned n_base_nodes; static const unsigned n_base_nodes = 3u;
/// Constructor with an array of mesh nodes. /// Constructor with an array of mesh nodes.
TemplateTri(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max()); TemplateTri(Node* nodes[NNODES], unsigned value = 0, std::size_t id = std::numeric_limits<std::size_t>::max());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment