diff --git a/MeshLib/Elements/Cell.cpp b/MeshLib/Elements/Cell.cpp index 357d89784e7130879808e24f37103fe6c61d7dbe..a3cfe0b11f9de4d98c355ca753a4d128dbb2014b 100644 --- a/MeshLib/Elements/Cell.cpp +++ b/MeshLib/Elements/Cell.cpp @@ -19,7 +19,7 @@ namespace MeshLib { -constexpr unsigned Cell::dimension; +const unsigned Cell::dimension; /* Cell::Cell(Node** nodes, MeshElemType type, unsigned value) : Element(nodes, type, value) diff --git a/MeshLib/Elements/Cell.h b/MeshLib/Elements/Cell.h index 150a46b0ea540be4afae3c640d830e5b6891cc2c..d64fe479870d83307108041b9f10a9828835ace3 100644 --- a/MeshLib/Elements/Cell.h +++ b/MeshLib/Elements/Cell.h @@ -27,7 +27,7 @@ class Cell : public Element { public: /// Constant: Dimension of this mesh element - static constexpr unsigned dimension = 3; + static const unsigned dimension = 3; /// Returns the length, area or volume of a 1D, 2D or 3D element double getContent() const { return _volume; }; diff --git a/MeshLib/Elements/Face.cpp b/MeshLib/Elements/Face.cpp index dfd145af46b5f57517925f5ad21e790bf7de8d6a..ec028db5e1feb4e053fe09748e3eb8a68e2fafd6 100644 --- a/MeshLib/Elements/Face.cpp +++ b/MeshLib/Elements/Face.cpp @@ -21,7 +21,7 @@ namespace MeshLib { -constexpr unsigned Face::dimension; +const unsigned Face::dimension; /* Face::Face(Node** nodes, MeshElemType type, unsigned value) diff --git a/MeshLib/Elements/Face.h b/MeshLib/Elements/Face.h index 1bc0b8c452a27919470ffc2b0b655221e6006320..70efd57ba698cd99a926bd68ffcad511528c4644 100644 --- a/MeshLib/Elements/Face.h +++ b/MeshLib/Elements/Face.h @@ -32,7 +32,7 @@ class Face : public Element { public: /// Constant: Dimension of this mesh element - static constexpr unsigned dimension = 2; + static const unsigned dimension = 2; /// Get the area of this 2d element. virtual double getArea() const { return _area; }; diff --git a/NumLib/Fem/ShapeFunction/ShapeHex8.h b/NumLib/Fem/ShapeFunction/ShapeHex8.h index a04325c26e4fde2312c157d7c91d9c8f6ea5f26b..b2a62c8805586364f4aeaf7771f01bf035507e74 100644 --- a/NumLib/Fem/ShapeFunction/ShapeHex8.h +++ b/NumLib/Fem/ShapeFunction/ShapeHex8.h @@ -59,8 +59,8 @@ public: static void computeGradShapeFunction(const T_X &r, T_N &dN); using MeshElement = MeshLib::Hex; - static constexpr std::size_t DIM = MeshElement::dimension; - static constexpr std::size_t NPOINTS = MeshElement::n_all_nodes; + static const std::size_t DIM = MeshElement::dimension; + static const std::size_t NPOINTS = MeshElement::n_all_nodes; }; } diff --git a/NumLib/Fem/ShapeFunction/ShapeLine2.h b/NumLib/Fem/ShapeFunction/ShapeLine2.h index 3f7974f2010b07cd1f0640b4d5e34b899079678c..9d8cb902e4636fd2f708054a1ea2e1a4ef802b45 100644 --- a/NumLib/Fem/ShapeFunction/ShapeLine2.h +++ b/NumLib/Fem/ShapeFunction/ShapeLine2.h @@ -45,8 +45,8 @@ public: static void computeGradShapeFunction(const T_X &r, T_N &dN); using MeshElement = MeshLib::Line; - static constexpr std::size_t DIM = MeshElement::dimension; - static constexpr std::size_t NPOINTS = MeshElement::n_all_nodes; + static const std::size_t DIM = MeshElement::dimension; + static const std::size_t NPOINTS = MeshElement::n_all_nodes; }; } diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad4.h b/NumLib/Fem/ShapeFunction/ShapeQuad4.h index 5da243edddb1628678dd3c146ab7d0211e8add81..10c14fb4988a0d75919336eb1d2d3ec0417f3f3b 100644 --- a/NumLib/Fem/ShapeFunction/ShapeQuad4.h +++ b/NumLib/Fem/ShapeFunction/ShapeQuad4.h @@ -53,8 +53,8 @@ public: static void computeGradShapeFunction(const T_X &r, T_N &dN); using MeshElement = MeshLib::Quad; - static constexpr std::size_t DIM = MeshElement::dimension; - static constexpr std::size_t NPOINTS = MeshElement::n_all_nodes; + static const std::size_t DIM = MeshElement::dimension; + static const std::size_t NPOINTS = MeshElement::n_all_nodes; }; } diff --git a/NumLib/Fem/ShapeFunction/ShapeTri3.h b/NumLib/Fem/ShapeFunction/ShapeTri3.h index d5148e3fdd7b0b8c19be305091140a04384ad5a5..74e6e43fd1a4650847fd8cc473222c1b7c3d3751 100644 --- a/NumLib/Fem/ShapeFunction/ShapeTri3.h +++ b/NumLib/Fem/ShapeFunction/ShapeTri3.h @@ -53,8 +53,8 @@ public: static void computeGradShapeFunction(const T_X &/*r*/, T_N &dN6); using MeshElement = MeshLib::Tri; - static constexpr std::size_t DIM = MeshElement::dimension; - static constexpr std::size_t NPOINTS = MeshElement::n_all_nodes; + static const std::size_t DIM = MeshElement::dimension; + static const std::size_t NPOINTS = MeshElement::n_all_nodes; }; }