From: Martin Kronbichler Date: Tue, 22 Aug 2023 08:34:39 +0000 (+0200) Subject: Fix some failing tests X-Git-Tag: relicensing~571^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45af9470ed63749614186a11d964b738b8010d7a;p=dealii.git Fix some failing tests --- diff --git a/tests/base/graph_coloring_01.cc b/tests/base/graph_coloring_01.cc index b2dfd42218..ef9b504a1f 100644 --- a/tests/base/graph_coloring_01.cc +++ b/tests/base/graph_coloring_01.cc @@ -38,7 +38,7 @@ template std::vector get_conflict_indices_cfem( - typename DoFHandler::active_cell_const iterator &it) + const typename DoFHandler::active_cell_iterator &it) { std::vector local_dof_indices( it->get_fe().dofs_per_cell); @@ -67,7 +67,7 @@ check() cell, dof_handler.end(), std::function( - typename DoFHandler::active_cell_const iterator &)>( + const typename DoFHandler::active_cell_iterator &)>( &get_conflict_indices_cfem))); // Output the coloring diff --git a/tests/base/graph_coloring_02.cc b/tests/base/graph_coloring_02.cc index 7febd009c3..27e573eb61 100644 --- a/tests/base/graph_coloring_02.cc +++ b/tests/base/graph_coloring_02.cc @@ -38,7 +38,7 @@ template std::vector get_conflict_indices_cfem( - typename DoFHandler::active_cell_const iterator &it) + const typename DoFHandler::active_cell_iterator &it) { std::vector local_dof_indices( it->get_fe().dofs_per_cell); @@ -76,7 +76,7 @@ check() dof_handler.begin_active(), dof_handler.end(), std::function( - typename DoFHandler::active_cell_const iterator &)>( + const typename DoFHandler::active_cell_iterator &)>( &get_conflict_indices_cfem))); // Output the coloring diff --git a/tests/base/graph_coloring_02a.cc b/tests/base/graph_coloring_02a.cc index bc3bfb0e99..86628eea66 100644 --- a/tests/base/graph_coloring_02a.cc +++ b/tests/base/graph_coloring_02a.cc @@ -38,7 +38,7 @@ template std::vector get_conflict_indices_cfem( - typename DoFHandler::active_cell_const iterator &it) + const typename DoFHandler::active_cell_iterator &it) { std::vector local_dof_indices( it->get_fe().dofs_per_cell); @@ -78,7 +78,7 @@ check() dof_handler.begin_active(), dof_handler.end(), std::function( - typename DoFHandler::active_cell_const iterator &)>( + const typename DoFHandler::active_cell_iterator &)>( &get_conflict_indices_cfem))); // verify that within each color, there is no conflict diff --git a/tests/base/graph_coloring_03.cc b/tests/base/graph_coloring_03.cc index 7543c9b3df..5924734642 100644 --- a/tests/base/graph_coloring_03.cc +++ b/tests/base/graph_coloring_03.cc @@ -38,7 +38,7 @@ template std::vector get_conflict_indices_cfem( - typename DoFHandler::active_cell_const iterator &it) + const typename DoFHandler::active_cell_iterator &it) { std::vector local_dof_indices( it->get_fe().dofs_per_cell); @@ -79,7 +79,7 @@ check() dof_handler.begin_active(), dof_handler.end(), std::function( - typename DoFHandler::active_cell_const iterator &)>( + const typename DoFHandler::active_cell_iterator &)>( &get_conflict_indices_cfem))); // Output the coloring diff --git a/tests/base/graph_coloring_05.cc b/tests/base/graph_coloring_05.cc index c71be40045..2bde6fdbf9 100644 --- a/tests/base/graph_coloring_05.cc +++ b/tests/base/graph_coloring_05.cc @@ -39,7 +39,7 @@ template std::vector get_conflict_indices_cfem( - typename DoFHandler::active_cell_const iterator &it) + const typename DoFHandler::active_cell_iterator &it) { std::vector local_dof_indices( it->get_fe().dofs_per_cell); @@ -77,7 +77,7 @@ check() dof_handler.begin_active(), dof_handler.end(), std::function( - typename DoFHandler::active_cell_const iterator &)>( + const typename DoFHandler::active_cell_iterator &)>( &get_conflict_indices_cfem))); // Check that a color does not contain a conflict index twice diff --git a/tests/base/graph_coloring_06.cc b/tests/base/graph_coloring_06.cc index 02357f59e5..a7efbf72a2 100644 --- a/tests/base/graph_coloring_06.cc +++ b/tests/base/graph_coloring_06.cc @@ -38,7 +38,7 @@ template std::vector get_conflict_indices_cfem( - typename DoFHandler::active_cell_const iterator &it) + const typename DoFHandler::active_cell_iterator &it) { std::vector local_dof_indices( it->get_fe().dofs_per_cell); @@ -82,7 +82,7 @@ check() dof_handler.begin_active(), dof_handler.end(), std::function( - typename DoFHandler::active_cell_const iterator &)>( + const typename DoFHandler::active_cell_iterator &)>( &get_conflict_indices_cfem)); for (unsigned int color = 0; color < coloring.size(); ++color) diff --git a/tests/numerics/assemble_matrix_parallel_01.cc b/tests/numerics/assemble_matrix_parallel_01.cc index 1e385bc37d..c740f489a8 100644 --- a/tests/numerics/assemble_matrix_parallel_01.cc +++ b/tests/numerics/assemble_matrix_parallel_01.cc @@ -128,7 +128,7 @@ private: std::vector get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const; + const typename DoFHandler::active_cell_iterator &cell) const; Triangulation triangulation; @@ -238,7 +238,7 @@ LaplaceProblem::~LaplaceProblem() template std::vector LaplaceProblem::get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const + const typename DoFHandler::active_cell_iterator &cell) const { std::vector local_dof_indices( cell->get_fe().dofs_per_cell); @@ -278,7 +278,7 @@ LaplaceProblem::setup_system() dof_handler.begin_active(), dof_handler.end(), static_cast( - typename DoFHandler::active_cell_const iterator &)>>( + const typename DoFHandler::active_cell_iterator &)>>( std::bind(&LaplaceProblem::get_conflict_indices, this, std::placeholders::_1))); diff --git a/tests/numerics/assemble_matrix_parallel_02.cc b/tests/numerics/assemble_matrix_parallel_02.cc index 86e9c3c547..5da0c4e975 100644 --- a/tests/numerics/assemble_matrix_parallel_02.cc +++ b/tests/numerics/assemble_matrix_parallel_02.cc @@ -143,7 +143,7 @@ private: std::vector get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const; + const typename DoFHandler::active_cell_iterator &cell) const; Triangulation triangulation; @@ -255,7 +255,7 @@ LaplaceProblem::~LaplaceProblem() template std::vector LaplaceProblem::get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const + const typename DoFHandler::active_cell_iterator &cell) const { std::vector local_dof_indices( cell->get_fe().dofs_per_cell); @@ -296,7 +296,7 @@ LaplaceProblem::setup_system() dof_handler.begin_active(), dof_handler.end(), static_cast( - typename DoFHandler::active_cell_const iterator &)>>( + const typename DoFHandler::active_cell_iterator &)>>( std::bind(&LaplaceProblem::get_conflict_indices, this, std::placeholders::_1))); diff --git a/tests/numerics/assemble_matrix_parallel_03.cc b/tests/numerics/assemble_matrix_parallel_03.cc index 452f0ef839..8f86b695d7 100644 --- a/tests/numerics/assemble_matrix_parallel_03.cc +++ b/tests/numerics/assemble_matrix_parallel_03.cc @@ -128,7 +128,7 @@ private: std::vector get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const; + const typename DoFHandler::active_cell_iterator &cell) const; Triangulation triangulation; @@ -238,7 +238,7 @@ LaplaceProblem::~LaplaceProblem() template std::vector LaplaceProblem::get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const + const typename DoFHandler::active_cell_iterator &cell) const { std::vector local_dof_indices( cell->get_fe().dofs_per_cell); @@ -278,7 +278,7 @@ LaplaceProblem::setup_system() dof_handler.begin_active(), dof_handler.end(), static_cast( - typename DoFHandler::active_cell_const iterator &)>>( + const typename DoFHandler::active_cell_iterator &)>>( std::bind(&LaplaceProblem::get_conflict_indices, this, std::placeholders::_1))); diff --git a/tests/numerics/assemble_matrix_parallel_04.cc b/tests/numerics/assemble_matrix_parallel_04.cc index 81c93ce19b..ff05998569 100644 --- a/tests/numerics/assemble_matrix_parallel_04.cc +++ b/tests/numerics/assemble_matrix_parallel_04.cc @@ -142,7 +142,7 @@ private: std::vector get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const; + const typename DoFHandler::active_cell_iterator &cell) const; Triangulation triangulation; @@ -254,7 +254,7 @@ LaplaceProblem::~LaplaceProblem() template std::vector LaplaceProblem::get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const + const typename DoFHandler::active_cell_iterator &cell) const { std::vector local_dof_indices( cell->get_fe().dofs_per_cell); @@ -308,7 +308,7 @@ LaplaceProblem::setup_system() dof_handler.begin_active(), dof_handler.end(), static_cast( - typename DoFHandler::active_cell_const iterator &)>>( + const typename DoFHandler::active_cell_iterator &)>>( std::bind(&LaplaceProblem::get_conflict_indices, this, std::placeholders::_1))); diff --git a/tests/petsc/assemble_matrix_parallel_01.cc b/tests/petsc/assemble_matrix_parallel_01.cc index a028c9a85e..e82023c8be 100644 --- a/tests/petsc/assemble_matrix_parallel_01.cc +++ b/tests/petsc/assemble_matrix_parallel_01.cc @@ -127,7 +127,7 @@ private: std::vector get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const; + const typename DoFHandler::active_cell_iterator &cell) const; Triangulation triangulation; @@ -235,7 +235,7 @@ LaplaceProblem::~LaplaceProblem() template std::vector LaplaceProblem::get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const + const typename DoFHandler::active_cell_iterator &cell) const { std::vector local_dof_indices( cell->get_fe().dofs_per_cell); @@ -271,7 +271,7 @@ LaplaceProblem::setup_system() dof_handler.begin_active(), dof_handler.end(), static_cast( - typename DoFHandler::active_cell_const iterator &)>>( + const typename DoFHandler::active_cell_iterator &)>>( std::bind(&LaplaceProblem::get_conflict_indices, this, std::placeholders::_1))); diff --git a/tests/trilinos/assemble_matrix_parallel_01.cc b/tests/trilinos/assemble_matrix_parallel_01.cc index 71441e6370..8817e245a4 100644 --- a/tests/trilinos/assemble_matrix_parallel_01.cc +++ b/tests/trilinos/assemble_matrix_parallel_01.cc @@ -124,7 +124,7 @@ private: std::vector get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const; + const typename DoFHandler::active_cell_iterator &cell) const; Triangulation triangulation; @@ -232,7 +232,7 @@ LaplaceProblem::~LaplaceProblem() template std::vector LaplaceProblem::get_conflict_indices( - typename DoFHandler::active_cell_const iterator &cell) const + const typename DoFHandler::active_cell_iterator &cell) const { std::vector local_dof_indices( cell->get_fe().dofs_per_cell); @@ -271,7 +271,7 @@ LaplaceProblem::setup_system() dof_handler.begin_active(), dof_handler.end(), static_cast( - typename DoFHandler::active_cell_const iterator &)>>( + const typename DoFHandler::active_cell_iterator &)>>( std::bind(&LaplaceProblem::get_conflict_indices, this, std::placeholders::_1)));