From a4e1c70e0a8df1e120298521b961dc80ce0988ed Mon Sep 17 00:00:00 2001 From: David Wells Date: Wed, 14 Jun 2023 14:54:09 -0400 Subject: [PATCH] Convert some more places to 'subobject' instead of 'quad'. --- include/deal.II/dofs/dof_accessor.templates.h | 14 +++++----- include/deal.II/dofs/dof_handler.h | 20 +++++++------- include/deal.II/fe/fe_system.h | 14 +++++----- include/deal.II/grid/grid_tools.h | 21 ++++++++------- include/deal.II/grid/tria.h | 13 +++++----- include/deal.II/grid/tria_accessor.h | 26 ++++++++++--------- source/grid/reference_cell.cc | 12 ++++----- 7 files changed, 61 insertions(+), 59 deletions(-) diff --git a/include/deal.II/dofs/dof_accessor.templates.h b/include/deal.II/dofs/dof_accessor.templates.h index 984ca09b25..87b24e839a 100644 --- a/include/deal.II/dofs/dof_accessor.templates.h +++ b/include/deal.II/dofs/dof_accessor.templates.h @@ -1083,11 +1083,11 @@ namespace internal // correct (cell-local) ordering. The same applies, if the face_rotation // or face_orientation is non-standard if (structdim == 3 && fe.max_dofs_per_quad() > 0) - for (const auto quad : accessor.face_indices()) + for (const auto face_no : accessor.face_indices()) { const auto combined_orientation = TriaAccessorImplementation:: - Implementation::combined_face_orientation(accessor, quad); - const unsigned int quad_index = accessor.quad_index(quad); + Implementation::combined_face_orientation(accessor, face_no); + const unsigned int quad_index = accessor.quad_index(face_no); if (combined_orientation == ReferenceCell::default_combined_face_orientation()) dof_operation.process_dofs( @@ -1108,10 +1108,10 @@ namespace internal [&](const auto d) { return fe.adjust_quad_dof_index_for_face_orientation( d, - quad, - accessor.face_orientation(quad), - accessor.face_flip(quad), - accessor.face_rotation(quad)); + face_no, + accessor.face_orientation(face_no), + accessor.face_flip(face_no), + accessor.face_rotation(face_no)); }, std::integral_constant(), dof_indices_ptr, diff --git a/include/deal.II/dofs/dof_handler.h b/include/deal.II/dofs/dof_handler.h index 1976168d1d..7ac56e5a09 100644 --- a/include/deal.II/dofs/dof_handler.h +++ b/include/deal.II/dofs/dof_handler.h @@ -108,16 +108,16 @@ namespace parallel * * It is first used in the step-2 tutorial program. * - * For each vertex, line, quad, etc, this class stores a list of the indices - * of degrees of freedom living on this object. These indices refer to the - * unconstrained degrees of freedom, i.e. constrained degrees of freedom are - * numbered in the same way as unconstrained ones, and are only later - * eliminated. This leads to the fact that indices in global vectors and - * matrices also refer to all degrees of freedom and some kind of condensation - * is needed to restrict the systems of equations to the unconstrained degrees - * of freedom only. The actual layout of storage of the indices is described - * in the dealii::internal::DoFHandlerImplementation::DoFLevel class - * documentation. + * For each 0d, 1d, 2d, and 3d subobject, this class stores a list of the + * indices of degrees of freedom defined on this DoFHandler. These indices + * refer to the unconstrained degrees of freedom, i.e. constrained degrees of + * freedom are numbered in the same way as unconstrained ones, and are only + * later eliminated. This leads to the fact that indices in global vectors + * and matrices also refer to all degrees of freedom and some kind of + * condensation is needed to restrict the systems of equations to the + * unconstrained degrees of freedom only. The actual layout of storage of the + * indices is described in the + * dealii::internal::DoFHandlerImplementation::DoFLevel class documentation. * * The class offers iterators to traverse all cells, in much the same way as * the Triangulation class does. Using the begin() and end() functions (and diff --git a/include/deal.II/fe/fe_system.h b/include/deal.II/fe/fe_system.h index d755294195..d288bc0fb9 100644 --- a/include/deal.II/fe/fe_system.h +++ b/include/deal.II/fe/fe_system.h @@ -179,13 +179,13 @@ class FE_Enriched; * *

Internal information on numbering of degrees of freedom

* - * The overall numbering of degrees of freedom is as follows: for each - * subobject (vertex, line, quad, or hex), the degrees of freedom are numbered - * such that we run over all subelements first, before turning for the next - * dof on this subobject or for the next subobject. For example, for an - * element of three components in one space dimension, the first two - * components being cubic lagrange elements and the third being a quadratic - * lagrange element, the ordering for the system s=(u,v,p) is: + * The overall numbering of degrees of freedom is as follows: for each 0d, 1d, + * 2d, or 3d subobject, the degrees of freedom are numbered such that we run + * over all subelements first, before turning for the next dof on this + * subobject or for the next subobject. For example, for an element of three + * components in one space dimension, the first two components being cubic + * lagrange elements and the third being a quadratic lagrange element, the + * ordering for the system s=(u,v,p) is: * *