From 853967edf0d4577deefb0f5e431358427a6e73e3 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Sat, 2 Jan 2021 11:25:58 +0100 Subject: [PATCH] Remove use_vector_data_exchanger_full --- include/deal.II/matrix_free/matrix_free.h | 12 +----------- include/deal.II/matrix_free/matrix_free.templates.h | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index df9daf21f4..85ed911cd3 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -245,7 +245,6 @@ public: , cell_vectorization_categories_strict( cell_vectorization_categories_strict) , communicator_sm(MPI_COMM_SELF) - , use_vector_data_exchanger_full(false) {} /** @@ -272,7 +271,6 @@ public: , cell_vectorization_categories_strict( other.cell_vectorization_categories_strict) , communicator_sm(other.communicator_sm) - , use_vector_data_exchanger_full(other.use_vector_data_exchanger_full) {} // remove with level_mg_handler @@ -302,8 +300,7 @@ public: cell_vectorization_category = other.cell_vectorization_category; cell_vectorization_categories_strict = other.cell_vectorization_categories_strict; - communicator_sm = other.communicator_sm; - use_vector_data_exchanger_full = other.use_vector_data_exchanger_full; + communicator_sm = other.communicator_sm; return *this; } @@ -541,13 +538,6 @@ public: * Shared-memory MPI communicator. Default: MPI_COMM_SELF. */ MPI_Comm communicator_sm; - - /** - * Experimental: flag to switch between - * internal::MatrixFreeFunctions::VectorDataExchange::PartitionerWrapper and - * internal::MatrixFreeFunctions::VectorDataExchange::Full. - */ - bool use_vector_data_exchanger_full; }; /** diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index de7aac6761..32ad86d9fc 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -1508,7 +1508,7 @@ MatrixFree::initialize_indices( dof_info, face_setup, constraint_values, - additional_data.use_vector_data_exchanger_full); + additional_data.communicator_sm != MPI_COMM_SELF); // set constraint pool from the std::map and reorder the indices std::vector *> constraints( @@ -1670,7 +1670,7 @@ MatrixFree::initialize_indices( face_setup.inner_ghost_faces, is_fe_dg[count++] && additional_data.hold_all_faces_to_owned_cells, task_info.communicator_sm, - additional_data.use_vector_data_exchanger_full); + task_info.communicator_sm != MPI_COMM_SELF); } for (auto &di : dof_info) -- 2.39.5