From 879cda3b33dd9706e889eb0659c829512c7ffa49 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 8 Oct 2020 17:43:12 -0400 Subject: [PATCH] Fix some more --- doc/news/changes/minor/20200831Munch | 5 +++-- examples/step-69/step-69.cc | 2 +- include/deal.II/base/data_out_base.h | 3 ++- include/deal.II/hp/dof_handler.h | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/news/changes/minor/20200831Munch b/doc/news/changes/minor/20200831Munch index bb36682850..aa78a5566a 100644 --- a/doc/news/changes/minor/20200831Munch +++ b/doc/news/changes/minor/20200831Munch @@ -1,4 +1,5 @@ -New: The methods FEEvaluation/FEEFacevaluation::gather_evaluate/integrate_scatter() -can now also accept block vectors. +New: The methods FEEvaluation::gather_evaluate(), +FEEFaceEvaluation::gather_evaluate(), FEEvaluation::integrate_scatter() and +FEfaceEvaluation::integrate_scatter() can now also accept block vectors.
(Peter Munch, Magdalena Schreter, Martin Kronbichler, 2020/08/31) diff --git a/examples/step-69/step-69.cc b/examples/step-69/step-69.cc index 4181d13b6d..1857639a5b 100644 --- a/examples/step-69/step-69.cc +++ b/examples/step-69/step-69.cc @@ -2183,7 +2183,7 @@ namespace Step69 // The second thing to note is that we have to compute global minimum and // maximum $\max_j |\nabla r_j|$ and $\min_j |\nabla r_j|$. Following the // same ideas used to compute the time step size in the class member - // %TimeStepping::step() we define $\max_j |\nabla r_j|$ + // %TimeStepping\::%step() we define $\max_j |\nabla r_j|$ // and $\min_j |\nabla r_j|$ as atomic doubles in order to resolve any // conflicts between threads. As usual, we use // Utilities::MPI::max() and diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h index 9e6b93b568..2549a5df39 100644 --- a/include/deal.II/base/data_out_base.h +++ b/include/deal.II/base/data_out_base.h @@ -3329,7 +3329,8 @@ public: * Get the XDMF content associated with this entry. * If the entry is not valid, this returns an empty string. * - * @deprecated Use @ref get_xdmf_content(const unsigned int, const ReferenceCell::Type &) instead. + * @deprecated Use the overload taking an `unsigned int` and a + * `const ReferenceCell::Type &` instead. */ DEAL_II_DEPRECATED std::string diff --git a/include/deal.II/hp/dof_handler.h b/include/deal.II/hp/dof_handler.h index f156c17fb8..cf383640b9 100644 --- a/include/deal.II/hp/dof_handler.h +++ b/include/deal.II/hp/dof_handler.h @@ -128,7 +128,7 @@ namespace hp /** * Default Constructor. * - * @deprecated Use dealii::DoFHandler(true) instead. + * @deprecated Use the overload taking a `bool` instead. */ DEAL_II_DEPRECATED DoFHandler(); @@ -136,7 +136,8 @@ namespace hp /** * Constructor. Take @p tria as the triangulation to work on. * - * @deprecated Use dealii::DoFHandler(tria, true) instead. + * @deprecated Use the overload taking a + * `const Triangulation&` and a `bool` instead. */ DEAL_II_DEPRECATED DoFHandler(const Triangulation &tria); -- 2.39.5