dealii::ReferenceCells -> ReferenceCells

diff --git a/include/deal.II/cgal/utilities.h b/include/deal.II/cgal/utilities.h
index aea14f150c26c5e46d1614d7bd975ebe89b1e4bb..bca24647f875308c373c0febbc1d31ab87301258 100644 (file)
--- 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<dim0, spacedim> &mapping0 =
-      (dealii::ReferenceCells::get_hypercube<dim0>()
+      (ReferenceCells::get_hypercube<dim0>()
          .template get_default_linear_mapping<dim0, spacedim>()),
     const Mapping<dim1, spacedim> &mapping1 =
-      (dealii::ReferenceCells::get_hypercube<dim1>()
+      (ReferenceCells::get_hypercube<dim1>()
          .template get_default_linear_mapping<dim1, spacedim>()));
 
   /**

diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h
index 02bf7e461c9863ef12b4ed2b16eb87c87176d8c6..f27a9ef59253ff7170903079b3e36e4d05bc3419 100644 (file)
--- 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 87042695043efa66be01c8fec0fc956b6370ce7f..0c188a6389c7a332e31f89eac4c153d38dfc5054 100644 (file)
--- 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<dim - 1>()) :
+                             ReferenceCells::get_hypercube<dim - 1>()) :
                             0;
                         info.subface_index =
                           GeometryInfo<dim>::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<dim - 1>()) :
+                          ReferenceCells::get_hypercube<dim - 1>()) :
                          0;
 
       info.subface_index = GeometryInfo<dim>::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 2fe883a1406b47bbd9d68deb2ab31cab99ddc070..15e9c57c522abff3d9c0f8e76a7c08a5be3c6ad6 100644 (file)
--- 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<dim>();
+                    ReferenceCells::get_hypercube<dim>();
                 }
             }
         }
@@ -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<dim>()) ==
-            false)
+        if ((reference_cell == ReferenceCells::Invalid ||
+             reference_cell == ReferenceCells::get_hypercube<dim>()) == 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 19ede03d0045b9124a39289ab54ff9349984c38e..6edcdce4c66d09fe5b2b50830811604becfd1de5 100644 (file)
--- 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<dim, patch_dim, spacedim, patch_spacedim>::get_fes() const
             finite_elements.emplace_back(
               std::make_shared<dealii::hp::FECollection<dim, spacedim>>(
                 FE_SimplexDGP<dim, spacedim>(1)));
-          else if (reference_cell == dealii::ReferenceCells::Wedge)
+          else if (reference_cell == ReferenceCells::Wedge)
             finite_elements.emplace_back(
               std::make_shared<dealii::hp::FECollection<dim, spacedim>>(
                 FE_WedgeDGP<dim, spacedim>(1)));
-          else if (reference_cell == dealii::ReferenceCells::Pyramid)
+          else if (reference_cell == ReferenceCells::Pyramid)
             finite_elements.emplace_back(
               std::make_shared<dealii::hp::FECollection<dim, spacedim>>(
                 FE_PyramidDGP<dim, spacedim>(1)));

diff --git a/source/distributed/tria_base.cc b/source/distributed/tria_base.cc
index 1ee351481e5121e247b668a119f681f390b69365..25ee89faa489b3c79cfc4914525b7791d7d51d28 100644 (file)
--- 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 d79e3fdc9a01791ada99190c3a1d505187252e76..52979d01706062ffcc9910758f78fe10987e7332 100644 (file)
--- 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 014a37641e97a0adbf1a35eea878e3bad9674ff6..5e2fa51a3038b4475971ba71316bea68a7141ec8 100644 (file)
--- a/source/grid/grid_out.cc
+++ b/source/grid/grid_out.cc
@@ -4234,7 +4234,7 @@ namespace internal
           Quadrature<dim - 1> quadrature(boundary_points, dummy_weights);
 
           q_projector = QProjector<dim>::project_to_all_faces(
-            dealii::ReferenceCells::get_hypercube<dim>(), quadrature);
+            ReferenceCells::get_hypercube<dim>(), quadrature);
         }
 
       for (const auto &cell : tria.active_cell_iterators())