From: Peter Munch Date: Mon, 19 Dec 2022 22:38:04 +0000 (+0100) Subject: Some refactoring in connectivity.h X-Git-Tag: v9.5.0-rc1~720^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14590%2Fhead;p=dealii.git Some refactoring in connectivity.h --- diff --git a/include/deal.II/grid/connectivity.h b/include/deal.II/grid/connectivity.h index d4264bf045..d964a87fd2 100644 --- a/include/deal.II/grid/connectivity.h +++ b/include/deal.II/grid/connectivity.h @@ -177,7 +177,7 @@ namespace internal /** * Implementation for triangles. */ - struct CellTypeTri : public CellTypeBase + struct CellTypeTriangle : public CellTypeBase { dealii::ArrayView vertices_of_entity(const unsigned int d, @@ -234,7 +234,7 @@ namespace internal /** * Implementation for quadrilaterals. */ - struct CellTypeQuad : public CellTypeBase + struct CellTypeQuadrilateral : public CellTypeBase { dealii::ArrayView vertices_of_entity(const unsigned int d, @@ -291,7 +291,7 @@ namespace internal /** * Implementation for tetrahedrons. */ - struct CellTypeTet : public CellTypeBase + struct CellTypeTetrahedron : public CellTypeBase { dealii::ArrayView vertices_of_entity(const unsigned int d, @@ -639,7 +639,7 @@ namespace internal /** * Implementation for hexahedra. */ - struct CellTypeHex : public CellTypeBase + struct CellTypeHexahedron : public CellTypeBase { dealii::ArrayView vertices_of_entity(const unsigned int d, @@ -1450,26 +1450,23 @@ namespace internal std::vector> cell_types_impl(8); cell_types_impl[static_cast( - dealii::ReferenceCells::Line)] - .reset(new CellTypeLine()); + dealii::ReferenceCells::Line)] = std::make_shared(); cell_types_impl[static_cast( - dealii::ReferenceCells::Triangle)] - .reset(new CellTypeTri()); + dealii::ReferenceCells::Triangle)] = + std::make_shared(); cell_types_impl[static_cast( - dealii::ReferenceCells::Quadrilateral)] - .reset(new CellTypeQuad()); + dealii::ReferenceCells::Quadrilateral)] = + std::make_shared(); cell_types_impl[static_cast( - dealii::ReferenceCells::Tetrahedron)] - .reset(new CellTypeTet()); + dealii::ReferenceCells::Tetrahedron)] = + std::make_shared(); cell_types_impl[static_cast( - dealii::ReferenceCells::Pyramid)] - .reset(new CellTypePyramid()); + dealii::ReferenceCells::Pyramid)] = std::make_shared(); cell_types_impl[static_cast( - dealii::ReferenceCells::Wedge)] - .reset(new CellTypeWedge()); + dealii::ReferenceCells::Wedge)] = std::make_shared(); cell_types_impl[static_cast( - dealii::ReferenceCells::Hexahedron)] - .reset(new CellTypeHex()); + dealii::ReferenceCells::Hexahedron)] = + std::make_shared(); // determine cell types and process vertices std::vector cell_vertices;