From e059d9fc1b643c6d93f34474d534faa8d3ba794a Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Thu, 17 Oct 2019 12:47:24 +0200 Subject: [PATCH] Replace level_mg_handler by mg_level --- .../incompatibilities/20191017PeterMunch | 4 ++ examples/step-37/step-37.cc | 2 +- examples/step-59/step-59.cc | 2 +- .../deal.II/matrix_free/face_setup_internal.h | 4 +- include/deal.II/matrix_free/matrix_free.h | 47 +++++++++++-------- .../matrix_free/matrix_free.templates.h | 23 +++++---- tests/mappings/mapping_q_eulerian_08.cc | 2 +- tests/matrix_free/cell_categorization_02.cc | 2 +- tests/matrix_free/cell_level_and_index.cc | 4 +- tests/matrix_free/compare_faces_by_cells.cc | 2 +- tests/matrix_free/dg_pbc_02.cc | 2 +- tests/matrix_free/matrix_vector_mg.cc | 2 +- tests/matrix_free/multigrid_dg_periodic.cc | 2 +- tests/matrix_free/multigrid_dg_sip_01.cc | 2 +- tests/matrix_free/multigrid_dg_sip_02.cc | 2 +- tests/matrix_free/parallel_multigrid.cc | 2 +- tests/matrix_free/parallel_multigrid_02.cc | 2 +- .../parallel_multigrid_adaptive_01.cc | 2 +- .../parallel_multigrid_adaptive_02.cc | 2 +- .../parallel_multigrid_adaptive_03.cc | 2 +- .../parallel_multigrid_adaptive_04.cc | 2 +- .../parallel_multigrid_adaptive_05.cc | 2 +- .../parallel_multigrid_adaptive_06.cc | 2 +- .../parallel_multigrid_adaptive_06ref.cc | 2 +- .../parallel_multigrid_adaptive_07.cc | 2 +- .../parallel_multigrid_adaptive_08.cc | 2 +- .../parallel_multigrid_fullydistributed.cc | 2 +- tests/matrix_free/parallel_multigrid_mf.cc | 2 +- tests/matrix_free/step-37-inhomogeneous-1.cc | 2 +- tests/matrix_free/step-37.cc | 2 +- tests/matrix_free/stokes_computation.cc | 2 +- tests/mpi/step-37.cc | 2 +- 32 files changed, 74 insertions(+), 62 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20191017PeterMunch diff --git a/doc/news/changes/incompatibilities/20191017PeterMunch b/doc/news/changes/incompatibilities/20191017PeterMunch new file mode 100644 index 0000000000..0fe663a7fd --- /dev/null +++ b/doc/news/changes/incompatibilities/20191017PeterMunch @@ -0,0 +1,4 @@ +Changed: The variable level_mg_handler has been renamed +to mg_level in MatrixFree and its associated AdditionalData. +
+(Peter Munch, 2019/10/17) diff --git a/examples/step-37/step-37.cc b/examples/step-37/step-37.cc index 9495fcd8fe..b08866d4a7 100644 --- a/examples/step-37/step-37.cc +++ b/examples/step-37/step-37.cc @@ -866,7 +866,7 @@ namespace Step37 MatrixFree::AdditionalData::none; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); - additional_data.level_mg_handler = level; + additional_data.mg_level = level; std::shared_ptr> mg_mf_storage_level( new MatrixFree()); mg_mf_storage_level->reinit(dof_handler, diff --git a/examples/step-59/step-59.cc b/examples/step-59/step-59.cc index 59ec4472c3..9378c1f8cd 100644 --- a/examples/step-59/step-59.cc +++ b/examples/step-59/step-59.cc @@ -1041,7 +1041,7 @@ namespace Step59 (update_gradients | update_JxW_values); additional_data.mapping_update_flags_boundary_faces = (update_gradients | update_JxW_values); - additional_data.level_mg_handler = level; + additional_data.mg_level = level; const auto mg_mf_storage_level = std::make_shared>(); mg_mf_storage_level->reinit(dof_handler, diff --git a/include/deal.II/matrix_free/face_setup_internal.h b/include/deal.II/matrix_free/face_setup_internal.h index b438b23a00..76ebe7f3dd 100644 --- a/include/deal.II/matrix_free/face_setup_internal.h +++ b/include/deal.II/matrix_free/face_setup_internal.h @@ -171,7 +171,7 @@ namespace internal std::vector> &cell_levels) { use_active_cells = - additional_data.level_mg_handler == numbers::invalid_unsigned_int; + additional_data.mg_level == numbers::invalid_unsigned_int; # ifdef DEBUG // safety check @@ -582,7 +582,7 @@ namespace internal // inside the domain in case of multigrid separately else if ((dcell->at_boundary(f) == false || dcell->has_periodic_neighbor(f)) && - additional_data.level_mg_handler != + additional_data.mg_level != numbers::invalid_unsigned_int && dcell->neighbor_or_periodic_neighbor(f)->level() < dcell->level()) diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index 4c7ed65a92..d2977679f9 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -166,10 +166,10 @@ public: * local time stepping where one would like to control which elements * together form a batch of cells. The array `cell_vectorization_categories` * is accessed by the number given by cell->active_cell_index() when working - * on the active cells with `level_mg_handler` set to `-1` and by - * cell->index() for the level cells. By default, the different categories - * in `cell_vectorization_category` can be mixed and the algorithm is - * allowed to merge lower category numbers with the next higher categories + * on the active cells with `mg_level` set to `numbers::invalid_unsigned_int` + * and by cell->index() for the level cells. By default, the different + * categories in `cell_vectorization_category` can be mixed and the algorithm + * is allowed to merge lower category numbers with the next higher categories * if it is necessary inside the algorithm, in order to avoid partially * filled SIMD lanes as much as possible. This gives a better utilization of * the vectorization but might need special treatment, in particular for @@ -218,7 +218,7 @@ public: const UpdateFlags mapping_update_flags_boundary_faces = update_default, const UpdateFlags mapping_update_flags_inner_faces = update_default, const UpdateFlags mapping_update_flags_faces_by_cells = update_default, - const unsigned int level_mg_handler = numbers::invalid_unsigned_int, + const unsigned int mg_level = numbers::invalid_unsigned_int, const bool store_plain_indices = true, const bool initialize_indices = true, const bool initialize_mapping = true, @@ -231,7 +231,8 @@ public: , mapping_update_flags_boundary_faces(mapping_update_flags_boundary_faces) , mapping_update_flags_inner_faces(mapping_update_flags_inner_faces) , mapping_update_flags_faces_by_cells(mapping_update_flags_faces_by_cells) - , level_mg_handler(level_mg_handler) + , mg_level(mg_level) + , level_mg_handler(this->mg_level) , store_plain_indices(store_plain_indices) , initialize_indices(initialize_indices) , initialize_mapping(initialize_mapping) @@ -381,7 +382,14 @@ public: * to work on a level, its dofs must be distributed by using * dof_handler.distribute_mg_dofs(fe);. */ - unsigned int level_mg_handler; + unsigned int mg_level; + + /** + * Alias for mg_level + * + * @deprecated Use mg_level instead. + */ + DEAL_II_DEPRECATED unsigned int &level_mg_handler; /** * Controls whether to allow reading from vectors without resolving @@ -442,7 +450,7 @@ public: * control which elements together form a batch of cells. * * This array is accessed by the number given by cell->active_cell_index() - * when working on the active cells with @p level_mg_handler set to -1 and + * when working on the active cells with @p mg_level set to numbers::invalid_unsigned_int and * by cell->index() for the level cells. * * @note This field is empty upon construction of AdditionalData. It is @@ -1602,10 +1610,11 @@ public: mapping_initialized() const; /** - * Return the level of the mesh to be worked on. + * Return the level of the mesh to be worked on. Returns + * numbers::invalid_unsigned_int if working on active cells. */ unsigned int - get_level_mg_handler() const; + get_mg_level() const; /** * Return an approximation of the memory consumption of this class in @@ -1938,7 +1947,7 @@ private: /** * Stored the level of the mesh to be worked on. */ - unsigned int level_mg_handler; + unsigned int mg_level; }; @@ -2494,9 +2503,9 @@ MatrixFree::mapping_initialized() const template inline unsigned int -MatrixFree::get_level_mg_handler() const +MatrixFree::get_mg_level() const { - return level_mg_handler; + return mg_level; } @@ -2644,7 +2653,7 @@ MatrixFree::reinit( std::vector locally_owned_sets = internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handlers, additional_data.level_mg_handler); + dof_handlers, additional_data.mg_level); std::vector> quad_hp; quad_hp.emplace_back(quad); @@ -2678,7 +2687,7 @@ MatrixFree::reinit( std::vector locally_owned_sets = internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handlers, additional_data.level_mg_handler); + dof_handlers, additional_data.mg_level); std::vector> quad_hp; quad_hp.emplace_back(quad); @@ -2705,7 +2714,7 @@ MatrixFree::reinit( { std::vector locally_owned_set = internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handler, additional_data.level_mg_handler); + 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]); @@ -2731,7 +2740,7 @@ MatrixFree::reinit( { std::vector locally_owned_set = internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handler, additional_data.level_mg_handler); + dof_handler, additional_data.mg_level); std::vector> quad_hp; quad_hp.emplace_back(quad); internal_reinit(StaticMappingQ1::mapping, @@ -2757,7 +2766,7 @@ MatrixFree::reinit( { std::vector locally_owned_set = internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handler, additional_data.level_mg_handler); + dof_handler, additional_data.mg_level); std::vector> quad_hp; quad_hp.emplace_back(quad); internal_reinit(mapping, @@ -2783,7 +2792,7 @@ MatrixFree::reinit( { std::vector locally_owned_set = internal::MatrixFreeImplementation::extract_locally_owned_index_sets( - dof_handler, additional_data.level_mg_handler); + 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]); diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index a1c2aa7ee1..0bf653412e 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -58,7 +58,7 @@ MatrixFree::MatrixFree() : Subscriptor() , indices_are_initialized(false) , mapping_is_initialized(false) - , level_mg_handler(numbers::invalid_unsigned_int) + , mg_level(numbers::invalid_unsigned_int) {} @@ -250,7 +250,7 @@ MatrixFree::copy_from( task_info = v.task_info; indices_are_initialized = v.indices_are_initialized; mapping_is_initialized = v.mapping_is_initialized; - level_mg_handler = v.level_mg_handler; + mg_level = v.mg_level; } @@ -268,7 +268,7 @@ MatrixFree::internal_reinit( &additional_data) { // Store the level of the mesh to be worked on. - this->level_mg_handler = additional_data.level_mg_handler; + this->mg_level = additional_data.mg_level; // Reads out the FE information and stores the shape function values, // gradients and Hessians for quadrature points. @@ -431,7 +431,7 @@ MatrixFree::internal_reinit( &additional_data) { // Store the level of the mesh to be worked on. - this->level_mg_handler = additional_data.level_mg_handler; + this->mg_level = additional_data.mg_level; // Reads out the FE information and stores the shape function values, // gradients and Hessians for quadrature points. @@ -658,7 +658,7 @@ MatrixFree::initialize_dof_handlers( { cell_level_index.clear(); dof_handlers.active_dof_handler = DoFHandlers::usual; - dof_handlers.level = additional_data.level_mg_handler; + dof_handlers.level = additional_data.mg_level; dof_handlers.n_dof_handlers = dof_handler.size(); dof_handlers.dof_handler.resize(dof_handlers.n_dof_handlers); for (unsigned int no = 0; no < dof_handlers.n_dof_handlers; ++no) @@ -676,7 +676,7 @@ MatrixFree::initialize_dof_handlers( const Triangulation &tria = dof_handlers.dof_handler[0]->get_triangulation(); - const unsigned int level = additional_data.level_mg_handler; + const unsigned int level = additional_data.mg_level; if (level == numbers::invalid_unsigned_int) { if (n_mpi_procs == 1) @@ -727,7 +727,7 @@ MatrixFree::initialize_dof_handlers( { cell_level_index.clear(); dof_handlers.active_dof_handler = DoFHandlers::hp; - dof_handlers.level = additional_data.level_mg_handler; + dof_handlers.level = additional_data.mg_level; Assert(dof_handlers.level == numbers::invalid_unsigned_int, ExcNotImplemented()); dof_handlers.n_dof_handlers = dof_handler.size(); @@ -1039,19 +1039,18 @@ MatrixFree::initialize_indices( for (unsigned int no = 0; no < n_fe; ++no) { if (do_face_integrals && - additional_data.level_mg_handler != numbers::invalid_unsigned_int) + additional_data.mg_level != numbers::invalid_unsigned_int) { // in case of adaptivity, go through the cells on the next finer // level and check whether we need to get read access to some of // those entries for the mg flux matrices const DoFHandler &dof_handler = *dof_handlers.dof_handler[no]; std::vector dof_indices; - if (additional_data.level_mg_handler + 1 < + if (additional_data.mg_level + 1 < dof_handler.get_triangulation().n_global_levels()) for (typename DoFHandler::cell_iterator cell = - dof_handler.begin(additional_data.level_mg_handler + 1); - cell != - dof_handler.end(additional_data.level_mg_handler + 1); + dof_handler.begin(additional_data.mg_level + 1); + cell != dof_handler.end(additional_data.mg_level + 1); ++cell) if (cell->level_subdomain_id() == task_info.my_pid) for (unsigned int f = 0; diff --git a/tests/mappings/mapping_q_eulerian_08.cc b/tests/mappings/mapping_q_eulerian_08.cc index 1ab5851756..a6afbbda8a 100644 --- a/tests/mappings/mapping_q_eulerian_08.cc +++ b/tests/mappings/mapping_q_eulerian_08.cc @@ -280,7 +280,7 @@ test(const unsigned int n_ref = 0) mg_additional_data; mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; - mg_additional_data.level_mg_handler = level; + mg_additional_data.mg_level = level; mg_additional_data.mapping_update_flags = update_values | update_gradients | update_JxW_values | update_quadrature_points; diff --git a/tests/matrix_free/cell_categorization_02.cc b/tests/matrix_free/cell_categorization_02.cc index d415779c66..4269eeb27b 100644 --- a/tests/matrix_free/cell_categorization_02.cc +++ b/tests/matrix_free/cell_categorization_02.cc @@ -135,7 +135,7 @@ test() .cell_vectorization_category[cell->index()] = cell->material_id(); } - mg_additional_data[level].level_mg_handler = level; + mg_additional_data[level].mg_level = level; } std::vector>> mg_mf_data(max_level + diff --git a/tests/matrix_free/cell_level_and_index.cc b/tests/matrix_free/cell_level_and_index.cc index ac16715d5d..bd57218902 100644 --- a/tests/matrix_free/cell_level_and_index.cc +++ b/tests/matrix_free/cell_level_and_index.cc @@ -115,8 +115,8 @@ test(const bool adaptive_ref = true) { std::cout << "Compare level indices." << std::endl; - const unsigned int level = tria.n_global_levels() - 1; - additional_data.level_mg_handler = level; + const unsigned int level = tria.n_global_levels() - 1; + additional_data.mg_level = level; mf_data->reinit(dof, constraints, quad, additional_data); compare_indices(mf_data.get()); } diff --git a/tests/matrix_free/compare_faces_by_cells.cc b/tests/matrix_free/compare_faces_by_cells.cc index e8626fdcae..835e8fce10 100644 --- a/tests/matrix_free/compare_faces_by_cells.cc +++ b/tests/matrix_free/compare_faces_by_cells.cc @@ -64,7 +64,7 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; addit_data.mapping_update_flags_inner_faces = update_JxW_values | update_normal_vectors | update_jacobians; addit_data.mapping_update_flags_boundary_faces = diff --git a/tests/matrix_free/dg_pbc_02.cc b/tests/matrix_free/dg_pbc_02.cc index 2a67eae8cd..7fcd4dbe39 100644 --- a/tests/matrix_free/dg_pbc_02.cc +++ b/tests/matrix_free/dg_pbc_02.cc @@ -97,7 +97,7 @@ test() for (unsigned int level = 0; level < tria.n_global_levels(); ++level) { MatrixFree mf_data; - data.level_mg_handler = level; + data.mg_level = level; mf_data.reinit(dof, constraints, quad, data); std::vector n_inner_faces(2 * dim), n_inner_other_faces(2 * dim), n_boundary_faces(2 * dim); diff --git a/tests/matrix_free/matrix_vector_mg.cc b/tests/matrix_free/matrix_vector_mg.cc index ed1a74a51b..db3be89600 100644 --- a/tests/matrix_free/matrix_vector_mg.cc +++ b/tests/matrix_free/matrix_vector_mg.cc @@ -109,7 +109,7 @@ test() mg_constraints[level].add_line(*bc_it); mg_constraints[level].close(); typename MatrixFree::AdditionalData data; - data.level_mg_handler = level; + data.mg_level = level; mg_matrices[level].reinit( mapping, dof, mg_constraints[level], quad, data); diff --git a/tests/matrix_free/multigrid_dg_periodic.cc b/tests/matrix_free/multigrid_dg_periodic.cc index a9a6550e9b..2009ce4c56 100644 --- a/tests/matrix_free/multigrid_dg_periodic.cc +++ b/tests/matrix_free/multigrid_dg_periodic.cc @@ -77,7 +77,7 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; addit_data.mapping_update_flags_inner_faces = (update_gradients | update_JxW_values); addit_data.mapping_update_flags_boundary_faces = diff --git a/tests/matrix_free/multigrid_dg_sip_01.cc b/tests/matrix_free/multigrid_dg_sip_01.cc index 7dd71a2fca..28a01677a5 100644 --- a/tests/matrix_free/multigrid_dg_sip_01.cc +++ b/tests/matrix_free/multigrid_dg_sip_01.cc @@ -76,7 +76,7 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; addit_data.mapping_update_flags_inner_faces = (update_gradients | update_JxW_values); addit_data.mapping_update_flags_boundary_faces = diff --git a/tests/matrix_free/multigrid_dg_sip_02.cc b/tests/matrix_free/multigrid_dg_sip_02.cc index 980bc41925..728bae208f 100644 --- a/tests/matrix_free/multigrid_dg_sip_02.cc +++ b/tests/matrix_free/multigrid_dg_sip_02.cc @@ -77,7 +77,7 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; addit_data.mapping_update_flags_inner_faces = update_JxW_values | update_normal_vectors | update_jacobians; addit_data.mapping_update_flags_boundary_faces = diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc index 9267b213f0..a574a58661 100644 --- a/tests/matrix_free/parallel_multigrid.cc +++ b/tests/matrix_free/parallel_multigrid.cc @@ -71,7 +71,7 @@ public: typename MatrixFree::AdditionalData addit_data; addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; // extract the constraints due to Dirichlet boundary conditions AffineConstraints constraints; diff --git a/tests/matrix_free/parallel_multigrid_02.cc b/tests/matrix_free/parallel_multigrid_02.cc index 9185a4448d..9c7dc363e7 100644 --- a/tests/matrix_free/parallel_multigrid_02.cc +++ b/tests/matrix_free/parallel_multigrid_02.cc @@ -170,7 +170,7 @@ do_test(const DoFHandler &dof) typename MatrixFree::AdditionalData mg_additional_data; mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mg_additional_data.level_mg_handler = level; + mg_additional_data.mg_level = level; AffineConstraints level_constraints; IndexSet relevant_dofs; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.cc b/tests/matrix_free/parallel_multigrid_adaptive_01.cc index 388fc77ef5..bc981df7d6 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_01.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_01.cc @@ -75,7 +75,7 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; AffineConstraints constraints; if (level == numbers::invalid_unsigned_int) { diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc index 2f2abb724e..3f4135055d 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc @@ -220,7 +220,7 @@ do_test(const DoFHandler &dof) mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; mg_additional_data.tasks_block_size = 3; - mg_additional_data.level_mg_handler = level; + mg_additional_data.mg_level = level; AffineConstraints level_constraints; IndexSet relevant_dofs; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc index b3d2ae6033..1f2f3bca58 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc @@ -81,7 +81,7 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; AffineConstraints constraints; if (level == numbers::invalid_unsigned_int) { diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc index c30c263def..94b2fce21e 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc @@ -220,7 +220,7 @@ do_test(const DoFHandler &dof) mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; mg_additional_data.tasks_block_size = 3; - mg_additional_data.level_mg_handler = level; + mg_additional_data.mg_level = level; AffineConstraints level_constraints; IndexSet relevant_dofs; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_05.cc b/tests/matrix_free/parallel_multigrid_adaptive_05.cc index 3d2b4aee9a..172f4c0663 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_05.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_05.cc @@ -78,7 +78,7 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; AffineConstraints constraints; if (level == numbers::invalid_unsigned_int) { diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06.cc b/tests/matrix_free/parallel_multigrid_adaptive_06.cc index 3febd20874..589fbf310c 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06.cc @@ -311,7 +311,7 @@ do_test(const DoFHandler &dof, const unsigned int nb) mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; mg_additional_data.tasks_block_size = 3; - mg_additional_data.level_mg_handler = level; + mg_additional_data.mg_level = level; AffineConstraints level_constraints; IndexSet relevant_dofs; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc index 4333ee9746..319fc1ab96 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc @@ -221,7 +221,7 @@ do_test(const DoFHandler &dof) mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; mg_additional_data.tasks_block_size = 3; - mg_additional_data.level_mg_handler = level; + mg_additional_data.mg_level = level; AffineConstraints level_constraints; IndexSet relevant_dofs; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_07.cc b/tests/matrix_free/parallel_multigrid_adaptive_07.cc index 85b3a9670e..e6fc902cea 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_07.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_07.cc @@ -338,7 +338,7 @@ do_test(const std::vector *> &dof) mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; mg_additional_data.tasks_block_size = 3; - mg_additional_data.level_mg_handler = level; + mg_additional_data.mg_level = level; std::vector> level_constraints(dof.size()); std::vector *> level_constraints_ptrs( diff --git a/tests/matrix_free/parallel_multigrid_adaptive_08.cc b/tests/matrix_free/parallel_multigrid_adaptive_08.cc index 080c1facd2..e90872503e 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_08.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_08.cc @@ -292,7 +292,7 @@ do_test(const DoFHandler &dof) mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; mg_additional_data.tasks_block_size = 3; - mg_additional_data.level_mg_handler = level; + mg_additional_data.mg_level = level; AffineConstraints level_constraints; IndexSet relevant_dofs; diff --git a/tests/matrix_free/parallel_multigrid_fullydistributed.cc b/tests/matrix_free/parallel_multigrid_fullydistributed.cc index c6ca26874f..77c57bcdd9 100644 --- a/tests/matrix_free/parallel_multigrid_fullydistributed.cc +++ b/tests/matrix_free/parallel_multigrid_fullydistributed.cc @@ -74,7 +74,7 @@ public: typename MatrixFree::AdditionalData addit_data; addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; // extract the constraints due to Dirichlet boundary conditions AffineConstraints constraints; diff --git a/tests/matrix_free/parallel_multigrid_mf.cc b/tests/matrix_free/parallel_multigrid_mf.cc index 2ce591eb19..2bf5b1db4c 100644 --- a/tests/matrix_free/parallel_multigrid_mf.cc +++ b/tests/matrix_free/parallel_multigrid_mf.cc @@ -70,7 +70,7 @@ public: typename MatrixFree::AdditionalData addit_data; addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - addit_data.level_mg_handler = level; + addit_data.mg_level = level; // extract the constraints due to Dirichlet boundary conditions AffineConstraints constraints; diff --git a/tests/matrix_free/step-37-inhomogeneous-1.cc b/tests/matrix_free/step-37-inhomogeneous-1.cc index 838c1900e8..64d429a017 100644 --- a/tests/matrix_free/step-37-inhomogeneous-1.cc +++ b/tests/matrix_free/step-37-inhomogeneous-1.cc @@ -459,7 +459,7 @@ namespace Step37 MatrixFree::AdditionalData::none; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); - additional_data.level_mg_handler = level; + additional_data.mg_level = level; std::shared_ptr> mg_mf_storage_level( new MatrixFree()); mg_mf_storage_level->reinit(dof_handler, diff --git a/tests/matrix_free/step-37.cc b/tests/matrix_free/step-37.cc index a63271f3c1..a3b445ae16 100644 --- a/tests/matrix_free/step-37.cc +++ b/tests/matrix_free/step-37.cc @@ -218,7 +218,7 @@ namespace Step37 typename MatrixFree::AdditionalData additional_data; additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; - additional_data.level_mg_handler = level; + additional_data.mg_level = level; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); data.reinit(dof_handler, diff --git a/tests/matrix_free/stokes_computation.cc b/tests/matrix_free/stokes_computation.cc index eb77cb2620..67aebc6b53 100644 --- a/tests/matrix_free/stokes_computation.cc +++ b/tests/matrix_free/stokes_computation.cc @@ -1133,7 +1133,7 @@ namespace StokesClass MatrixFree::AdditionalData::none; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); - additional_data.level_mg_handler = level; + additional_data.mg_level = level; std::shared_ptr> mg_mf_storage_level( new MatrixFree()); mg_mf_storage_level->reinit(dof_handler_u, diff --git a/tests/mpi/step-37.cc b/tests/mpi/step-37.cc index e8f940a1ef..5d342b5576 100644 --- a/tests/mpi/step-37.cc +++ b/tests/mpi/step-37.cc @@ -269,7 +269,7 @@ namespace Step37 MatrixFree::AdditionalData::none; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); - additional_data.level_mg_handler = level; + additional_data.mg_level = level; std::shared_ptr> mg_mf_storage_level( new MatrixFree()); mg_mf_storage_level->reinit(dof_handler, -- 2.39.5