From 2e5c4b95eab37647d835b63558fe1a259c7380e5 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Sun, 1 Dec 2019 09:27:31 +0100 Subject: [PATCH] Do not use MF::get_size_info() --- .../changes/incompatibilities/20191201PeterMunch | 4 ++++ include/deal.II/matrix_free/fe_evaluation.h | 2 +- include/deal.II/matrix_free/matrix_free.h | 16 ---------------- 3 files changed, 5 insertions(+), 17 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20191201PeterMunch diff --git a/doc/news/changes/incompatibilities/20191201PeterMunch b/doc/news/changes/incompatibilities/20191201PeterMunch new file mode 100644 index 0000000000..799b24c26a --- /dev/null +++ b/doc/news/changes/incompatibilities/20191201PeterMunch @@ -0,0 +1,4 @@ +Removed: The deprecated method MatrixFree::get_size_info() has been removed. +Please use the method MatrixFree::get_task_info() to access the same information. +
+(Peter Munch, 2019/12/01) diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index 0bb4baa57f..a654917d67 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -3050,7 +3050,7 @@ inline FEEvaluationBasemapping_initialized() == true, ExcNotInitialized()); - AssertDimension(matrix_info->get_size_info().vectorization_length, + AssertDimension(matrix_info->get_task_info().vectorization_length, VectorizedArrayType::n_array_elements); AssertDimension((is_face ? data->n_q_points_face : data->n_q_points), n_quadrature_points); diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index 4ccd2b38cd..e724a1a6bd 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -1725,13 +1725,6 @@ public: const internal::MatrixFreeFunctions::TaskInfo & get_task_info() const; - /** - * Return information on system size. - */ - DEAL_II_DEPRECATED - const internal::MatrixFreeFunctions::TaskInfo & - get_size_info() const; - /* * Return geometry-dependent information on the cells. */ @@ -2110,15 +2103,6 @@ MatrixFree::get_task_info() const -template -inline const internal::MatrixFreeFunctions::TaskInfo & -MatrixFree::get_size_info() const -{ - return task_info; -} - - - template inline unsigned int MatrixFree::n_macro_cells() const -- 2.39.5