From e24ed8a24d6bc8ee28970b96a8f089644d4d71b1 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 25 May 2018 21:28:54 -0500 Subject: [PATCH] RCM: Rename some stray leftovers in source --- include/deal.II/meshworker/assembler.h | 4 ++-- include/deal.II/numerics/vector_tools.h | 27 +++++++++++++------------ source/dofs/dof_renumbering.cc | 11 +++++----- source/fe/fe_q_base.cc | 2 +- source/grid/tria.cc | 6 +++--- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/deal.II/meshworker/assembler.h b/include/deal.II/meshworker/assembler.h index 18cff981fb..1677943df4 100644 --- a/include/deal.II/meshworker/assembler.h +++ b/include/deal.II/meshworker/assembler.h @@ -111,7 +111,6 @@ namespace MeshWorker class ResidualLocalBlocksToGlobalBlocks { public: - /** * Copy the BlockInfo and the matrix pointers into local variables. */ @@ -122,7 +121,8 @@ namespace MeshWorker * Initialize the constraints. */ void - initialize(const AffineConstraints &constraints); + initialize( + const AffineConstraints &constraints); /** * Initialize the local data in the DoFInfo object used later for diff --git a/include/deal.II/numerics/vector_tools.h b/include/deal.II/numerics/vector_tools.h index 8cc2624ff6..33fb4fbc89 100644 --- a/include/deal.II/numerics/vector_tools.h +++ b/include/deal.II/numerics/vector_tools.h @@ -1135,7 +1135,7 @@ namespace VectorTools /** * Insert the (algebraic) constraints due to Dirichlet boundary conditions - * into a ConstraintMatrix @p constraints. This function identifies the + * into a AffineConstraints @p constraints. This function identifies the * degrees of freedom subject to Dirichlet boundary conditions, adds them to * the list of constrained DoFs in @p constraints and sets the respective * inhomogeneity to the value interpolated around the boundary. If this @@ -1464,7 +1464,7 @@ namespace VectorTools * $\vec{n}\times\vec{u}=\vec{n}\times\vec{f}$, i.e. the tangential * components of $u$ and $f$ shall coincide. * - * If the ConstraintMatrix @p constraints contained values or other + * If the AffineConstraints @p constraints contained values or other * constraints before, the new ones are added or the old ones overwritten, * if a node of the boundary part to be used was already in the list of * constraints. This is handled by using inhomogeneous constraints. Please @@ -1593,7 +1593,7 @@ namespace VectorTools * * The resulting constraints are then given in the solutions $x$ and $y$. * - * If the ConstraintMatrix @p constraints contained values or other + * If the AffineConstraints @p constraints contained values or other * constraints before, the new ones are added or the old ones overwritten, * if a node of the boundary part to be used was already in the list of * constraints. This is handled by using inhomogeneous constraints. Please @@ -1748,16 +1748,17 @@ namespace VectorTools * i.e., normal flux constraints where $\vec u$ is a vector-valued solution * variable and $\vec u_\Gamma$ is a prescribed vector field whose normal * component we want to be equal to the normal component of the solution. - * These conditions have exactly the form handled by the ConstraintMatrix - * class, in that they relate a linear combination of boundary degrees - * of freedom to a corresponding value (the inhomogeneity of the constraint). - * Consequently, the current function creates a list of constraints that are - * written into a ConstraintMatrix. This object may already have some + * These conditions have exactly the form handled by the + * AffineConstraints class, in that they relate a linear + * combination of boundary degrees of freedom to a corresponding + * value (the inhomogeneity of the constraint). Consequently, the current + * function creates a list of constraints that are written into an + * AffineConstraints container. This object may already have some * content, for example from hanging node constraints, that remains - * untouched. These constraints have to be applied to the linear system like - * any other such constraints, i.e., you have to condense the linear system - * with the constraints before solving, and you have to distribute the - * solution vector afterwards. + * untouched. These constraints have to be applied to the linear system + * like any other such constraints, i.e., you have to condense the linear + * system with the constraints before solving, and you have to distribute + * the solution vector afterwards. * * This function treats a more general case than * VectorTools::compute_no_normal_flux_constraints() (which can only handle @@ -1814,7 +1815,7 @@ namespace VectorTools * * @note When combining adaptively refined meshes with hanging node * constraints and boundary conditions like from the current function within - * one ConstraintMatrix object, the hanging node constraints should always + * one AffineConstraints object, the hanging node constraints should always * be set first, and then the boundary conditions since boundary conditions * are not set in the second operation on degrees of freedom that are * already constrained. This makes sure that the discretization remains diff --git a/source/dofs/dof_renumbering.cc b/source/dofs/dof_renumbering.cc index 867dab690c..285ff72b03 100644 --- a/source/dofs/dof_renumbering.cc +++ b/source/dofs/dof_renumbering.cc @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include @@ -96,10 +96,9 @@ namespace DoFRenumbering &graph_degree) { { - // create intermediate sparsity pattern - // (faster than directly submitting - // indices) - ConstraintMatrix constraints; + // create intermediate sparsity pattern (faster than directly + // submitting indices) + AffineConstraints constraints; if (use_constraints) DoFTools::make_hanging_node_constraints(dof_handler, constraints); constraints.close(); @@ -403,7 +402,7 @@ namespace DoFRenumbering IndexSet locally_relevant_dofs; DoFTools::extract_locally_relevant_dofs(dof_handler, locally_relevant_dofs); - ConstraintMatrix constraints; + AffineConstraints constraints; if (use_constraints) { constraints.reinit(locally_relevant_dofs); diff --git a/source/fe/fe_q_base.cc b/source/fe/fe_q_base.cc index 189505a970..8d80b3375c 100644 --- a/source/fe/fe_q_base.cc +++ b/source/fe/fe_q_base.cc @@ -374,7 +374,7 @@ struct FE_Q_Base::Implementation // The following lines of code should eliminate the problems with // the Constraint-Matrix, which appeared for P>=4. The - // ConstraintMatrix class complained about different constraints + // AffineConstraints class complained about different constraints // for the same entry of the Constraint-Matrix. Actually this // difference could be attributed to FP errors, as it was in the // range of 1.0e-16. These errors originate in the loss of diff --git a/source/grid/tria.cc b/source/grid/tria.cc index 0b65a406a0..83e900d883 100644 --- a/source/grid/tria.cc +++ b/source/grid/tria.cc @@ -1773,7 +1773,7 @@ namespace internal "and then ensure continuity of the solution by " "explicitly creating constraints that the degrees " "of freedom at these vertices have the same " - "value, using the ConstraintMatrix class.")); + "value, using the AffineConstraints class.")); } // assert there are no more @@ -2105,7 +2105,7 @@ namespace internal "and then ensure continuity of the solution by " "explicitly creating constraints that the degrees " "of freedom at these lines have the same " - "value, using the ConstraintMatrix class.")); + "value, using the AffineConstraints class.")); // if only one cell: line is at boundary -> give it the boundary // indicator zero by default @@ -9822,7 +9822,7 @@ namespace internal * one share one line in 3D. This is a requirement needed for * the interpolation of hanging nodes, since otherwise to steps * of interpolation would be necessary. This would make the - * processes implemented in the @p ConstraintMatrix class much + * processes implemented in the @p AffineConstraints class much * more complex, since these two steps of interpolation do not * commute. */ -- 2.39.5