From: Daniel Arndt Date: Wed, 22 Jun 2022 21:33:27 +0000 (-0400) Subject: Remove deprecated MatrixFree functionalities X-Git-Tag: v9.5.0-rc1~1156^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14037%2Fhead;p=dealii.git Remove deprecated MatrixFree functionalities --- diff --git a/doc/news/changes/incompatibilities/20220622Arndt-2 b/doc/news/changes/incompatibilities/20220622Arndt-2 new file mode 100644 index 0000000000..5f19323182 --- /dev/null +++ b/doc/news/changes/incompatibilities/20220622Arndt-2 @@ -0,0 +1,6 @@ +Removed: The deprecated functions MatrixFree::n_macro_cells(), +MatrixFree::get_hp_cell_iterator(), MatrixFree::n_components_filled(), +MatrixFree::get_dof_handler(), and +MatrixFree::reinit() with default Mapping argument have been removed. +
+(Daniel Arndt, 2022/06/22) diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index 40f8214c9c..d8e519ab6d 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -585,19 +585,6 @@ public: const QuadratureType & quad, const AdditionalData & additional_data = AdditionalData()); - /** - * Initializes the data structures. Same as above, but using a $Q_1$ - * mapping. - * - * @deprecated Use the overload taking a Mapping object instead. - */ - template - DEAL_II_DEPRECATED void - reinit(const DoFHandler & dof_handler, - const AffineConstraints &constraint, - const QuadratureType & quad, - const AdditionalData & additional_data = AdditionalData()); - /** * Extracts the information needed to perform loops over cells. The * DoFHandler and AffineConstraints objects describe the layout of degrees of @@ -627,19 +614,6 @@ public: const std::vector & quad, const AdditionalData &additional_data = AdditionalData()); - /** - * Initializes the data structures. Same as above, but using a $Q_1$ - * mapping. - * - * @deprecated Use the overload taking a Mapping object instead. - */ - template - DEAL_II_DEPRECATED void - reinit(const std::vector *> & dof_handler, - const std::vector *> &constraint, - const std::vector & quad, - const AdditionalData &additional_data = AdditionalData()); - /** * Initializes the data structures. Same as before, but now the index set * description of the locally owned range of degrees of freedom is taken @@ -655,19 +629,6 @@ public: const QuadratureType & quad, const AdditionalData &additional_data = AdditionalData()); - /** - * Initializes the data structures. Same as above, but using a $Q_1$ - * mapping. - * - * @deprecated Use the overload taking a Mapping object instead. - */ - template - DEAL_II_DEPRECATED void - reinit(const std::vector *> & dof_handler, - const std::vector *> &constraint, - const QuadratureType & quad, - const AdditionalData &additional_data = AdditionalData()); - /** * Copy function. Creates a deep copy of all data structures. It is usually * enough to keep the data for different operations once, so this function @@ -1592,12 +1553,6 @@ public: unsigned int n_physical_cells() const; - /** - * @deprecated Use n_cell_batches() instead. - */ - DEAL_II_DEPRECATED unsigned int - n_macro_cells() const; - /** * Return the number of cell batches that this structure works on. The * batches are formed by application of vectorization over several cells in @@ -1719,16 +1674,6 @@ public: const bool interior = true, const unsigned int fe_component = 0) const; - /** - * @copydoc MatrixFree::get_cell_iterator() - * - * @deprecated Use get_cell_iterator() instead. - */ - DEAL_II_DEPRECATED typename DoFHandler::active_cell_iterator - get_hp_cell_iterator(const unsigned int cell_batch_index, - const unsigned int lane_index, - const unsigned int dof_handler_index = 0) const; - /** * Since this class uses vectorized data types with usually more than one * value in the data field, a situation might occur when some components of @@ -1744,12 +1689,6 @@ public: bool at_irregular_cell(const unsigned int cell_batch_index) const; - /** - * @deprecated Use n_active_entries_per_cell_batch() instead. - */ - DEAL_II_DEPRECATED unsigned int - n_components_filled(const unsigned int cell_batch_number) const; - /** * This query returns how many cells among the `VectorizedArrayType::size()` * many cells within a cell batch to actual cells in the mesh, rather than @@ -2277,15 +2216,6 @@ MatrixFree::get_task_info() const -template -inline unsigned int -MatrixFree::n_macro_cells() const -{ - return *(task_info.cell_partition_data.end() - 2); -} - - - template inline unsigned int MatrixFree::n_physical_cells() const @@ -2556,16 +2486,6 @@ MatrixFree::get_face_active_fe_index( -template -inline unsigned int -MatrixFree::n_components_filled( - const unsigned int cell_batch_index) const -{ - return n_active_entries_per_cell_batch(cell_batch_index); -} - - - template inline unsigned int MatrixFree::n_active_entries_per_cell_batch( @@ -2960,42 +2880,6 @@ namespace internal -template -template -void -MatrixFree::reinit( - const DoFHandler & dof_handler, - const AffineConstraints &constraints_in, - const QuadratureType & quad, - const typename MatrixFree::AdditionalData - &additional_data) -{ - std::vector *> dof_handlers; - std::vector *> constraints; - std::vector quads; - - dof_handlers.push_back(&dof_handler); - constraints.push_back(&constraints_in); - quads.push_back(quad); - - std::vector locally_owned_sets = - internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handlers, additional_data.mg_level); - - std::vector> quad_hp; - quad_hp.emplace_back(quad); - - internal_reinit(std::make_shared>( - StaticMappingQ1::mapping), - dof_handlers, - constraints, - locally_owned_sets, - quad_hp, - additional_data); -} - - - template template void @@ -3030,61 +2914,6 @@ MatrixFree::reinit( -template -template -void -MatrixFree::reinit( - const std::vector *> & dof_handler, - const std::vector *> &constraint, - const std::vector & quad, - const typename MatrixFree::AdditionalData - &additional_data) -{ - std::vector locally_owned_set = - internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handler, additional_data.mg_level); - std::vector> quad_hp; - for (unsigned int q = 0; q < quad.size(); ++q) - quad_hp.emplace_back(quad[q]); - - internal_reinit(std::make_shared>( - StaticMappingQ1::mapping), - dof_handler, - constraint, - locally_owned_set, - quad_hp, - additional_data); -} - - - -template -template -void -MatrixFree::reinit( - const std::vector *> & dof_handler, - const std::vector *> &constraint, - const QuadratureType & quad, - const typename MatrixFree::AdditionalData - &additional_data) -{ - std::vector locally_owned_set = - internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handler, additional_data.mg_level); - std::vector> quad_hp; - quad_hp.emplace_back(quad); - - internal_reinit(std::make_shared>( - StaticMappingQ1::mapping), - dof_handler, - constraint, - locally_owned_set, - quad_hp, - additional_data); -} - - - template template void diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index e4553a4078..8ff2e3566c 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -307,30 +307,6 @@ MatrixFree::get_face_iterator( -template -typename DoFHandler::active_cell_iterator -MatrixFree::get_hp_cell_iterator( - const unsigned int cell_batch_index, - const unsigned int lane_index, - const unsigned int dof_handler_index) const -{ - AssertIndexRange(dof_handler_index, dof_handlers.size()); - AssertIndexRange(cell_batch_index, task_info.cell_partition_data.back()); - AssertIndexRange(lane_index, - n_active_entries_per_cell_batch(cell_batch_index)); - - std::pair index = - cell_level_index[cell_batch_index * VectorizedArrayType::size() + - lane_index]; - return typename DoFHandler::cell_iterator( - &dof_handlers[dof_handler_index]->get_triangulation(), - index.first, - index.second, - &*dof_handlers[dof_handler_index]); -} - - - template void MatrixFree::copy_from( diff --git a/tests/arpack/step-36_parpack_mf.cc b/tests/arpack/step-36_parpack_mf.cc index 3e608b0a24..468cb41f9f 100644 --- a/tests/arpack/step-36_parpack_mf.cc +++ b/tests/arpack/step-36_parpack_mf.cc @@ -103,7 +103,7 @@ test() MatrixFree::AdditionalData::partition_color; data.mapping_update_flags = update_values | update_gradients | update_JxW_values; - mf_data->reinit(dof_handler, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof_handler, constraints, quad, data); } diff --git a/tests/arpack/step-36_parpack_mf_02.cc b/tests/arpack/step-36_parpack_mf_02.cc index 7d62acd873..8a62b1841b 100644 --- a/tests/arpack/step-36_parpack_mf_02.cc +++ b/tests/arpack/step-36_parpack_mf_02.cc @@ -103,7 +103,7 @@ test() MatrixFree::AdditionalData::partition_color; data.mapping_update_flags = update_values | update_gradients | update_JxW_values; - mf_data->reinit(dof_handler, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof_handler, constraints, quad, data); } std::vector> eigenfunctions; diff --git a/tests/arpack/step-36_parpack_mf_03.cc b/tests/arpack/step-36_parpack_mf_03.cc index 4b99c29950..805fe800dc 100644 --- a/tests/arpack/step-36_parpack_mf_03.cc +++ b/tests/arpack/step-36_parpack_mf_03.cc @@ -104,7 +104,7 @@ test() MatrixFree::AdditionalData::partition_color; data.mapping_update_flags = update_values | update_gradients | update_JxW_values; - mf_data->reinit(dof_handler, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof_handler, constraints, quad, data); } std::vector> eigenfunctions; diff --git a/tests/lac/utilities_02.cc b/tests/lac/utilities_02.cc index ca213e1801..81d6671d9f 100644 --- a/tests/lac/utilities_02.cc +++ b/tests/lac/utilities_02.cc @@ -114,7 +114,7 @@ test() MatrixFree::AdditionalData::partition_color; data.mapping_update_flags = update_values | update_gradients | update_JxW_values; - mf_data->reinit(dof_handler, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof_handler, constraints, quad, data); } MatrixFreeOperators::MassOperator matrix_free; - matrix_free.reinit(dof_handler, constraints, quadrature_formula, data); + matrix_free.reinit( + MappingQ1{}, dof_handler, constraints, quadrature_formula, data); // test fine-level mapping: diff --git a/tests/mappings/mapping_q_eulerian_14.cc b/tests/mappings/mapping_q_eulerian_14.cc index fd1a7f34fc..ae32890603 100644 --- a/tests/mappings/mapping_q_eulerian_14.cc +++ b/tests/mappings/mapping_q_eulerian_14.cc @@ -283,7 +283,8 @@ test(const unsigned int n_ref = 0) euler_fine, dof_handler, constraints, quadrature_formula, data); MatrixFree matrix_free; - matrix_free.reinit(dof_handler, constraints, quadrature_formula, data); + matrix_free.reinit( + MappingQ1{}, dof_handler, constraints, quadrature_formula, data); // test fine-level mapping: diff --git a/tests/matrix_free/advect_1d.cc b/tests/matrix_free/advect_1d.cc index 253b96aedc..063de99da3 100644 --- a/tests/matrix_free/advect_1d.cc +++ b/tests/matrix_free/advect_1d.cc @@ -286,7 +286,7 @@ test(const unsigned int n_refine) (update_gradients | update_JxW_values); MatrixFree mf_data; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); diff --git a/tests/matrix_free/advect_1d_system.cc b/tests/matrix_free/advect_1d_system.cc index d0340ffb9e..e1d0ddd8ec 100644 --- a/tests/matrix_free/advect_1d_system.cc +++ b/tests/matrix_free/advect_1d_system.cc @@ -294,7 +294,7 @@ test(const unsigned int n_refine) (update_gradients | update_JxW_values); MatrixFree mf_data; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); diff --git a/tests/matrix_free/advect_1d_vectorization_mask.cc b/tests/matrix_free/advect_1d_vectorization_mask.cc index cc216654cc..db7ea98e0b 100644 --- a/tests/matrix_free/advect_1d_vectorization_mask.cc +++ b/tests/matrix_free/advect_1d_vectorization_mask.cc @@ -312,7 +312,7 @@ test(const unsigned int n_refine) (update_gradients | update_JxW_values); MatrixFree mf_data; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); diff --git a/tests/matrix_free/categorize_by_boundary_ids_01.cc b/tests/matrix_free/categorize_by_boundary_ids_01.cc index cc423e2022..28ca046bc4 100644 --- a/tests/matrix_free/categorize_by_boundary_ids_01.cc +++ b/tests/matrix_free/categorize_by_boundary_ids_01.cc @@ -67,7 +67,8 @@ test(const unsigned int n_refinements) bool result = true; MatrixFree data; - data.reinit(dof_handler, dummy, quadrature, additional_data); + data.reinit( + MappingQ1{}, dof_handler, dummy, quadrature, additional_data); using VectorType = Vector; diff --git a/tests/matrix_free/cell_categorization.cc b/tests/matrix_free/cell_categorization.cc index 69ef873491..9bc5b19359 100644 --- a/tests/matrix_free/cell_categorization.cc +++ b/tests/matrix_free/cell_categorization.cc @@ -87,7 +87,7 @@ test() static_cast(cell->center()[1] * 10.); data.cell_vectorization_categories_strict = false; - mf_data.reinit(dof, constraints, QGauss<1>(2), data); + mf_data.reinit(MappingQ1{}, dof, constraints, QGauss<1>(2), data); deallog << "Number of cell batches: " << mf_data.n_cell_batches() << std::endl; @@ -99,7 +99,7 @@ test() deallog << std::endl; data.cell_vectorization_categories_strict = true; - mf_data.reinit(dof, constraints, QGauss<1>(2), data); + mf_data.reinit(MappingQ1{}, dof, constraints, QGauss<1>(2), data); deallog << "Number of cell batches: " << mf_data.n_cell_batches() << std::endl; for (unsigned int i = 0; i < mf_data.n_cell_batches(); ++i) @@ -116,7 +116,7 @@ test() 100000000); data.cell_vectorization_categories_strict = false; - mf_data.reinit(dof, constraints, QGauss<1>(2), data); + mf_data.reinit(MappingQ1{}, dof, constraints, QGauss<1>(2), data); deallog << "Number of cell batches: " << mf_data.n_cell_batches() << std::endl; for (unsigned int i = 0; i < mf_data.n_cell_batches(); ++i) diff --git a/tests/matrix_free/cell_categorization_02.cc b/tests/matrix_free/cell_categorization_02.cc index 7078023974..e028aaec03 100644 --- a/tests/matrix_free/cell_categorization_02.cc +++ b/tests/matrix_free/cell_categorization_02.cc @@ -112,7 +112,7 @@ test() cell->material_id(); } - mf_data.reinit(dof, constraints, QGauss<1>(2), data); + mf_data.reinit(MappingQ1{}, dof, constraints, QGauss<1>(2), data); const unsigned int max_level = tria.n_global_levels() - 1; std::vector::AdditionalData> @@ -154,7 +154,8 @@ test() mg_mf_data[level] = std::make_shared>(); - mg_mf_data[level]->reinit(dof, + mg_mf_data[level]->reinit(MappingQ1{}, + dof, level_constraints, QGauss<1>(2), mg_additional_data[level]); diff --git a/tests/matrix_free/cell_level_and_index.cc b/tests/matrix_free/cell_level_and_index.cc index f49a110395..6da5628102 100644 --- a/tests/matrix_free/cell_level_and_index.cc +++ b/tests/matrix_free/cell_level_and_index.cc @@ -108,7 +108,7 @@ test(const bool adaptive_ref = true) { std::cout << "Compare active indices." << std::endl; - mf_data->reinit(dof, constraints, quad, additional_data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, additional_data); compare_indices(mf_data.get()); } @@ -116,7 +116,7 @@ test(const bool adaptive_ref = true) std::cout << "Compare level indices." << std::endl; const unsigned int level = tria.n_global_levels() - 1; additional_data.mg_level = level; - mf_data->reinit(dof, constraints, quad, additional_data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, additional_data); compare_indices(mf_data.get()); } } diff --git a/tests/matrix_free/compress_constraints.cc b/tests/matrix_free/compress_constraints.cc index 9a56246045..7a82b46d88 100644 --- a/tests/matrix_free/compress_constraints.cc +++ b/tests/matrix_free/compress_constraints.cc @@ -83,7 +83,7 @@ test() const QGauss<1> quad(2); MatrixFree mf; - mf.reinit(dof, constraints, quad); + mf.reinit(MappingQ1{}, dof, constraints, quad); deallog << "Number of hanging nodes: " << constraints.n_constraints() << std::endl; diff --git a/tests/matrix_free/compress_mapping.cc b/tests/matrix_free/compress_mapping.cc index f41700ddc5..8579d2c5e5 100644 --- a/tests/matrix_free/compress_mapping.cc +++ b/tests/matrix_free/compress_mapping.cc @@ -81,7 +81,7 @@ test() MatrixFree mf; typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf.reinit(dof, constraints, quad, data); + mf.reinit(MappingQ1{}, dof, constraints, quad, data); const unsigned int n_cell_batches = mf.n_cell_batches(); std::vector n_cell_types(4, 0); @@ -118,7 +118,7 @@ test_cube() MatrixFree mf; typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf.reinit(dof, constraints, quad, data); + mf.reinit(MappingQ1{}, dof, constraints, quad, data); const unsigned int n_cell_batches = mf.n_cell_batches(); std::vector n_cell_types(4, 0); @@ -161,7 +161,7 @@ test_parallelogram() MatrixFree mf; typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf.reinit(dof, constraints, quad, data); + mf.reinit(MappingQ1{}, dof, constraints, quad, data); const unsigned int n_cell_batches = mf.n_cell_batches(); std::vector n_cell_types(4, 0); @@ -236,7 +236,7 @@ test_deformed_cube() data.mapping_update_flags_boundary_faces = update_gradients | update_normal_vectors; - mf.reinit(dof, constraints, quad, data); + mf.reinit(MappingQ1{}, dof, constraints, quad, data); const unsigned int n_cell_batches = mf.n_cell_batches(); Assert(n_cell_batches > 1, ExcInternalError()); diff --git a/tests/matrix_free/copy.cc b/tests/matrix_free/copy.cc index 786221e9f1..5d2f804a11 100644 --- a/tests/matrix_free/copy.cc +++ b/tests/matrix_free/copy.cc @@ -83,7 +83,8 @@ sub_test() MatrixFree mf_data; { const QGauss<1> quad(fe_degree + 1); - mf_data.reinit(dof, + mf_data.reinit(MappingQ1{}, + dof, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/dg_pbc_01.cc b/tests/matrix_free/dg_pbc_01.cc index cf5fb323c5..8d510cd0ce 100644 --- a/tests/matrix_free/dg_pbc_01.cc +++ b/tests/matrix_free/dg_pbc_01.cc @@ -81,7 +81,7 @@ test() (update_gradients | update_JxW_values); MatrixFree mf_data; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); LinearAlgebra::distributed::Vector rhs, sol; mf_data.initialize_dof_vector(rhs); diff --git a/tests/matrix_free/dg_pbc_02.cc b/tests/matrix_free/dg_pbc_02.cc index 4e4668e84e..bbae6eefc3 100644 --- a/tests/matrix_free/dg_pbc_02.cc +++ b/tests/matrix_free/dg_pbc_02.cc @@ -96,7 +96,7 @@ test() { MatrixFree mf_data; data.mg_level = level; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); std::vector n_inner_faces(2 * dim), n_inner_other_faces(2 * dim), n_boundary_faces(2 * dim); for (unsigned int f = 0; f < mf_data.n_inner_face_batches(); ++f) diff --git a/tests/matrix_free/dof_info_01.cc b/tests/matrix_free/dof_info_01.cc index 7d028ae68b..bc00d956c3 100644 --- a/tests/matrix_free/dof_info_01.cc +++ b/tests/matrix_free/dof_info_01.cc @@ -94,7 +94,7 @@ test(const bool adaptive_ref = true) typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } const unsigned int n_cells = mf_data->n_cell_batches(); diff --git a/tests/matrix_free/dof_info_02.cc b/tests/matrix_free/dof_info_02.cc index a6e4e13b12..a35550f863 100644 --- a/tests/matrix_free/dof_info_02.cc +++ b/tests/matrix_free/dof_info_02.cc @@ -96,7 +96,7 @@ test(const bool adaptive_ref = true) typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } const unsigned int n_cells = mf_data->n_cell_batches(); diff --git a/tests/matrix_free/estimate_condition_number_mass.cc b/tests/matrix_free/estimate_condition_number_mass.cc index 31129ae596..c7cb869c3e 100644 --- a/tests/matrix_free/estimate_condition_number_mass.cc +++ b/tests/matrix_free/estimate_condition_number_mass.cc @@ -120,7 +120,7 @@ test(const FiniteElement &fe, const unsigned int n_iterations) const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; data.tasks_block_size = 8 / VectorizedArray::size(); - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/face_setup_01.cc b/tests/matrix_free/face_setup_01.cc index fbd8883b25..e677ea65cb 100644 --- a/tests/matrix_free/face_setup_01.cc +++ b/tests/matrix_free/face_setup_01.cc @@ -69,7 +69,8 @@ main(int argc, char **argv) DoFTools::make_hanging_node_constraints(dof_handler, constraint); constraint.close(); - matrix_free.reinit(dof_handler, constraint, QGauss<1>(4), data); + matrix_free.reinit( + MappingQ1{}, dof_handler, constraint, QGauss<1>(4), data); LinearAlgebra::distributed::Vector src; matrix_free.initialize_dof_vector(src); diff --git a/tests/matrix_free/faces_value_optimization.cc b/tests/matrix_free/faces_value_optimization.cc index 3e61358ff2..5250a7f13a 100644 --- a/tests/matrix_free/faces_value_optimization.cc +++ b/tests/matrix_free/faces_value_optimization.cc @@ -221,7 +221,7 @@ test() data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/faces_value_optimization_02.cc b/tests/matrix_free/faces_value_optimization_02.cc index d5c4ed36a4..421e9a9703 100644 --- a/tests/matrix_free/faces_value_optimization_02.cc +++ b/tests/matrix_free/faces_value_optimization_02.cc @@ -221,7 +221,7 @@ test() data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/faces_value_optimization_03.cc b/tests/matrix_free/faces_value_optimization_03.cc index 7630a6adcc..08ef9dd319 100644 --- a/tests/matrix_free/faces_value_optimization_03.cc +++ b/tests/matrix_free/faces_value_optimization_03.cc @@ -225,7 +225,7 @@ test() data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/fe_evaluation_dofs_per_cell.cc b/tests/matrix_free/fe_evaluation_dofs_per_cell.cc index d875d17f6a..5c285d9937 100644 --- a/tests/matrix_free/fe_evaluation_dofs_per_cell.cc +++ b/tests/matrix_free/fe_evaluation_dofs_per_cell.cc @@ -78,7 +78,8 @@ test() deallog << "Checking " << fes[i]->get_name() << std::endl; dof.distribute_dofs(*fes[i]); MatrixFree matrix_free; - matrix_free.reinit(dof, + matrix_free.reinit(MappingQ1{}, + dof, AffineConstraints(), QGauss<1>(degree + 3), typename MatrixFree::AdditionalData()); diff --git a/tests/matrix_free/get_functions_common.h b/tests/matrix_free/get_functions_common.h index 6e4927fe33..9b64dd67a9 100644 --- a/tests/matrix_free/get_functions_common.h +++ b/tests/matrix_free/get_functions_common.h @@ -265,7 +265,7 @@ do_test(const DoFHandler & dof, typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.mapping_update_flags = update_gradients | update_hessians; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/get_functions_faces.cc b/tests/matrix_free/get_functions_faces.cc index fbd802ef77..889003bce2 100644 --- a/tests/matrix_free/get_functions_faces.cc +++ b/tests/matrix_free/get_functions_faces.cc @@ -143,7 +143,7 @@ test() data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); Vector in(dof.n_dofs()); diff --git a/tests/matrix_free/get_functions_multife.cc b/tests/matrix_free/get_functions_multife.cc index e299a94e79..fdd2224625 100644 --- a/tests/matrix_free/get_functions_multife.cc +++ b/tests/matrix_free/get_functions_multife.cc @@ -276,7 +276,8 @@ test() std::vector> quad; for (unsigned int no = 0; no < 2; ++no) quad.push_back(QGauss<1>(fe_degree + 1 + no)); - mf_data.reinit(dof, + mf_data.reinit(MappingQ1{}, + dof, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/get_functions_multife2.cc b/tests/matrix_free/get_functions_multife2.cc index c0405b448e..6931c1ac50 100644 --- a/tests/matrix_free/get_functions_multife2.cc +++ b/tests/matrix_free/get_functions_multife2.cc @@ -328,7 +328,8 @@ test() std::vector> quad; quad.push_back(QGauss<1>(1)); quad.push_back(QGauss<1>(fe_degree + 1)); - mf_data.reinit(dof, + mf_data.reinit(MappingQ1{}, + dof, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/get_functions_variants.cc b/tests/matrix_free/get_functions_variants.cc index 77ae5f593a..67f2abb0f1 100644 --- a/tests/matrix_free/get_functions_variants.cc +++ b/tests/matrix_free/get_functions_variants.cc @@ -184,7 +184,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.mapping_update_flags = update_gradients | update_hessians; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/get_functions_variants_gl.cc b/tests/matrix_free/get_functions_variants_gl.cc index 7bb8f888d9..00751fc840 100644 --- a/tests/matrix_free/get_functions_variants_gl.cc +++ b/tests/matrix_free/get_functions_variants_gl.cc @@ -180,7 +180,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.mapping_update_flags = update_gradients | update_hessians; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/get_values_plain.cc b/tests/matrix_free/get_values_plain.cc index c7698baddd..2e57f1d1ee 100644 --- a/tests/matrix_free/get_values_plain.cc +++ b/tests/matrix_free/get_values_plain.cc @@ -141,7 +141,7 @@ do_test(const DoFHandler & dof, typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.store_plain_indices = true; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/integrate_functions.cc b/tests/matrix_free/integrate_functions.cc index b48c4fa210..30ae4a0d9b 100644 --- a/tests/matrix_free/integrate_functions.cc +++ b/tests/matrix_free/integrate_functions.cc @@ -204,7 +204,8 @@ test() MatrixFree mf_data; { const QGauss<1> quad(fe_degree + 1); - mf_data.reinit(dof, + mf_data.reinit(MappingQ1{}, + dof, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/integrate_functions_hessians.cc b/tests/matrix_free/integrate_functions_hessians.cc index ec4f2132de..b6e589dd23 100644 --- a/tests/matrix_free/integrate_functions_hessians.cc +++ b/tests/matrix_free/integrate_functions_hessians.cc @@ -223,7 +223,7 @@ test() data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.mapping_update_flags |= update_hessians; const QGauss<1> quad(fe_degree + 1); - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/integrate_functions_multife.cc b/tests/matrix_free/integrate_functions_multife.cc index 7cf4569ada..278e5172f7 100644 --- a/tests/matrix_free/integrate_functions_multife.cc +++ b/tests/matrix_free/integrate_functions_multife.cc @@ -323,7 +323,8 @@ test() std::vector> quad; for (unsigned int no = 0; no < 2; ++no) quad.push_back(QGauss<1>(fe_degree + 1 + no)); - mf_data.reinit(dof, + mf_data.reinit(MappingQ1{}, + dof, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/integrate_functions_multife2.cc b/tests/matrix_free/integrate_functions_multife2.cc index 08b97bc456..d62a472352 100644 --- a/tests/matrix_free/integrate_functions_multife2.cc +++ b/tests/matrix_free/integrate_functions_multife2.cc @@ -313,7 +313,8 @@ test() std::vector> quad; quad.push_back(QGauss<1>(1)); quad.push_back(QGauss<1>(fe_degree + 1)); - mf_data.reinit(dof, + mf_data.reinit(MappingQ1{}, + dof, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/interpolate_functions_common.h b/tests/matrix_free/interpolate_functions_common.h index 7b0f90b5e4..05253c65b3 100644 --- a/tests/matrix_free/interpolate_functions_common.h +++ b/tests/matrix_free/interpolate_functions_common.h @@ -342,7 +342,7 @@ do_test(const DoFHandler & dof, update_gradients | update_hessians | update_quadrature_points; data.mapping_update_flags_inner_faces = update_gradients | update_hessians | update_quadrature_points; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/inverse_mass_02.cc b/tests/matrix_free/inverse_mass_02.cc index e2317de3a2..fe9ded6246 100644 --- a/tests/matrix_free/inverse_mass_02.cc +++ b/tests/matrix_free/inverse_mass_02.cc @@ -142,7 +142,7 @@ do_test(const DoFHandler &dof) data.tasks_block_size = 3; AffineConstraints constraints; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/inverse_mass_04.cc b/tests/matrix_free/inverse_mass_04.cc index 4b1f0aa7a9..fc0a869a50 100644 --- a/tests/matrix_free/inverse_mass_04.cc +++ b/tests/matrix_free/inverse_mass_04.cc @@ -59,7 +59,8 @@ test() AffineConstraints dummy; typename MatrixFree::AdditionalData additional_data; additional_data.mapping_update_flags |= update_quadrature_points; - matrix_free.reinit(dof, dummy, QGauss<1>(degree + 1), additional_data); + matrix_free.reinit( + MappingQ1{}, dof, dummy, QGauss<1>(degree + 1), additional_data); FEEvaluation fe_eval(matrix_free); FEEvaluation fe_eval_default(matrix_free); diff --git a/tests/matrix_free/inverse_mass_07.cc b/tests/matrix_free/inverse_mass_07.cc index 0e2c72ff32..bf7558c248 100644 --- a/tests/matrix_free/inverse_mass_07.cc +++ b/tests/matrix_free/inverse_mass_07.cc @@ -136,7 +136,7 @@ do_test(const DoFHandler &dof) data.tasks_block_size = 3; AffineConstraints constraints; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/inverse_mass_09.cc b/tests/matrix_free/inverse_mass_09.cc index 91737e817e..6413df82fa 100644 --- a/tests/matrix_free/inverse_mass_09.cc +++ b/tests/matrix_free/inverse_mass_09.cc @@ -134,7 +134,7 @@ do_test(const DoFHandler &dof) data.tasks_block_size = 3; AffineConstraints constraints; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/jxw_values.cc b/tests/matrix_free/jxw_values.cc index 81c71637c1..9cbb239f6b 100644 --- a/tests/matrix_free/jxw_values.cc +++ b/tests/matrix_free/jxw_values.cc @@ -71,7 +71,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.mapping_update_flags = update_JxW_values; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } double error = 0, error2 = 0, abs = 0; diff --git a/tests/matrix_free/laplace_operator_01.cc b/tests/matrix_free/laplace_operator_01.cc index 5224b70d76..f7c0da4f75 100644 --- a/tests/matrix_free/laplace_operator_01.cc +++ b/tests/matrix_free/laplace_operator_01.cc @@ -113,7 +113,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::LaplaceOperator< diff --git a/tests/matrix_free/laplace_operator_02.cc b/tests/matrix_free/laplace_operator_02.cc index eb5c0f5b36..1c49149a7d 100644 --- a/tests/matrix_free/laplace_operator_02.cc +++ b/tests/matrix_free/laplace_operator_02.cc @@ -156,7 +156,7 @@ test() data.tasks_block_size = 7; data.mapping_update_flags = update_quadrature_points | update_gradients | update_JxW_values; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } std::shared_ptr>> coefficient; diff --git a/tests/matrix_free/laplace_operator_03.cc b/tests/matrix_free/laplace_operator_03.cc index ed588d9a92..0338181cfb 100644 --- a/tests/matrix_free/laplace_operator_03.cc +++ b/tests/matrix_free/laplace_operator_03.cc @@ -110,7 +110,7 @@ test() data.tasks_block_size = 7; data.mapping_update_flags = update_quadrature_points | update_gradients | update_JxW_values; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } std::shared_ptr>> coefficient; diff --git a/tests/matrix_free/loop_boundary.cc b/tests/matrix_free/loop_boundary.cc index 4e0ce30886..7d5db81bb9 100644 --- a/tests/matrix_free/loop_boundary.cc +++ b/tests/matrix_free/loop_boundary.cc @@ -58,7 +58,8 @@ do_test(const unsigned int n_refine, const bool overlap_communication) add_data.mapping_update_flags_boundary_faces = update_values | update_JxW_values | update_quadrature_points; add_data.overlap_communication_computation = overlap_communication; - matrix_free.reinit(dof_handler, + matrix_free.reinit(MappingQ1{}, + dof_handler, constraints, QGauss<1>(fe.degree + 1), add_data); diff --git a/tests/matrix_free/loop_boundary_02.cc b/tests/matrix_free/loop_boundary_02.cc index 1736158ed5..d555f5752c 100644 --- a/tests/matrix_free/loop_boundary_02.cc +++ b/tests/matrix_free/loop_boundary_02.cc @@ -60,7 +60,8 @@ do_test(const unsigned int n_refine) update_JxW_values | update_quadrature_points; add_data.mapping_update_flags_boundary_faces = update_values | update_JxW_values | update_quadrature_points; - matrix_free.reinit(dof_handler, + matrix_free.reinit(MappingQ1{}, + dof_handler, constraints, QGauss<1>(fe.degree + 1), add_data); diff --git a/tests/matrix_free/mass_operator_01.cc b/tests/matrix_free/mass_operator_01.cc index f0afa71489..202aaa98f1 100644 --- a/tests/matrix_free/mass_operator_01.cc +++ b/tests/matrix_free/mass_operator_01.cc @@ -120,7 +120,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator quad(2); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data_0->reinit(dof, constraints_0, quad, data); - mf_data_1->reinit(dof, constraints_1, quad, data); + mf_data_0->reinit(MappingQ1{}, dof, constraints_0, quad, data); + mf_data_1->reinit(MappingQ1{}, dof, constraints_1, quad, data); { std::vector *> dof_handlers(2, &dof); std::vector *> constraint(2); constraint[0] = &constraints_0; constraint[1] = &constraints_1; - mf_data_combined->reinit(dof_handlers, constraint, quad, data); + mf_data_combined->reinit( + MappingQ1{}, dof_handlers, constraint, quad, data); } MatrixFreeOperators:: diff --git a/tests/matrix_free/matrix_vector_10.cc b/tests/matrix_free/matrix_vector_10.cc index ad1a59c1e9..fefbe0e37e 100644 --- a/tests/matrix_free/matrix_vector_10.cc +++ b/tests/matrix_free/matrix_vector_10.cc @@ -118,7 +118,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest{}, dof, constraints, quad, data); MatrixFreeTest::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc index 03579dca42..5770be7e87 100644 --- a/tests/matrix_free/matrix_vector_13.cc +++ b/tests/matrix_free/matrix_vector_13.cc @@ -174,7 +174,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/matrix_vector_18.cc b/tests/matrix_free/matrix_vector_18.cc index 680a048d24..f1da1bbee9 100644 --- a/tests/matrix_free/matrix_vector_18.cc +++ b/tests/matrix_free/matrix_vector_18.cc @@ -134,7 +134,7 @@ do_test(const DoFHandler & dof, data.tasks_block_size = 7; data.mapping_update_flags |= update_hessians; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/matrix_vector_19.cc b/tests/matrix_free/matrix_vector_19.cc index 02ebc58782..8d04d28139 100644 --- a/tests/matrix_free/matrix_vector_19.cc +++ b/tests/matrix_free/matrix_vector_19.cc @@ -112,7 +112,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest::AdditionalData::partition_color; data.tasks_block_size = 7; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/matrix_vector_21.cc b/tests/matrix_free/matrix_vector_21.cc index bfc4a2fd28..051b6da361 100644 --- a/tests/matrix_free/matrix_vector_21.cc +++ b/tests/matrix_free/matrix_vector_21.cc @@ -170,7 +170,7 @@ test() data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; data.tasks_block_size = 7; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/matrix_vector_22.cc b/tests/matrix_free/matrix_vector_22.cc index d829da9476..9024633c7a 100644 --- a/tests/matrix_free/matrix_vector_22.cc +++ b/tests/matrix_free/matrix_vector_22.cc @@ -177,7 +177,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/matrix_vector_23.cc b/tests/matrix_free/matrix_vector_23.cc index cc64976947..aff768c059 100644 --- a/tests/matrix_free/matrix_vector_23.cc +++ b/tests/matrix_free/matrix_vector_23.cc @@ -188,7 +188,7 @@ test() const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest mf(mf_data); diff --git a/tests/matrix_free/matrix_vector_24.cc b/tests/matrix_free/matrix_vector_24.cc index 4fa936fae2..ba604f974b 100644 --- a/tests/matrix_free/matrix_vector_24.cc +++ b/tests/matrix_free/matrix_vector_24.cc @@ -102,7 +102,7 @@ test() const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeVariant::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.overlap_communication_computation = false; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest quad(fe_degree + 1); - mf_data.reinit(dof_handler_sca, + mf_data.reinit(MappingQ1{}, + dof_handler_sca, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/matrix_vector_div.cc b/tests/matrix_free/matrix_vector_div.cc index e7541cbb0f..e48584a176 100644 --- a/tests/matrix_free/matrix_vector_div.cc +++ b/tests/matrix_free/matrix_vector_div.cc @@ -255,7 +255,8 @@ test() // setup matrix-free structure { QGauss<1> quad(fe_degree + 1); - mf_data.reinit(dof_handler_sca, + mf_data.reinit(MappingQ1{}, + dof_handler_sca, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/matrix_vector_faces_16.cc b/tests/matrix_free/matrix_vector_faces_16.cc index 14d4c9fd03..764a5b829e 100644 --- a/tests/matrix_free/matrix_vector_faces_16.cc +++ b/tests/matrix_free/matrix_vector_faces_16.cc @@ -85,7 +85,7 @@ test() data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); @@ -105,7 +105,7 @@ test() mf_data.renumber_dofs(renumbering); dof.renumber_dofs(renumbering); - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); mf_data.initialize_dof_vector(in2); mf_data.initialize_dof_vector(out2); for (unsigned int i = 0; i < in.local_size(); ++i) diff --git a/tests/matrix_free/matrix_vector_faces_20.cc b/tests/matrix_free/matrix_vector_faces_20.cc index 98589c5d31..1e125b5454 100644 --- a/tests/matrix_free/matrix_vector_faces_20.cc +++ b/tests/matrix_free/matrix_vector_faces_20.cc @@ -97,7 +97,7 @@ test() (update_gradients | update_JxW_values); data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); @@ -209,7 +209,7 @@ test() // finally compare to a series of scalar problems MatrixFree mf_data_scalar; - mf_data_scalar.reinit(dof, constraints, quad, data); + mf_data_scalar.reinit(MappingQ1{}, dof, constraints, quad, data); LinearAlgebra::distributed::Vector in_small, out_small, ref_small; mf_data_scalar.initialize_dof_vector(in_small); diff --git a/tests/matrix_free/matrix_vector_faces_21.cc b/tests/matrix_free/matrix_vector_faces_21.cc index 1b9ed1ca9b..68583c5385 100644 --- a/tests/matrix_free/matrix_vector_faces_21.cc +++ b/tests/matrix_free/matrix_vector_faces_21.cc @@ -100,14 +100,14 @@ test() (update_gradients | update_JxW_values); data.initialize_mapping = false; - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); std::vector renumbering; mf_data.renumber_dofs(renumbering); dof_system.renumber_dofs(renumbering); data.initialize_mapping = true; - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); @@ -219,7 +219,7 @@ test() // finally compare to a series of scalar problems MatrixFree mf_data_scalar; - mf_data_scalar.reinit(dof, constraints, quad, data); + mf_data_scalar.reinit(MappingQ1{}, dof, constraints, quad, data); LinearAlgebra::distributed::Vector in_small, out_small, ref_small; mf_data_scalar.initialize_dof_vector(in_small); diff --git a/tests/matrix_free/matrix_vector_faces_22.cc b/tests/matrix_free/matrix_vector_faces_22.cc index 122d63d8f4..beb03ae66c 100644 --- a/tests/matrix_free/matrix_vector_faces_22.cc +++ b/tests/matrix_free/matrix_vector_faces_22.cc @@ -96,7 +96,7 @@ test() (update_gradients | update_JxW_values); data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); @@ -192,7 +192,7 @@ test() // finally compare to a series of scalar problems MatrixFree mf_data_scalar; - mf_data_scalar.reinit(dof, constraints, quad, data); + mf_data_scalar.reinit(MappingQ1{}, dof, constraints, quad, data); LinearAlgebra::distributed::Vector in_small, out_small, ref_small; mf_data_scalar.initialize_dof_vector(in_small); diff --git a/tests/matrix_free/matrix_vector_faces_23.cc b/tests/matrix_free/matrix_vector_faces_23.cc index b8bc76912a..d7fc6abe84 100644 --- a/tests/matrix_free/matrix_vector_faces_23.cc +++ b/tests/matrix_free/matrix_vector_faces_23.cc @@ -100,14 +100,14 @@ test() (update_gradients | update_JxW_values); data.initialize_mapping = false; - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); std::vector renumbering; mf_data.renumber_dofs(renumbering); dof_system.renumber_dofs(renumbering); data.initialize_mapping = true; - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); @@ -203,7 +203,7 @@ test() // finally compare to a series of scalar problems MatrixFree mf_data_scalar; - mf_data_scalar.reinit(dof, constraints, quad, data); + mf_data_scalar.reinit(MappingQ1{}, dof, constraints, quad, data); LinearAlgebra::distributed::Vector in_small, out_small, ref_small; mf_data_scalar.initialize_dof_vector(in_small); diff --git a/tests/matrix_free/matrix_vector_faces_30.cc b/tests/matrix_free/matrix_vector_faces_30.cc index 96a0db6187..f3bfcfbbc4 100644 --- a/tests/matrix_free/matrix_vector_faces_30.cc +++ b/tests/matrix_free/matrix_vector_faces_30.cc @@ -98,7 +98,7 @@ test() (update_gradients | update_JxW_values); data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); @@ -210,7 +210,7 @@ test() // finally compare to a series of scalar problems MatrixFree mf_data_scalar; - mf_data_scalar.reinit(dof, constraints, quad, data); + mf_data_scalar.reinit(MappingQ1{}, dof, constraints, quad, data); LinearAlgebra::distributed::Vector in_small, out_small, ref_small; mf_data_scalar.initialize_dof_vector(in_small); diff --git a/tests/matrix_free/matrix_vector_faces_31.cc b/tests/matrix_free/matrix_vector_faces_31.cc index fa6b13f7c6..a0feb60f11 100644 --- a/tests/matrix_free/matrix_vector_faces_31.cc +++ b/tests/matrix_free/matrix_vector_faces_31.cc @@ -93,7 +93,7 @@ do_test(const unsigned int fe_degree) (update_gradients | update_JxW_values); data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); @@ -205,7 +205,7 @@ do_test(const unsigned int fe_degree) // finally compare to a series of scalar problems MatrixFree mf_data_scalar; - mf_data_scalar.reinit(dof, constraints, quad, data); + mf_data_scalar.reinit(MappingQ1{}, dof, constraints, quad, data); LinearAlgebra::distributed::Vector in_small, out_small, ref_small; mf_data_scalar.initialize_dof_vector(in_small); diff --git a/tests/matrix_free/matrix_vector_faces_32.cc b/tests/matrix_free/matrix_vector_faces_32.cc index 63689845c3..b1aab3525a 100644 --- a/tests/matrix_free/matrix_vector_faces_32.cc +++ b/tests/matrix_free/matrix_vector_faces_32.cc @@ -93,7 +93,7 @@ do_test(const unsigned int fe_degree) (update_gradients | update_JxW_values); data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - mf_data.reinit(dof_system, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof_system, constraints, quad, data); mf_data.initialize_dof_vector(in); mf_data.initialize_dof_vector(out); @@ -189,7 +189,7 @@ do_test(const unsigned int fe_degree) // finally compare to a series of scalar problems MatrixFree mf_data_scalar; - mf_data_scalar.reinit(dof, constraints, quad, data); + mf_data_scalar.reinit(MappingQ1{}, dof, constraints, quad, data); LinearAlgebra::distributed::Vector in_small, out_small, ref_small; mf_data_scalar.initialize_dof_vector(in_small); diff --git a/tests/matrix_free/matrix_vector_hp.cc b/tests/matrix_free/matrix_vector_hp.cc index e942e0ceb7..4e118b3612 100644 --- a/tests/matrix_free/matrix_vector_hp.cc +++ b/tests/matrix_free/matrix_vector_hp.cc @@ -194,7 +194,8 @@ test() MatrixFree mf_data; typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quadrature_collection_mf, data); + mf_data.reinit( + MappingQ1{}, dof, constraints, quadrature_collection_mf, data); MatrixFreeTestHP mf(mf_data); // assemble sparse matrix with (\nabla v, diff --git a/tests/matrix_free/matrix_vector_hp_no_template.cc b/tests/matrix_free/matrix_vector_hp_no_template.cc index 10ac6975e8..547e112ec8 100644 --- a/tests/matrix_free/matrix_vector_hp_no_template.cc +++ b/tests/matrix_free/matrix_vector_hp_no_template.cc @@ -157,7 +157,8 @@ test() MatrixFree mf_data; typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quadrature_collection_mf, data); + mf_data.reinit( + MappingQ1{}, dof, constraints, quadrature_collection_mf, data); MatrixFreeTestHP mf(mf_data); // assemble sparse matrix with (\nabla v, diff --git a/tests/matrix_free/matrix_vector_hp_parallel_01.cc b/tests/matrix_free/matrix_vector_hp_parallel_01.cc index 7c2244f40d..052d4ebdec 100644 --- a/tests/matrix_free/matrix_vector_hp_parallel_01.cc +++ b/tests/matrix_free/matrix_vector_hp_parallel_01.cc @@ -198,7 +198,8 @@ test() MatrixFree mf_data; typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quadrature_collection_mf, data); + mf_data.reinit( + MappingQ1{}, dof, constraints, quadrature_collection_mf, data); MatrixFreeTestHP mf(mf_data); // assemble sparse matrix with (\nabla v, diff --git a/tests/matrix_free/matrix_vector_large_degree_01.cc b/tests/matrix_free/matrix_vector_large_degree_01.cc index 3de882743e..d05473f3d1 100644 --- a/tests/matrix_free/matrix_vector_large_degree_01.cc +++ b/tests/matrix_free/matrix_vector_large_degree_01.cc @@ -73,7 +73,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest, fe_degree + 1> mf( @@ -88,7 +88,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest, fe_degree + 2> mf( diff --git a/tests/matrix_free/matrix_vector_large_degree_02.cc b/tests/matrix_free/matrix_vector_large_degree_02.cc index b815c42aed..b2c64f8683 100644 --- a/tests/matrix_free/matrix_vector_large_degree_02.cc +++ b/tests/matrix_free/matrix_vector_large_degree_02.cc @@ -96,7 +96,7 @@ test() const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest> mf(mf_data); diff --git a/tests/matrix_free/matrix_vector_large_degree_03.cc b/tests/matrix_free/matrix_vector_large_degree_03.cc index 752d7ccf51..c43244f060 100644 --- a/tests/matrix_free/matrix_vector_large_degree_03.cc +++ b/tests/matrix_free/matrix_vector_large_degree_03.cc @@ -71,7 +71,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeTest, fe_degree + 1> mf( @@ -84,7 +84,8 @@ test() MatrixFree mf_data; { - mf_data.reinit(dof, constraints, QGauss<1>(fe_degree + 2), data); + mf_data.reinit( + MappingQ1{}, dof, constraints, QGauss<1>(fe_degree + 2), data); MatrixFreeTest, fe_degree + 2> mf( mf_data); mf.vmult(out, in); @@ -96,7 +97,7 @@ test() // unfortunately we cannot use for loops due to the template, so duplicate // some code here { - mf_data.reinit(dof, constraints, QGauss<1>(100), data); + mf_data.reinit(MappingQ1{}, dof, constraints, QGauss<1>(100), data); MatrixFreeTest, 100> mf(mf_data); mf.vmult(out, in); out -= ref; @@ -104,7 +105,7 @@ test() << " quadrature points: " << out.l2_norm() << std::endl; } { - mf_data.reinit(dof, constraints, QGauss<1>(200), data); + mf_data.reinit(MappingQ1{}, dof, constraints, QGauss<1>(200), data); MatrixFreeTest, 200> mf(mf_data); mf.vmult(out, in); out -= ref; @@ -112,7 +113,7 @@ test() << " quadrature points: " << out.l2_norm() << std::endl; } { - mf_data.reinit(dof, constraints, QGauss<1>(500), data); + mf_data.reinit(MappingQ1{}, dof, constraints, QGauss<1>(500), data); MatrixFreeTest, 500> mf(mf_data); mf.vmult(out, in); out -= ref; @@ -120,7 +121,7 @@ test() << " quadrature points: " << out.l2_norm() << std::endl; } { - mf_data.reinit(dof, constraints, QGauss<1>(1000), data); + mf_data.reinit(MappingQ1{}, dof, constraints, QGauss<1>(1000), data); MatrixFreeTest, 1000> mf(mf_data); mf.vmult(out, in); out -= ref; diff --git a/tests/matrix_free/matrix_vector_stokes.cc b/tests/matrix_free/matrix_vector_stokes.cc index b4ca43baaa..47ef30df7b 100644 --- a/tests/matrix_free/matrix_vector_stokes.cc +++ b/tests/matrix_free/matrix_vector_stokes.cc @@ -286,7 +286,8 @@ test() constraints.push_back(&dummy_constraints); constraints.push_back(&dummy_constraints); QGauss<1> quad(fe_degree + 2); - mf_data.reinit(dofs, + mf_data.reinit(MappingQ1{}, + dofs, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/matrix_vector_stokes_base.cc b/tests/matrix_free/matrix_vector_stokes_base.cc index 7e81a77fe9..734640ece3 100644 --- a/tests/matrix_free/matrix_vector_stokes_base.cc +++ b/tests/matrix_free/matrix_vector_stokes_base.cc @@ -265,7 +265,8 @@ test() constraints.push_back(&constraints_p); QGauss<1> quad(degree + 2); // no parallelism - mf_data->reinit(dofs, + mf_data->reinit(MappingQ1{}, + dofs, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/matrix_vector_stokes_flux.cc b/tests/matrix_free/matrix_vector_stokes_flux.cc index 4c9faf4e28..6c356c8fca 100644 --- a/tests/matrix_free/matrix_vector_stokes_flux.cc +++ b/tests/matrix_free/matrix_vector_stokes_flux.cc @@ -271,7 +271,8 @@ test() { QGauss<1> quad(fe_degree + 2); // no parallelism - mf_data.reinit(dof_handler, + mf_data.reinit(MappingQ1{}, + dof_handler, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/matrix_vector_stokes_qdg0.cc b/tests/matrix_free/matrix_vector_stokes_qdg0.cc index 9b6ce902a5..b3979b955a 100644 --- a/tests/matrix_free/matrix_vector_stokes_qdg0.cc +++ b/tests/matrix_free/matrix_vector_stokes_qdg0.cc @@ -288,7 +288,8 @@ test() constraints.push_back(&dummy_constraints); constraints.push_back(&dummy_constraints); QGauss<1> quad(fe_degree + 2); - mf_data.reinit(dofs, + mf_data.reinit(MappingQ1{}, + dofs, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/matrix_vector_stokes_qdg0b.cc b/tests/matrix_free/matrix_vector_stokes_qdg0b.cc index 1d54f67091..32f0ac05d6 100644 --- a/tests/matrix_free/matrix_vector_stokes_qdg0b.cc +++ b/tests/matrix_free/matrix_vector_stokes_qdg0b.cc @@ -285,7 +285,8 @@ test(const unsigned int fe_degree) constraints.push_back(&dummy_constraints); constraints.push_back(&dummy_constraints); QGauss<1> quad(fe_degree + 2); - mf_data.reinit(dofs, + mf_data.reinit(MappingQ1{}, + dofs, constraints, quad, typename MatrixFree::AdditionalData( diff --git a/tests/matrix_free/no_index_initialize.cc b/tests/matrix_free/no_index_initialize.cc index 777d1f4659..c06e562f79 100644 --- a/tests/matrix_free/no_index_initialize.cc +++ b/tests/matrix_free/no_index_initialize.cc @@ -144,7 +144,7 @@ do_test(const DoFHandler & dof, data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.mapping_update_flags = update_gradients | update_hessians; data.initialize_indices = false; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } deallog << "Testing " << dof.get_fe().get_name() << " without read" diff --git a/tests/matrix_free/pbc_orientation_01.cc b/tests/matrix_free/pbc_orientation_01.cc index 2b274a1366..10ebba40b7 100644 --- a/tests/matrix_free/pbc_orientation_01.cc +++ b/tests/matrix_free/pbc_orientation_01.cc @@ -154,7 +154,8 @@ test() AffineConstraints dummy; dummy.close(); - data.reinit(dof_handler, dummy, quadrature, additional_data); + data.reinit( + MappingQ1{}, dof_handler, dummy, quadrature, additional_data); using VectorType = LinearAlgebra::distributed::Vector; diff --git a/tests/matrix_free/pbc_orientation_02.cc b/tests/matrix_free/pbc_orientation_02.cc index 3bf0819cf4..dbca48e58a 100644 --- a/tests/matrix_free/pbc_orientation_02.cc +++ b/tests/matrix_free/pbc_orientation_02.cc @@ -153,7 +153,8 @@ test() AffineConstraints dummy; dummy.close(); - data.reinit(dof_handler, dummy, quadrature, additional_data); + data.reinit( + MappingQ1{}, dof_handler, dummy, quadrature, additional_data); using VectorType = LinearAlgebra::distributed::Vector; diff --git a/tests/matrix_free/pre_and_post_loops_01.cc b/tests/matrix_free/pre_and_post_loops_01.cc index ce59665116..4f12630946 100644 --- a/tests/matrix_free/pre_and_post_loops_01.cc +++ b/tests/matrix_free/pre_and_post_loops_01.cc @@ -148,7 +148,7 @@ test() const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } Matrix mf(mf_data); diff --git a/tests/matrix_free/pre_and_post_loops_02.cc b/tests/matrix_free/pre_and_post_loops_02.cc index 28bc8354a9..741ca5cdb5 100644 --- a/tests/matrix_free/pre_and_post_loops_02.cc +++ b/tests/matrix_free/pre_and_post_loops_02.cc @@ -157,7 +157,7 @@ test() const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } Matrix mf(mf_data); diff --git a/tests/matrix_free/pre_and_post_loops_03.cc b/tests/matrix_free/pre_and_post_loops_03.cc index 98f06de90b..f5e073ec6c 100644 --- a/tests/matrix_free/pre_and_post_loops_03.cc +++ b/tests/matrix_free/pre_and_post_loops_03.cc @@ -150,7 +150,7 @@ test() const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } Matrix mf(mf_data); diff --git a/tests/matrix_free/pre_and_post_loops_04.cc b/tests/matrix_free/pre_and_post_loops_04.cc index b0458e2b55..4e4d4bcf15 100644 --- a/tests/matrix_free/pre_and_post_loops_04.cc +++ b/tests/matrix_free/pre_and_post_loops_04.cc @@ -147,7 +147,7 @@ test() const QGauss<1> quad(fe_degree + 1); typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } Matrix mf(mf_data); diff --git a/tests/matrix_free/pre_and_post_loops_06.cc b/tests/matrix_free/pre_and_post_loops_06.cc index 97c140dfba..1c2ad7ddf0 100644 --- a/tests/matrix_free/pre_and_post_loops_06.cc +++ b/tests/matrix_free/pre_and_post_loops_06.cc @@ -150,7 +150,7 @@ test() typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_partition; - mf_data.reinit(dof, constraints, quad, data); + mf_data.reinit(MappingQ1{}, dof, constraints, quad, data); } Matrix mf(mf_data); diff --git a/tests/matrix_free/step-37-inhomogeneous-1.cc b/tests/matrix_free/step-37-inhomogeneous-1.cc index f6e98219bd..5b31b9b00b 100644 --- a/tests/matrix_free/step-37-inhomogeneous-1.cc +++ b/tests/matrix_free/step-37-inhomogeneous-1.cc @@ -419,7 +419,8 @@ namespace Step37 (update_gradients | update_JxW_values | update_quadrature_points); std::shared_ptr> system_mf_storage( new MatrixFree()); - system_mf_storage->reinit(dof_handler, + system_mf_storage->reinit(MappingQ1{}, + dof_handler, constraints, QGauss<1>(fe.degree + 1), additional_data); @@ -459,7 +460,8 @@ namespace Step37 additional_data.mg_level = level; std::shared_ptr> mg_mf_storage_level( new MatrixFree()); - mg_mf_storage_level->reinit(dof_handler, + mg_mf_storage_level->reinit(MappingQ1{}, + dof_handler, level_constraints, QGauss<1>(fe.degree + 1), additional_data); diff --git a/tests/matrix_free/step-37.cc b/tests/matrix_free/step-37.cc index 04a1e1b681..8fb95bf791 100644 --- a/tests/matrix_free/step-37.cc +++ b/tests/matrix_free/step-37.cc @@ -219,7 +219,8 @@ namespace Step37 additional_data.mg_level = level; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); - data.reinit(dof_handler, + data.reinit(MappingQ1{}, + dof_handler, constraints, QGauss<1>(fe_degree + 1), additional_data); diff --git a/tests/matrix_free/step-48.cc b/tests/matrix_free/step-48.cc index c23a8a321d..0164a9f778 100644 --- a/tests/matrix_free/step-48.cc +++ b/tests/matrix_free/step-48.cc @@ -305,10 +305,8 @@ namespace Step48 additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_partition; - matrix_free_data.reinit(dof_handler, - constraints, - quadrature, - additional_data); + matrix_free_data.reinit( + MappingQ1{}, dof_handler, constraints, quadrature, additional_data); matrix_free_data.initialize_dof_vector(solution); old_solution.reinit(solution); diff --git a/tests/matrix_free/step-48b.cc b/tests/matrix_free/step-48b.cc index 549d8b0cf8..0afaa04926 100644 --- a/tests/matrix_free/step-48b.cc +++ b/tests/matrix_free/step-48b.cc @@ -269,10 +269,8 @@ namespace Step48 additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - matrix_free_data.reinit(dof_handler, - constraints, - quadrature, - additional_data); + matrix_free_data.reinit( + MappingQ1{}, dof_handler, constraints, quadrature, additional_data); matrix_free_data.initialize_dof_vector(solution); old_solution.reinit(solution); diff --git a/tests/matrix_free/step-48c.cc b/tests/matrix_free/step-48c.cc index f3b3e0318c..44e99d4c92 100644 --- a/tests/matrix_free/step-48c.cc +++ b/tests/matrix_free/step-48c.cc @@ -275,10 +275,8 @@ namespace Step48 additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_partition; - matrix_free_data.reinit(dof_handler, - constraints, - quadrature, - additional_data); + matrix_free_data.reinit( + MappingQ1{}, dof_handler, constraints, quadrature, additional_data); matrix_free_data.initialize_dof_vector(solution); old_solution.reinit(solution); diff --git a/tests/matrix_free/stokes_computation.cc b/tests/matrix_free/stokes_computation.cc index 8a247fc827..b6b2410686 100644 --- a/tests/matrix_free/stokes_computation.cc +++ b/tests/matrix_free/stokes_computation.cc @@ -1086,7 +1086,8 @@ namespace StokesClass (update_values | update_JxW_values | update_quadrature_points); std::shared_ptr> mass_mf_storage( new MatrixFree()); - mass_mf_storage->reinit(dof_handler_p, + mass_mf_storage->reinit(MappingQ1{}, + dof_handler_p, constraints_p, QGauss<1>(degree_u + 1), additional_data_mass); @@ -1128,7 +1129,8 @@ namespace StokesClass additional_data.mg_level = level; std::shared_ptr> mg_mf_storage_level( new MatrixFree()); - mg_mf_storage_level->reinit(dof_handler_u, + mg_mf_storage_level->reinit(MappingQ1{}, + dof_handler_u, level_constraints, QGauss<1>(degree_u + 1), additional_data); diff --git a/tests/matrix_free/thread_correctness.cc b/tests/matrix_free/thread_correctness.cc index db99a6b301..f94a12e480 100644 --- a/tests/matrix_free/thread_correctness.cc +++ b/tests/matrix_free/thread_correctness.cc @@ -86,7 +86,8 @@ sub_test() MatrixFree mf_data, mf_data_color, mf_data_partition; { const QGauss<1> quad(fe_degree + 1); - mf_data.reinit(dof, + mf_data.reinit(MappingQ1{}, + dof, constraints, quad, typename MatrixFree::AdditionalData( @@ -96,12 +97,14 @@ sub_test() // some irregularity to the blocks (stress the // non-overlapping computation harder) mf_data_color.reinit( + MappingQ1{}, dof, constraints, quad, typename MatrixFree::AdditionalData( MatrixFree::AdditionalData::partition_color, 3)); mf_data_partition.reinit( + MappingQ1{}, dof, constraints, quad, diff --git a/tests/matrix_free/thread_correctness_dg.cc b/tests/matrix_free/thread_correctness_dg.cc index e8c4a89ba7..5a1163943e 100644 --- a/tests/matrix_free/thread_correctness_dg.cc +++ b/tests/matrix_free/thread_correctness_dg.cc @@ -84,7 +84,8 @@ sub_test() MatrixFree mf_data, mf_data_color, mf_data_partition; { const QGauss<1> quad(fe_degree + 1); - mf_data.reinit(dof, + mf_data.reinit(MappingQ1{}, + dof, constraints, quad, typename MatrixFree::AdditionalData( @@ -94,6 +95,7 @@ sub_test() // some irregularity to the blocks (stress the // non-overlapping computation harder) mf_data_color.reinit( + MappingQ1{}, dof, constraints, quad, @@ -101,6 +103,7 @@ sub_test() MatrixFree::AdditionalData::partition_color, 3)); mf_data_partition.reinit( + MappingQ1{}, dof, constraints, quad, diff --git a/tests/matrix_free/thread_correctness_hp.cc b/tests/matrix_free/thread_correctness_hp.cc index 852563232b..9ba60e2dfd 100644 --- a/tests/matrix_free/thread_correctness_hp.cc +++ b/tests/matrix_free/thread_correctness_hp.cc @@ -146,7 +146,8 @@ do_test(const unsigned int parallel_option) MatrixFree mf_data; typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mf_data.reinit(dof, constraints, quadrature_collection_mf, data); + mf_data.reinit( + MappingQ1{}, dof, constraints, quadrature_collection_mf, data); MatrixFreeTestHP mf(mf_data); // test different block sizes, starting from @@ -174,7 +175,8 @@ do_test(const unsigned int parallel_option) deallog << "Parallel option partition/color" << std::endl; } data.tasks_block_size = 1; - mf_data_par.reinit(dof, constraints, quadrature_collection_mf, data); + mf_data_par.reinit( + MappingQ1{}, dof, constraints, quadrature_collection_mf, data); MatrixFreeTestHP mf_par(mf_data_par); // fill a right hand side vector with random diff --git a/tests/mpi/parallel_block_vector_05.cc b/tests/mpi/parallel_block_vector_05.cc index 6d7ae5f10f..b3c6852647 100644 --- a/tests/mpi/parallel_block_vector_05.cc +++ b/tests/mpi/parallel_block_vector_05.cc @@ -106,7 +106,7 @@ test(const unsigned int n_blocks = 5) typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; - mf_data->reinit(dof, constraints, quad, data); + mf_data->reinit(MappingQ1{}, dof, constraints, quad, data); } MatrixFreeOperators::MassOperator> mg_mf_storage_level( new MatrixFree()); - mg_mf_storage_level->reinit(dof_handler, + mg_mf_storage_level->reinit(MappingQ1{}, + dof_handler, level_constraints, QGauss<1>(fe.degree + 1), additional_data);