Skip to content

Commit

Permalink
Remove parameter use_fast_hanging_node_algorithm from MF
Browse files Browse the repository at this point in the history
  • Loading branch information
peterrum committed Apr 23, 2022
1 parent eb77e94 commit e8ffa1a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
15 changes: 3 additions & 12 deletions include/deal.II/matrix_free/matrix_free.h
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ class MatrixFree : public Subscriptor
const bool overlap_communication_computation = true,
const bool hold_all_faces_to_owned_cells = false,
const bool cell_vectorization_categories_strict = false,
const bool allow_ghosted_vectors_in_loops = true,
const bool use_fast_hanging_node_algorithm = true)
const bool allow_ghosted_vectors_in_loops = true)
: tasks_parallel_scheme(tasks_parallel_scheme)
, tasks_block_size(tasks_block_size)
, mapping_update_flags(mapping_update_flags)
Expand All @@ -241,7 +240,6 @@ class MatrixFree : public Subscriptor
, cell_vectorization_categories_strict(
cell_vectorization_categories_strict)
, allow_ghosted_vectors_in_loops(allow_ghosted_vectors_in_loops)
, use_fast_hanging_node_algorithm(use_fast_hanging_node_algorithm)
, communicator_sm(MPI_COMM_SELF)
{}

Expand All @@ -268,7 +266,6 @@ class MatrixFree : public Subscriptor
, cell_vectorization_categories_strict(
other.cell_vectorization_categories_strict)
, allow_ghosted_vectors_in_loops(other.allow_ghosted_vectors_in_loops)
, use_fast_hanging_node_algorithm(other.use_fast_hanging_node_algorithm)
, communicator_sm(other.communicator_sm)
{}

Expand Down Expand Up @@ -296,9 +293,8 @@ class MatrixFree : public Subscriptor
cell_vectorization_category = other.cell_vectorization_category;
cell_vectorization_categories_strict =
other.cell_vectorization_categories_strict;
allow_ghosted_vectors_in_loops = other.allow_ghosted_vectors_in_loops;
use_fast_hanging_node_algorithm = other.use_fast_hanging_node_algorithm;
communicator_sm = other.communicator_sm;
allow_ghosted_vectors_in_loops = other.allow_ghosted_vectors_in_loops;
communicator_sm = other.communicator_sm;

return *this;
}
Expand Down Expand Up @@ -535,11 +531,6 @@ class MatrixFree : public Subscriptor
*/
bool allow_ghosted_vectors_in_loops;

/**
* Flag that allows to disable the fast hanging-node algorithm.
*/
bool use_fast_hanging_node_algorithm;

/**
* Shared-memory MPI communicator. Default: MPI_COMM_SELF.
*/
Expand Down
8 changes: 3 additions & 5 deletions include/deal.II/matrix_free/matrix_free.templates.h
Original file line number Diff line number Diff line change
Expand Up @@ -1064,8 +1064,7 @@ namespace internal
std::vector<MatrixFreeFunctions::DoFInfo> & dof_info,
MatrixFreeFunctions::FaceSetup<dim> & face_setup,
MatrixFreeFunctions::ConstraintValues<double> & constraint_values,
const bool use_vector_data_exchanger_full,
const bool use_fast_hanging_node_algorithm_in)
const bool use_vector_data_exchanger_full)
{
if (do_face_integrals)
face_setup.initialize(dof_handler[0]->get_triangulation(),
Expand All @@ -1091,7 +1090,7 @@ namespace internal

bool cell_categorization_enabled = !cell_vectorization_category.empty();

bool use_fast_hanging_node_algorithm = use_fast_hanging_node_algorithm_in;
bool use_fast_hanging_node_algorithm = true;

if (use_fast_hanging_node_algorithm)
{
Expand Down Expand Up @@ -1825,8 +1824,7 @@ MatrixFree<dim, Number, VectorizedArrayType>::initialize_indices(
dof_info,
face_setup,
constraint_values,
additional_data.communicator_sm != MPI_COMM_SELF,
additional_data.use_fast_hanging_node_algorithm);
additional_data.communicator_sm != MPI_COMM_SELF);

// set constraint pool from the std::map and reorder the indices
std::vector<const std::vector<double> *> constraints(
Expand Down

0 comments on commit e8ffa1a

Please sign in to comment.