Skip to content

Commit 36c25c2

Browse files
committed
missing enum simplification in Hexa
1 parent 9cfc283 commit 36c25c2

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

Common/include/geometry/primal_grid/CHexahedron.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
* See CPrimalGridWithConnectivity.
3636
*/
3737
struct CHexahedronConnectivity {
38-
static constexpr unsigned short nNodes = N_POINTS_HEXAHEDRON;
39-
static constexpr unsigned short nFaces = N_FACES_HEXAHEDRON;
38+
enum { nNodes = N_POINTS_HEXAHEDRON };
39+
enum { nFaces = N_FACES_HEXAHEDRON };
40+
enum { maxNodesFace = N_POINTS_QUADRILATERAL };
41+
enum { VTK_Type = HEXAHEDRON };
4042
static constexpr unsigned short nNodesFace[6] = {4,4,4,4,4,4};
41-
static constexpr unsigned short maxNodesFace = 4;
4243
static constexpr unsigned short Faces[6][4] = {{0,1,5,4},{1,2,6,5},{2,3,7,6},{3,0,4,7},{0,3,2,1},{4,5,6,7}};
4344
static constexpr unsigned short nNeighbor_Nodes[8] = {3,3,3,3,3,3,3,3};
4445
static constexpr unsigned short Neighbor_Nodes[8][3] = {{1,3,4},{0,2,5},{1,3,6},{0,2,7},{0,5,7},{4,6,1},{2,5,7},{4,3,6}};
45-
static constexpr unsigned short VTK_Type = 12;
4646
};
4747

4848
/*!

Common/src/geometry/primal_grid/CHexahedron.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,10 @@
2828
#include "../../../include/geometry/primal_grid/CHexahedron.hpp"
2929
#include "../../../include/option_structure.hpp"
3030

31-
constexpr unsigned short CHexahedronConnectivity::nNodes;
32-
constexpr unsigned short CHexahedronConnectivity::nFaces;
3331
constexpr unsigned short CHexahedronConnectivity::nNodesFace[6];
34-
constexpr unsigned short CHexahedronConnectivity::maxNodesFace;
3532
constexpr unsigned short CHexahedronConnectivity::Faces[6][4];
3633
constexpr unsigned short CHexahedronConnectivity::nNeighbor_Nodes[8];
3734
constexpr unsigned short CHexahedronConnectivity::Neighbor_Nodes[8][3];
38-
constexpr unsigned short CHexahedronConnectivity::VTK_Type;
3935

4036
CHexahedron::CHexahedron(unsigned long val_point_0, unsigned long val_point_1,
4137
unsigned long val_point_2, unsigned long val_point_3,

0 commit comments

Comments
 (0)