From: David Wells Date: Sat, 21 Jan 2023 18:56:03 +0000 (-0500) Subject: dealii::ReferenceCells -> ReferenceCells X-Git-Tag: v9.5.0-rc1~626^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14706%2Fhead;p=dealii.git dealii::ReferenceCells -> ReferenceCells --- diff --git a/include/deal.II/cgal/utilities.h b/include/deal.II/cgal/utilities.h index aea14f150c..bca24647f8 100644 --- a/include/deal.II/cgal/utilities.h +++ b/include/deal.II/cgal/utilities.h @@ -231,10 +231,10 @@ namespace CGALWrappers const unsigned int degree, const BooleanOperation & bool_op, const Mapping &mapping0 = - (dealii::ReferenceCells::get_hypercube() + (ReferenceCells::get_hypercube() .template get_default_linear_mapping()), const Mapping &mapping1 = - (dealii::ReferenceCells::get_hypercube() + (ReferenceCells::get_hypercube() .template get_default_linear_mapping())); /** diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h index 02bf7e461c..f27a9ef592 100644 --- a/include/deal.II/grid/tria_accessor.templates.h +++ b/include/deal.II/grid/tria_accessor.templates.h @@ -58,19 +58,19 @@ namespace internal const ReferenceCell reference_cell = ReferenceCell::n_vertices_to_type(dim, vertices.size()); - if (reference_cell == dealii::ReferenceCells::Line) + if (reference_cell == ReferenceCells::Line) // Return the distance between the two vertices return (vertices[1] - vertices[0]).norm(); - else if (reference_cell == dealii::ReferenceCells::Triangle) + else if (reference_cell == ReferenceCells::Triangle) // Return the longest of the three edges return std::max({(vertices[1] - vertices[0]).norm(), (vertices[2] - vertices[1]).norm(), (vertices[2] - vertices[0]).norm()}); - else if (reference_cell == dealii::ReferenceCells::Quadrilateral) + else if (reference_cell == ReferenceCells::Quadrilateral) // Return the longer one of the two diagonals of the quadrilateral return std::max({(vertices[3] - vertices[0]).norm(), (vertices[2] - vertices[1]).norm()}); - else if (reference_cell == dealii::ReferenceCells::Tetrahedron) + else if (reference_cell == ReferenceCells::Tetrahedron) // Return the longest of the six edges of the tetrahedron return std::max({(vertices[1] - vertices[0]).norm(), (vertices[2] - vertices[0]).norm(), @@ -78,7 +78,7 @@ namespace internal (vertices[3] - vertices[0]).norm(), (vertices[3] - vertices[1]).norm(), (vertices[3] - vertices[2]).norm()}); - else if (reference_cell == dealii::ReferenceCells::Pyramid) + else if (reference_cell == ReferenceCells::Pyramid) // Return ... return std::max({// the longest diagonal of the quadrilateral base // of the pyramid or ... @@ -90,7 +90,7 @@ namespace internal (vertices[4] - vertices[1]).norm(), (vertices[4] - vertices[2]).norm(), (vertices[4] - vertices[3]).norm()}); - else if (reference_cell == dealii::ReferenceCells::Wedge) + else if (reference_cell == ReferenceCells::Wedge) // Return ... return std::max({// the longest of the 2*3=6 diagonals of the three // quadrilateral sides of the wedge or ... @@ -108,7 +108,7 @@ namespace internal (vertices[4] - vertices[3]).norm(), (vertices[5] - vertices[4]).norm(), (vertices[5] - vertices[3]).norm()}); - else if (reference_cell == dealii::ReferenceCells::Hexahedron) + else if (reference_cell == ReferenceCells::Hexahedron) // Return the longest of the four diagonals of the hexahedron return std::max({(vertices[7] - vertices[0]).norm(), (vertices[6] - vertices[1]).norm(), diff --git a/include/deal.II/matrix_free/face_setup_internal.h b/include/deal.II/matrix_free/face_setup_internal.h index 8704269504..0c188a6389 100644 --- a/include/deal.II/matrix_free/face_setup_internal.h +++ b/include/deal.II/matrix_free/face_setup_internal.h @@ -797,7 +797,7 @@ namespace internal info.face_type = is_mixed_mesh ? (dcell->face(f)->reference_cell() != - dealii::ReferenceCells::get_hypercube()) : + ReferenceCells::get_hypercube()) : 0; info.subface_index = GeometryInfo::max_children_per_cell; @@ -986,7 +986,7 @@ namespace internal info.face_type = is_mixed_mesh ? (cell->face(face_no)->reference_cell() != - dealii::ReferenceCells::get_hypercube()) : + ReferenceCells::get_hypercube()) : 0; info.subface_index = GeometryInfo::max_children_per_cell; diff --git a/include/deal.II/matrix_free/mapping_info.templates.h b/include/deal.II/matrix_free/mapping_info.templates.h index 2fe883a140..15e9c57c52 100644 --- a/include/deal.II/matrix_free/mapping_info.templates.h +++ b/include/deal.II/matrix_free/mapping_info.templates.h @@ -178,7 +178,7 @@ namespace internal face_data_by_cells[my_q].descriptor[hpq * scale].initialize( quad_face); reference_cell_types[my_q][hpq] = - dealii::ReferenceCells::get_hypercube(); + ReferenceCells::get_hypercube(); } } } @@ -1539,13 +1539,12 @@ namespace internal reorder_face_derivative_indices( const unsigned int face_no, const unsigned int index, - const ReferenceCell reference_cell = dealii::ReferenceCells::Invalid) + const ReferenceCell reference_cell = ReferenceCells::Invalid) { Assert(index < dim, ExcInternalError()); - if ((reference_cell == dealii::ReferenceCells::Invalid || - reference_cell == dealii::ReferenceCells::get_hypercube()) == - false) + if ((reference_cell == ReferenceCells::Invalid || + reference_cell == ReferenceCells::get_hypercube()) == false) { return index; } diff --git a/include/deal.II/numerics/data_out_dof_data.templates.h b/include/deal.II/numerics/data_out_dof_data.templates.h index 19ede03d00..6edcdce4c6 100644 --- a/include/deal.II/numerics/data_out_dof_data.templates.h +++ b/include/deal.II/numerics/data_out_dof_data.templates.h @@ -348,10 +348,9 @@ namespace internal quadrature.push_back(*quadrature_hypercube); else if (reference_cell.is_simplex()) quadrature.push_back(*quadrature_simplex); - else if (reference_cell == dealii::ReferenceCells::Wedge) + else if (reference_cell == ReferenceCells::Wedge) quadrature.push_back(*quadrature_wedge); - else if (reference_cell == - dealii::ReferenceCells::Pyramid) + else if (reference_cell == ReferenceCells::Pyramid) quadrature.push_back(*quadrature_pyramid); else Assert(false, ExcNotImplemented()); @@ -434,16 +433,16 @@ namespace internal // need hypercube quadratures. if ((dim < 3) || (reference_cell.is_hyper_cube() || - (reference_cell == dealii::ReferenceCells::Wedge) || - (reference_cell == dealii::ReferenceCells::Pyramid))) + (reference_cell == ReferenceCells::Wedge) || + (reference_cell == ReferenceCells::Pyramid))) quadrature.push_back(*quadrature_hypercube); // In 3d, if the element is for simplex/wedge/pyramid // cells, then we also need simplex quadratures if ((dim == 3) && (reference_cell.is_simplex() || - (reference_cell == dealii::ReferenceCells::Wedge) || - (reference_cell == dealii::ReferenceCells::Pyramid))) + (reference_cell == ReferenceCells::Wedge) || + (reference_cell == ReferenceCells::Pyramid))) quadrature.push_back(*quadrature_simplex); } @@ -2497,11 +2496,11 @@ DataOut_DoFData::get_fes() const finite_elements.emplace_back( std::make_shared>( FE_SimplexDGP(1))); - else if (reference_cell == dealii::ReferenceCells::Wedge) + else if (reference_cell == ReferenceCells::Wedge) finite_elements.emplace_back( std::make_shared>( FE_WedgeDGP(1))); - else if (reference_cell == dealii::ReferenceCells::Pyramid) + else if (reference_cell == ReferenceCells::Pyramid) finite_elements.emplace_back( std::make_shared>( FE_PyramidDGP(1))); diff --git a/source/distributed/tria_base.cc b/source/distributed/tria_base.cc index 1ee351481e..25ee89faa4 100644 --- a/source/distributed/tria_base.cc +++ b/source/distributed/tria_base.cc @@ -315,7 +315,7 @@ namespace parallel this->reference_cells.clear(); for (const auto &i : reference_cells_ui) this->reference_cells.emplace_back( - dealii::internal::ReferenceCell::make_reference_cell_from_int(i)); + dealii::internal::make_reference_cell_from_int(i)); } diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc index d79e3fdc9a..52979d0170 100644 --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@ -820,7 +820,7 @@ namespace internal quad_dof_identities [most_dominating_fe_index][other_fe_index] [cell->quad(q)->reference_cell() == - dealii::ReferenceCells::Quadrilateral], + ReferenceCells::Quadrilateral], most_dominating_fe_index_face_no); for (const auto &identity : identities) @@ -1556,7 +1556,7 @@ namespace internal quad_dof_identities [most_dominating_fe_index][other_fe_index] [cell->quad(q)->reference_cell() == - dealii::ReferenceCells::Quadrilateral], + ReferenceCells::Quadrilateral], most_dominating_fe_index_face_no); for (const auto &identity : identities) diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc index 014a37641e..5e2fa51a30 100644 --- a/source/grid/grid_out.cc +++ b/source/grid/grid_out.cc @@ -4234,7 +4234,7 @@ namespace internal Quadrature quadrature(boundary_points, dummy_weights); q_projector = QProjector::project_to_all_faces( - dealii::ReferenceCells::get_hypercube(), quadrature); + ReferenceCells::get_hypercube(), quadrature); } for (const auto &cell : tria.active_cell_iterators())