From 19cb9e2502674c007c80eb1918e90a0db0fd7720 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 11 Jun 2018 17:28:50 +0200 Subject: [PATCH] Avoid FunctionMap in tests --- tests/bits/joa_1.cc | 17 +++++++------- tests/bits/static_condensation.cc | 2 +- tests/bits/step-13.cc | 11 +++++----- tests/bits/step-14.cc | 22 ++++++++++--------- tests/bits/step-51.cc | 4 ++-- tests/bits/step-51p.cc | 4 ++-- tests/bits/step-6-racoptimize-2.cc | 11 +++++----- tests/bits/step-6-racoptimize.cc | 11 +++++----- tests/bits/step-6.cc | 11 +++++----- tests/bits/step-7.cc | 2 +- tests/bits/step-8.cc | 2 +- .../data_out_postprocessor_tensor_01.cc | 11 +++++----- .../data_out_postprocessor_vector_03.cc | 11 +++++----- tests/dofs/dof_renumbering.cc | 3 +-- tests/dofs/dof_tools_14.cc | 4 ++-- tests/dofs/dof_tools_16a.cc | 7 +++--- tests/dofs/dof_tools_16b.cc | 7 +++--- tests/dofs/dof_tools_16c.cc | 7 +++--- tests/dofs/dof_tools_16d.cc | 7 +++--- tests/dofs/range_based_for_step-6.cc | 11 +++++----- tests/fail/circular_01.cc | 11 +++++----- tests/fail/hp-step-14.cc | 22 ++++++++++--------- tests/fe/abf_01.cc | 2 +- tests/fe/deformed_projection.h | 20 ++++++++--------- tests/fe/fe_enriched_step-36.cc | 11 +++++----- tests/fe/fe_enriched_step-36b.cc | 11 +++++----- tests/grid/mesh_3d_12.cc | 6 ++++- tests/hp/boundary_matrices.cc | 4 ++-- tests/hp/boundary_matrices_hp.cc | 4 ++-- tests/hp/crash_17.cc | 11 +++++----- tests/hp/crash_18.cc | 11 +++++----- tests/hp/matrices.cc | 6 ++--- tests/hp/matrices_hp.cc | 6 ++--- tests/hp/step-13.cc | 11 +++++----- tests/hp/step-27.cc | 11 +++++----- tests/hp/step-6.cc | 11 +++++----- tests/hp/step-7.cc | 2 +- tests/hp/step-8.cc | 2 +- tests/lac/constrained_linear_operator_01.cc | 11 +++++----- tests/lac/matrices_02.cc | 6 ++--- tests/lac/schur_complement_03.cc | 13 ++++++----- tests/matrix_free/matrix_vector_mg.cc | 4 ++-- tests/matrix_free/multigrid_dg_sip_01.cc | 6 ++--- tests/matrix_free/multigrid_dg_sip_02.cc | 6 ++--- tests/matrix_free/parallel_multigrid.cc | 6 ++--- tests/matrix_free/parallel_multigrid_02.cc | 4 ++-- .../parallel_multigrid_adaptive_01.cc | 15 +++++++------ .../parallel_multigrid_adaptive_02.cc | 4 ++-- .../parallel_multigrid_adaptive_03.cc | 19 ++++++++-------- .../parallel_multigrid_adaptive_04.cc | 4 ++-- .../parallel_multigrid_adaptive_05.cc | 19 ++++++++-------- .../parallel_multigrid_adaptive_06.cc | 4 ++-- .../parallel_multigrid_adaptive_06ref.cc | 4 ++-- .../parallel_multigrid_adaptive_07.cc | 4 ++-- tests/matrix_free/parallel_multigrid_mf.cc | 12 +++++----- tests/matrix_free/step-37.cc | 4 ++-- tests/meshworker/step-50-mesh_loop.cc | 4 ++-- tests/mpi/interpolate_to_different_mesh_02.cc | 11 +++++----- tests/mpi/muelu_periodicity.cc | 13 ++++++----- tests/mpi/multigrid_adaptive.cc | 16 +++++++------- tests/mpi/multigrid_uniform.cc | 16 +++++++------- tests/mpi/periodicity_01.cc | 11 +++++----- tests/mpi/periodicity_02.cc | 13 ++++++----- tests/mpi/periodicity_03.cc | 13 ++++++----- tests/mpi/step-37.cc | 7 +++--- tests/mpi/trilinos_distribute_04.cc | 4 ++-- tests/multigrid/boundary_01.cc | 5 ++--- tests/multigrid/constrained_dofs_01.cc | 13 +++++------ tests/multigrid/constrained_dofs_02.cc | 13 +++++------ tests/multigrid/constrained_dofs_03.cc | 1 - tests/multigrid/dof_01.cc | 5 ++--- tests/multigrid/dof_02.cc | 5 ++--- tests/multigrid/events_01.cc | 14 ++++++------ tests/multigrid/interface_matrix_entry_01.cc | 4 ++-- tests/multigrid/mg_coarse_01.cc | 14 ++++++------ tests/multigrid/mg_output_dirichlet.cc | 5 +++-- tests/multigrid/mg_output_neumann.cc | 3 ++- tests/multigrid/mg_renumbered_01.cc | 4 ++-- tests/multigrid/mg_renumbered_02.cc | 4 ++-- tests/multigrid/mg_renumbered_03.cc | 4 ++-- tests/multigrid/step-16-02.cc | 4 ++-- tests/multigrid/step-16-03.cc | 16 +++++++------- tests/multigrid/step-16-04.cc | 16 +++++++------- tests/multigrid/step-16-05.cc | 4 ++-- tests/multigrid/step-16-06.cc | 4 ++-- tests/multigrid/step-16-07.cc | 16 +++++++------- .../step-16-50-mpi-linear-operator.cc | 16 +++++++------- tests/multigrid/step-16-50-mpi-smoother.cc | 16 +++++++------- tests/multigrid/step-16-50-mpi.cc | 16 +++++++------- tests/multigrid/step-16-50-serial.cc | 16 +++++++------- tests/multigrid/step-16-bdry1.cc | 4 ++-- tests/multigrid/step-16.cc | 16 +++++++------- tests/multigrid/step-50_01.cc | 14 ++++++------ tests/multigrid/step-50_02.cc | 4 ++-- tests/multigrid/transfer_04.cc | 1 - tests/multigrid/transfer_04a.cc | 5 ++--- tests/multigrid/transfer_04b.cc | 5 ++--- tests/multigrid/transfer_05.cc | 7 +++--- tests/multigrid/transfer_06.cc | 7 +++--- tests/multigrid/transfer_matrix_free_01.cc | 6 ++--- tests/multigrid/transfer_matrix_free_02.cc | 6 ++--- .../transfer_matrix_free_02_block.cc | 6 ++--- .../transfer_matrix_free_02_block_02.cc | 6 ++--- tests/multigrid/transfer_matrix_free_03.cc | 6 ++--- tests/multigrid/transfer_matrix_free_06.cc | 6 ++--- tests/multigrid/transfer_prebuilt_03.cc | 4 ++-- tests/multigrid/transfer_prebuilt_04.cc | 6 ++--- tests/multigrid/transfer_select.cc | 3 +-- .../multigrid/transfer_system_adaptive_02.cc | 4 ++-- .../multigrid/transfer_system_adaptive_04.cc | 4 ++-- .../multigrid/transfer_system_adaptive_06.cc | 4 ++-- .../multigrid/transfer_system_adaptive_08.cc | 4 ++-- tests/numerics/error_estimator_02.cc | 8 +++---- tests/numerics/error_estimator_02_complex.cc | 9 ++++---- tests/numerics/normal_flux_inhom_01.cc | 2 +- tests/numerics/project_boundary_01.cc | 2 +- tests/numerics/project_boundary_rt_01.cc | 6 ++--- tests/numerics/tangential_flux_inhom_01.cc | 2 +- tests/physics/step-18-rotation_matrix.cc | 19 ++++++++-------- tests/physics/step-18.cc | 19 ++++++++-------- tests/trilinos/solver_control_06.cc | 11 +++++----- tests/vector_tools/boundaries.cc | 2 +- tests/vector_tools/boundaries_complex.cc | 3 ++- tests/vector_tools/boundaries_complex_hp.cc | 3 ++- 124 files changed, 521 insertions(+), 491 deletions(-) diff --git a/tests/bits/joa_1.cc b/tests/bits/joa_1.cc index bc549a67d2..8434d19569 100644 --- a/tests/bits/joa_1.cc +++ b/tests/bits/joa_1.cc @@ -808,10 +808,8 @@ LaplaceProblem::solve() // list of boundaries where we have // imposed Neumann value, and the // corresponding Neumann values. This -// information is represented by an -// object of type -// FunctionMap@::type that is -// essentially a map from boundary +// information is represented by +// a map from boundary // indicators to function objects // describing Neumann boundary values // (in the present example program, @@ -841,11 +839,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); // The above function returned one // error indicator value for each diff --git a/tests/bits/static_condensation.cc b/tests/bits/static_condensation.cc index 68d20aff02..2cff4ca7ad 100644 --- a/tests/bits/static_condensation.cc +++ b/tests/bits/static_condensation.cc @@ -539,7 +539,7 @@ HelmholtzProblem::refine_grid() Vector estimated_error_per_cell( triangulation.n_active_cells()); - typename FunctionMap::type neumann_boundary; + std::map *> neumann_boundary; KellyErrorEstimator::estimate(dof_handler, QGauss(3), neumann_boundary, diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc index f94eef1a8e..66e945180d 100644 --- a/tests/bits/step-13.cc +++ b/tests/bits/step-13.cc @@ -632,11 +632,12 @@ namespace LaplaceSolver { Vector estimated_error_per_cell( this->triangulation->n_active_cells()); - KellyErrorEstimator::estimate(this->dof_handler, - QGauss(3), - typename FunctionMap::type(), - this->solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + this->dof_handler, + QGauss(3), + std::map *>(), + this->solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(*this->triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc index 44198bc93f..31533dd6ab 100644 --- a/tests/bits/step-14.cc +++ b/tests/bits/step-14.cc @@ -786,11 +786,12 @@ namespace LaplaceSolver { Vector estimated_error_per_cell( this->triangulation->n_active_cells()); - KellyErrorEstimator::estimate(this->dof_handler, - QGauss(3), - typename FunctionMap::type(), - this->solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + this->dof_handler, + QGauss(3), + std::map *>(), + this->solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(*this->triangulation, estimated_error_per_cell, 0.3, @@ -847,11 +848,12 @@ namespace LaplaceSolver RefinementWeightedKelly::refine_grid() { Vector estimated_error(this->triangulation->n_active_cells()); - KellyErrorEstimator::estimate(this->dof_handler, - *this->face_quadrature, - typename FunctionMap::type(), - this->solution, - estimated_error); + KellyErrorEstimator::estimate( + this->dof_handler, + *this->face_quadrature, + std::map *>(), + this->solution, + estimated_error); typename DoFHandler::active_cell_iterator cell = this->dof_handler .begin_active(), diff --git a/tests/bits/step-51.cc b/tests/bits/step-51.cc index 3be2cf4f7e..8c744f4bac 100644 --- a/tests/bits/step-51.cc +++ b/tests/bits/step-51.cc @@ -350,8 +350,8 @@ namespace Step51 constraints.clear(); DoFTools::make_hanging_node_constraints(dof_handler, constraints); - typename FunctionMap::type boundary_functions; - Solution solution_function; + std::map *> boundary_functions; + Solution solution_function; boundary_functions[0] = &solution_function; VectorTools::project_boundary_values(dof_handler, boundary_functions, diff --git a/tests/bits/step-51p.cc b/tests/bits/step-51p.cc index 5fc7060887..eb77e3053e 100644 --- a/tests/bits/step-51p.cc +++ b/tests/bits/step-51p.cc @@ -350,8 +350,8 @@ namespace Step51 constraints.clear(); DoFTools::make_hanging_node_constraints(dof_handler, constraints); - typename FunctionMap::type boundary_functions; - Solution solution_function; + std::map *> boundary_functions; + Solution solution_function; boundary_functions[0] = &solution_function; VectorTools::project_boundary_values(dof_handler, boundary_functions, diff --git a/tests/bits/step-6-racoptimize-2.cc b/tests/bits/step-6-racoptimize-2.cc index edb69dd0ef..0005fbb29d 100644 --- a/tests/bits/step-6-racoptimize-2.cc +++ b/tests/bits/step-6-racoptimize-2.cc @@ -296,11 +296,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_optimize(triangulation, estimated_error_per_cell, diff --git a/tests/bits/step-6-racoptimize.cc b/tests/bits/step-6-racoptimize.cc index e159bdfd52..848fa67327 100644 --- a/tests/bits/step-6-racoptimize.cc +++ b/tests/bits/step-6-racoptimize.cc @@ -296,11 +296,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_optimize(triangulation, estimated_error_per_cell); diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc index 17b8ed9564..0c93a256c2 100644 --- a/tests/bits/step-6.cc +++ b/tests/bits/step-6.cc @@ -291,11 +291,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc index 6705327d77..93158bcac4 100644 --- a/tests/bits/step-7.cc +++ b/tests/bits/step-7.cc @@ -415,7 +415,7 @@ HelmholtzProblem::refine_grid() Vector estimated_error_per_cell( triangulation.n_active_cells()); - typename FunctionMap::type neumann_boundary; + std::map *> neumann_boundary; KellyErrorEstimator::estimate(dof_handler, QGauss(3), neumann_boundary, diff --git a/tests/bits/step-8.cc b/tests/bits/step-8.cc index e86fb66beb..39a8af519e 100644 --- a/tests/bits/step-8.cc +++ b/tests/bits/step-8.cc @@ -336,7 +336,7 @@ ElasticProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - typename FunctionMap::type neumann_boundary; + std::map *> neumann_boundary; KellyErrorEstimator::estimate(dof_handler, QGauss(2), neumann_boundary, diff --git a/tests/data_out/data_out_postprocessor_tensor_01.cc b/tests/data_out/data_out_postprocessor_tensor_01.cc index 2ccc13d8ac..daf83f3829 100644 --- a/tests/data_out/data_out_postprocessor_tensor_01.cc +++ b/tests/data_out/data_out_postprocessor_tensor_01.cc @@ -299,11 +299,12 @@ namespace Step8 { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(2), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(2), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, diff --git a/tests/data_out/data_out_postprocessor_vector_03.cc b/tests/data_out/data_out_postprocessor_vector_03.cc index 8cdb9a0975..3efbe7d3e7 100644 --- a/tests/data_out/data_out_postprocessor_vector_03.cc +++ b/tests/data_out/data_out_postprocessor_vector_03.cc @@ -237,11 +237,12 @@ Step6::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, diff --git a/tests/dofs/dof_renumbering.cc b/tests/dofs/dof_renumbering.cc index 43719ab081..62c44a8f19 100644 --- a/tests/dofs/dof_renumbering.cc +++ b/tests/dofs/dof_renumbering.cc @@ -146,8 +146,7 @@ check_renumbering(DoFHandler &mgdof, bool discontinuous) // behavior of the // DoFRenumbering::component_wise set // of functions before December 2005 - DoFRenumbering::component_wise(static_cast &>(mgdof), - order); + DoFRenumbering::component_wise(mgdof, order); print_dofs(mgdof, level); } } diff --git a/tests/dofs/dof_tools_14.cc b/tests/dofs/dof_tools_14.cc index 2822fd4340..5700e54aee 100644 --- a/tests/dofs/dof_tools_14.cc +++ b/tests/dofs/dof_tools_14.cc @@ -31,8 +31,8 @@ check_this(const DoFHandler &dof_handler) // no other args deallog << dof_handler.n_boundary_dofs() << std::endl; - // with FunctionMap - typename FunctionMap::type fm; + // with std::map + std::map *> fm; fm[0] = nullptr; deallog << dof_handler.n_boundary_dofs(fm) << std::endl; diff --git a/tests/dofs/dof_tools_16a.cc b/tests/dofs/dof_tools_16a.cc index f00c9f669f..3648667004 100644 --- a/tests/dofs/dof_tools_16a.cc +++ b/tests/dofs/dof_tools_16a.cc @@ -22,8 +22,9 @@ // check // DoFTools:: // make_boundary_sparsity_pattern (const DoFHandler &, -// const typename FunctionMap::type & -// const std::vector & +// const std::map*> & const +// std::vector & // SparsityPattern &); @@ -43,7 +44,7 @@ check_this(const DoFHandler &dof_handler) DoFTools::map_dof_to_boundary_indices(dof_handler, set, map); // create sparsity pattern - typename FunctionMap::type boundary_ids; + std::map *> boundary_ids; boundary_ids[0] = nullptr; SparsityPattern sp(dof_handler.n_boundary_dofs(boundary_ids), dof_handler.max_couplings_between_dofs()); diff --git a/tests/dofs/dof_tools_16b.cc b/tests/dofs/dof_tools_16b.cc index 0a327a8b65..0b7060d370 100644 --- a/tests/dofs/dof_tools_16b.cc +++ b/tests/dofs/dof_tools_16b.cc @@ -22,8 +22,9 @@ // check // DoFTools:: // make_boundary_sparsity_pattern (const DoFHandler &, -// const typename FunctionMap::type & -// const std::vector & +// const std::map*> & const +// std::vector & // DynamicSparsityPattern &); @@ -43,7 +44,7 @@ check_this(const DoFHandler &dof_handler) DoFTools::map_dof_to_boundary_indices(dof_handler, set, map); // create sparsity pattern - typename FunctionMap::type boundary_ids; + std::map *> boundary_ids; boundary_ids[0] = nullptr; DynamicSparsityPattern sp(dof_handler.n_boundary_dofs(boundary_ids)); DoFTools::make_boundary_sparsity_pattern(dof_handler, boundary_ids, map, sp); diff --git a/tests/dofs/dof_tools_16c.cc b/tests/dofs/dof_tools_16c.cc index 9199ee603b..df84a2a32f 100644 --- a/tests/dofs/dof_tools_16c.cc +++ b/tests/dofs/dof_tools_16c.cc @@ -22,8 +22,9 @@ // check // DoFTools:: // make_boundary_sparsity_pattern (const DoFHandler &, -// const typename FunctionMap::type & -// const std::vector & +// const std::map*> & const +// std::vector & // BlockSparsityPattern &); @@ -42,7 +43,7 @@ check_this(const DoFHandler &dof_handler) set.insert(0); DoFTools::map_dof_to_boundary_indices(dof_handler, set, map); - typename FunctionMap::type boundary_ids; + std::map *> boundary_ids; boundary_ids[0] = nullptr; const unsigned int n_boundary_dofs = dof_handler.n_boundary_dofs(boundary_ids); diff --git a/tests/dofs/dof_tools_16d.cc b/tests/dofs/dof_tools_16d.cc index ef63eda919..7724beb484 100644 --- a/tests/dofs/dof_tools_16d.cc +++ b/tests/dofs/dof_tools_16d.cc @@ -22,8 +22,9 @@ // check // DoFTools:: // make_boundary_sparsity_pattern (const DoFHandler &, -// const typename FunctionMap::type & -// const std::vector & +// const std::map*> & const +// std::vector & // BlockDynamicSparsityPattern &); @@ -42,7 +43,7 @@ check_this(const DoFHandler &dof_handler) set.insert(0); DoFTools::map_dof_to_boundary_indices(dof_handler, set, map); - typename FunctionMap::type boundary_ids; + std::map *> boundary_ids; boundary_ids[0] = nullptr; const types::global_dof_index n_boundary_dofs = dof_handler.n_boundary_dofs(boundary_ids); diff --git a/tests/dofs/range_based_for_step-6.cc b/tests/dofs/range_based_for_step-6.cc index 524ec2a60b..c929d18321 100644 --- a/tests/dofs/range_based_for_step-6.cc +++ b/tests/dofs/range_based_for_step-6.cc @@ -277,11 +277,12 @@ Step6::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc index ecd170f928..f477566a3f 100644 --- a/tests/fail/circular_01.cc +++ b/tests/fail/circular_01.cc @@ -468,11 +468,12 @@ void LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - face_quadrature_collection, - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + face_quadrature_collection, + std::map *>(), + solution, + estimated_error_per_cell); Vector smoothness_indicators(triangulation.n_active_cells()); estimate_smoothness(smoothness_indicators); diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc index 0aae5f009c..5d763d777b 100644 --- a/tests/fail/hp-step-14.cc +++ b/tests/fail/hp-step-14.cc @@ -796,11 +796,12 @@ namespace LaplaceSolver { Vector estimated_error_per_cell( this->triangulation->n_active_cells()); - KellyErrorEstimator::estimate(this->dof_handler, - QGauss(3), - typename FunctionMap::type(), - this->solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + this->dof_handler, + QGauss(3), + std::map *>(), + this->solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(*this->triangulation, estimated_error_per_cell, 0.3, @@ -857,11 +858,12 @@ namespace LaplaceSolver RefinementWeightedKelly::refine_grid() { Vector estimated_error(this->triangulation->n_active_cells()); - KellyErrorEstimator::estimate(this->dof_handler, - (*this->face_quadrature)[0], - typename FunctionMap::type(), - this->solution, - estimated_error); + KellyErrorEstimator::estimate( + this->dof_handler, + (*this->face_quadrature)[0], + std::map *>(), + this->solution, + estimated_error); typename hp::DoFHandler::active_cell_iterator cell = this->dof_handler.begin_active(), diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc index cae1e00bd3..04efe07bc7 100644 --- a/tests/fe/abf_01.cc +++ b/tests/fe/abf_01.cc @@ -499,7 +499,7 @@ project(const Mapping & mapping, // the different boundary parts. We want the // @p{function} to hold on all parts of the // boundary - typename FunctionMap::type boundary_functions; + std::map*> boundary_functions; for (types::boundary_id c=0; c<255; ++c) boundary_functions[c] = &function; project_boundary_values (dof, boundary_functions, q_boundary, diff --git a/tests/fe/deformed_projection.h b/tests/fe/deformed_projection.h index 3024bc3ec5..8b745e8a01 100644 --- a/tests/fe/deformed_projection.h +++ b/tests/fe/deformed_projection.h @@ -549,17 +549,15 @@ project(const Mapping & mapping, if (project_to_boundary_first == true) // boundary projection required { - /* - // set up a list of boundary functions for - // the different boundary parts. We want the - // @p{function} to hold on all parts of the - // boundary - typename FunctionMap::type - boundary_functions; for (unsigned char c=0; c<255; ++c) - boundary_functions[c] = &function; - project_boundary_values (dof, - boundary_functions, q_boundary, boundary_values); - */ + // // set up a list of boundary functions for + // // the different boundary parts. We want the + // // @p{function} to hold on all parts of the + // // boundary + // std::map*> + // boundary_functions; for (unsigned char c=0; c<255; ++c) + // boundary_functions[c] = &function; + // project_boundary_values (dof, + // boundary_functions, q_boundary, boundary_values); } diff --git a/tests/fe/fe_enriched_step-36.cc b/tests/fe/fe_enriched_step-36.cc index f6c32fc444..81c5c57715 100644 --- a/tests/fe/fe_enriched_step-36.cc +++ b/tests/fe/fe_enriched_step-36.cc @@ -503,11 +503,12 @@ namespace Step36 face_quadrature_formula.push_back(QGauss(3)); face_quadrature_formula.push_back(QGauss(3)); - KellyErrorEstimator::estimate(dof_handler, - face_quadrature_formula, - typename FunctionMap::type(), - sol, - error); + KellyErrorEstimator::estimate( + dof_handler, + face_quadrature_formula, + std::map *>(), + sol, + error); } // sum up for a global: diff --git a/tests/fe/fe_enriched_step-36b.cc b/tests/fe/fe_enriched_step-36b.cc index e56cb22beb..37f46fc3dd 100644 --- a/tests/fe/fe_enriched_step-36b.cc +++ b/tests/fe/fe_enriched_step-36b.cc @@ -709,11 +709,12 @@ namespace Step36 face_quadrature_formula.push_back(dealii::QGauss(3)); face_quadrature_formula.push_back(dealii::QGauss(3)); - KellyErrorEstimator::estimate(dof_handler, - face_quadrature_formula, - typename FunctionMap::type(), - sol, - error); + KellyErrorEstimator::estimate( + dof_handler, + face_quadrature_formula, + std::map *>(), + sol, + error); } // sum up for a global: diff --git a/tests/grid/mesh_3d_12.cc b/tests/grid/mesh_3d_12.cc index 84087324a5..c46c057e4d 100644 --- a/tests/grid/mesh_3d_12.cc +++ b/tests/grid/mesh_3d_12.cc @@ -56,7 +56,11 @@ void check_this(Triangulation<3> &tria) VectorTools::interpolate(dof_handler, Functions::SquareFunction<3>(), u); KellyErrorEstimator<3>::estimate( - dof_handler, QGauss<2>(2), FunctionMap<3>::type(), u, e); + dof_handler, + QGauss<2>(2), + std::map *>(), + u, + e); deallog << " " << static_cast(e.l1_norm()) << std::endl; deallog << " " << static_cast(e.l2_norm()) << std::endl; diff --git a/tests/hp/boundary_matrices.cc b/tests/hp/boundary_matrices.cc index 05950c297f..00fe52aefd 100644 --- a/tests/hp/boundary_matrices.cc +++ b/tests/hp/boundary_matrices.cc @@ -98,8 +98,8 @@ check() hp::DoFHandler dof(tr); dof.distribute_dofs(element); - MySquareFunction coefficient; - typename FunctionMap::type function_map; + MySquareFunction coefficient; + std::map *> function_map; function_map[0] = &coefficient; hp::QCollection face_quadrature; diff --git a/tests/hp/boundary_matrices_hp.cc b/tests/hp/boundary_matrices_hp.cc index 791824900b..d88763616e 100644 --- a/tests/hp/boundary_matrices_hp.cc +++ b/tests/hp/boundary_matrices_hp.cc @@ -118,8 +118,8 @@ check() dof.distribute_dofs(element); - MySquareFunction coefficient; - typename FunctionMap::type function_map; + MySquareFunction coefficient; + std::map *> function_map; function_map[0] = &coefficient; hp::QCollection face_quadrature; diff --git a/tests/hp/crash_17.cc b/tests/hp/crash_17.cc index 53cefa97ab..477ac7fa40 100644 --- a/tests/hp/crash_17.cc +++ b/tests/hp/crash_17.cc @@ -468,11 +468,12 @@ void LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - face_quadrature_collection, - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + face_quadrature_collection, + std::map *>(), + solution, + estimated_error_per_cell); Vector smoothness_indicators(triangulation.n_active_cells()); estimate_smoothness(smoothness_indicators); diff --git a/tests/hp/crash_18.cc b/tests/hp/crash_18.cc index 9e147af5b2..7efc01c270 100644 --- a/tests/hp/crash_18.cc +++ b/tests/hp/crash_18.cc @@ -473,11 +473,12 @@ void LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - face_quadrature_collection, - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + face_quadrature_collection, + std::map *>(), + solution, + estimated_error_per_cell); Vector smoothness_indicators(triangulation.n_active_cells()); estimate_smoothness(smoothness_indicators); diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc index 32163b8275..c636c673a5 100644 --- a/tests/hp/matrices.cc +++ b/tests/hp/matrices.cc @@ -78,8 +78,8 @@ void check_boundary(const hp::DoFHandler & dof, const hp::MappingCollection &mapping) { - MySquareFunction coefficient; - typename FunctionMap::type function_map; + MySquareFunction coefficient; + std::map *> function_map; function_map[0] = &coefficient; hp::QCollection face_quadrature; @@ -181,7 +181,7 @@ check() Functions::ExpFunction coefficient; - typename FunctionMap::type function_map; + std::map *> function_map; function_map[0] = &coefficient; for (unsigned int test = 0; test < 2; ++test) diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc index 5587fa7e03..52ed9ea229 100644 --- a/tests/hp/matrices_hp.cc +++ b/tests/hp/matrices_hp.cc @@ -76,8 +76,8 @@ void check_boundary(const hp::DoFHandler & dof, const hp::MappingCollection &mapping) { - MySquareFunction coefficient; - typename FunctionMap::type function_map; + MySquareFunction coefficient; + std::map *> function_map; function_map[0] = &coefficient; hp::QCollection face_quadrature; @@ -193,7 +193,7 @@ check() Functions::ExpFunction coefficient; - typename FunctionMap::type function_map; + std::map *> function_map; function_map[0] = &coefficient; for (unsigned int test = 0; test < 2; ++test) diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc index 79f7337ee9..3f949b0524 100644 --- a/tests/hp/step-13.cc +++ b/tests/hp/step-13.cc @@ -638,11 +638,12 @@ namespace LaplaceSolver { Vector estimated_error_per_cell( this->triangulation->n_active_cells()); - KellyErrorEstimator::estimate(this->dof_handler, - QGauss(3), - typename FunctionMap::type(), - this->solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + this->dof_handler, + QGauss(3), + std::map *>(), + this->solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(*this->triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/hp/step-27.cc b/tests/hp/step-27.cc index d46b96a2b5..1c4ff31749 100644 --- a/tests/hp/step-27.cc +++ b/tests/hp/step-27.cc @@ -288,11 +288,12 @@ namespace Step27 LaplaceProblem::postprocess(const unsigned int cycle) { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - face_quadrature_collection, - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + face_quadrature_collection, + std::map *>(), + solution, + estimated_error_per_cell); Vector smoothness_indicators(triangulation.n_active_cells()); diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index a1ebd8d816..3b3ae6b253 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -293,11 +293,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc index 4f026c12eb..927ce0cbc9 100644 --- a/tests/hp/step-7.cc +++ b/tests/hp/step-7.cc @@ -415,7 +415,7 @@ HelmholtzProblem::refine_grid() Vector estimated_error_per_cell( triangulation.n_active_cells()); - typename FunctionMap::type neumann_boundary; + std::map *> neumann_boundary; KellyErrorEstimator::estimate(dof_handler, QGauss(3), neumann_boundary, diff --git a/tests/hp/step-8.cc b/tests/hp/step-8.cc index c2f5214f96..8ffd7f63f8 100644 --- a/tests/hp/step-8.cc +++ b/tests/hp/step-8.cc @@ -336,7 +336,7 @@ ElasticProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - typename FunctionMap::type neumann_boundary; + std::map *> neumann_boundary; KellyErrorEstimator::estimate(dof_handler, QGauss(2), neumann_boundary, diff --git a/tests/lac/constrained_linear_operator_01.cc b/tests/lac/constrained_linear_operator_01.cc index d1c94e1e98..22626b32b3 100644 --- a/tests/lac/constrained_linear_operator_01.cc +++ b/tests/lac/constrained_linear_operator_01.cc @@ -214,11 +214,12 @@ Step6::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, diff --git a/tests/lac/matrices_02.cc b/tests/lac/matrices_02.cc index 47889d45cd..ea00c8e942 100644 --- a/tests/lac/matrices_02.cc +++ b/tests/lac/matrices_02.cc @@ -72,8 +72,8 @@ template void check_boundary(const DoFHandler &dof, const Mapping &mapping) { - MySquareFunction coefficient; - typename FunctionMap::type function_map; + MySquareFunction coefficient; + std::map *> function_map; function_map[0] = &coefficient; QGauss face_quadrature(6); @@ -170,7 +170,7 @@ check() Functions::ExpFunction coefficient; - typename FunctionMap::type function_map; + std::map *> function_map; function_map[0] = &coefficient; for (unsigned int test = 0; test < 2; ++test) diff --git a/tests/lac/schur_complement_03.cc b/tests/lac/schur_complement_03.cc index 74959d03d1..adb229dd79 100644 --- a/tests/lac/schur_complement_03.cc +++ b/tests/lac/schur_complement_03.cc @@ -344,12 +344,13 @@ namespace Step22 { Vector estimated_error_per_cell(triangulation.n_active_cells()); FEValuesExtractors::Scalar pressure(dim); - KellyErrorEstimator::estimate(dof_handler, - QGauss(degree + 1), - typename FunctionMap::type(), - solution, - estimated_error_per_cell, - fe.component_mask(pressure)); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(degree + 1), + std::map *>(), + solution, + estimated_error_per_cell, + fe.component_mask(pressure)); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/matrix_free/matrix_vector_mg.cc b/tests/matrix_free/matrix_vector_mg.cc index 5caa72a2bb..924c4c67ce 100644 --- a/tests/matrix_free/matrix_vector_mg.cc +++ b/tests/matrix_free/matrix_vector_mg.cc @@ -96,8 +96,8 @@ test() mg_sparsities.resize(0, nlevels - 1); mg_ref_matrices.resize(0, nlevels - 1); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; std::vector> boundary_indices(nlevels); MGTools::make_boundary_list(dof, dirichlet_boundary, boundary_indices); diff --git a/tests/matrix_free/multigrid_dg_sip_01.cc b/tests/matrix_free/multigrid_dg_sip_01.cc index e2cdea288a..667f541e71 100644 --- a/tests/matrix_free/multigrid_dg_sip_01.cc +++ b/tests/matrix_free/multigrid_dg_sip_01.cc @@ -587,9 +587,9 @@ do_test(const DoFHandler &dof, const bool also_test_parallel = false) } mg_smoother.initialize(mg_matrices, smoother_data); - MGConstrainedDoFs mg_constrained_dofs; - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(dof, dirichlet_boundary); diff --git a/tests/matrix_free/multigrid_dg_sip_02.cc b/tests/matrix_free/multigrid_dg_sip_02.cc index 83033d4ab8..fff021fc33 100644 --- a/tests/matrix_free/multigrid_dg_sip_02.cc +++ b/tests/matrix_free/multigrid_dg_sip_02.cc @@ -499,9 +499,9 @@ do_test(const DoFHandler &dof, const bool also_test_parallel = false) } mg_smoother.initialize(mg_matrices, smoother_data); - MGConstrainedDoFs mg_constrained_dofs; - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(dof, dirichlet_boundary); diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc index db115e4ef5..6ce47e6de5 100644 --- a/tests/matrix_free/parallel_multigrid.cc +++ b/tests/matrix_free/parallel_multigrid.cc @@ -74,9 +74,9 @@ public: addit_data.level_mg_handler = level; // extract the constraints due to Dirichlet boundary conditions - ConstraintMatrix constraints; - Functions::ZeroFunction zero; - typename FunctionMap::type functions; + ConstraintMatrix constraints; + Functions::ZeroFunction zero; + std::map *> functions; for (std::set::const_iterator it = dirichlet_boundaries.begin(); it != dirichlet_boundaries.end(); diff --git a/tests/matrix_free/parallel_multigrid_02.cc b/tests/matrix_free/parallel_multigrid_02.cc index 3bce17bd06..9312e9252b 100644 --- a/tests/matrix_free/parallel_multigrid_02.cc +++ b/tests/matrix_free/parallel_multigrid_02.cc @@ -103,8 +103,8 @@ do_test(const DoFHandler &dof) DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs); // Dirichlet BC - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; // fine-level constraints diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.cc b/tests/matrix_free/parallel_multigrid_adaptive_01.cc index ac54052996..a442e78fae 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_01.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_01.cc @@ -63,10 +63,11 @@ public: void - initialize(const Mapping & mapping, - const DoFHandler & dof_handler, - const MGConstrainedDoFs & mg_constrained_dofs, - const typename FunctionMap::type &dirichlet_boundary, + initialize(const Mapping & mapping, + const DoFHandler & dof_handler, + const MGConstrainedDoFs &mg_constrained_dofs, + const std::map *> + & dirichlet_boundary, const unsigned int level = numbers::invalid_unsigned_int) { const QGauss<1> quad(n_q_points_1d); @@ -513,9 +514,9 @@ do_test(const DoFHandler &dof) DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(dof, dirichlet_boundary); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc index 5c6f098682..b79b59854e 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc @@ -140,8 +140,8 @@ do_test(const DoFHandler &dof) DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs); // Dirichlet BC - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; // fine-level constraints diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc index dbec01a1ed..e0c1c840d1 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc @@ -64,12 +64,13 @@ public: void - initialize(const Mapping & mapping, - const DoFHandler & dof_handler, - const MGConstrainedDoFs & mg_constrained_dofs, - const typename FunctionMap::type &dirichlet_boundary, - const unsigned int level, - const bool threaded) + initialize(const Mapping & mapping, + const DoFHandler & dof_handler, + const MGConstrainedDoFs &mg_constrained_dofs, + const std::map *> + & dirichlet_boundary, + const unsigned int level, + const bool threaded) { const QGauss<1> quad(n_q_points_1d); typename MatrixFree::AdditionalData addit_data; @@ -520,9 +521,9 @@ do_test(const DoFHandler &dof, const bool threaded) DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(dof, dirichlet_boundary); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc index 4be60970b5..ea1345a99a 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc @@ -140,8 +140,8 @@ do_test(const DoFHandler &dof) DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs); // Dirichlet BC - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; // fine-level constraints diff --git a/tests/matrix_free/parallel_multigrid_adaptive_05.cc b/tests/matrix_free/parallel_multigrid_adaptive_05.cc index c29cce44f5..2730c4ee43 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_05.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_05.cc @@ -61,12 +61,13 @@ public: void - initialize(const Mapping & mapping, - const DoFHandler & dof_handler, - const MGConstrainedDoFs & mg_constrained_dofs, - const typename FunctionMap::type &dirichlet_boundary, - const unsigned int level, - const bool threaded) + initialize(const Mapping & mapping, + const DoFHandler & dof_handler, + const MGConstrainedDoFs &mg_constrained_dofs, + const std::map *> + & dirichlet_boundary, + const unsigned int level, + const bool threaded) { const QGauss<1> quad(n_q_points_1d); typename MatrixFree::AdditionalData addit_data; @@ -517,9 +518,9 @@ do_test(const DoFHandler &dof, const bool threaded) DoFTools::make_hanging_node_constraints(dof, hanging_node_constraints); hanging_node_constraints.close(); - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(dof, dirichlet_boundary); diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06.cc b/tests/matrix_free/parallel_multigrid_adaptive_06.cc index 9c3abe3fdb..53b6296ce4 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06.cc @@ -225,8 +225,8 @@ do_test(const DoFHandler &dof, const unsigned int nb) DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs); // Dirichlet BC - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; // fine-level constraints diff --git a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc index 73741568dc..22069eea5c 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_06ref.cc @@ -141,8 +141,8 @@ do_test(const DoFHandler &dof) DoFTools::extract_locally_relevant_dofs(dof, locally_relevant_dofs); // Dirichlet BC - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; // fine-level constraints diff --git a/tests/matrix_free/parallel_multigrid_adaptive_07.cc b/tests/matrix_free/parallel_multigrid_adaptive_07.cc index 07d67350f1..bffdaff129 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_07.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_07.cc @@ -243,8 +243,8 @@ do_test(const std::vector *> &dof) DoFTools::extract_locally_relevant_dofs(*dof[i], locally_relevant_dofs[i]); // Dirichlet BC - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; // fine-level constraints diff --git a/tests/matrix_free/parallel_multigrid_mf.cc b/tests/matrix_free/parallel_multigrid_mf.cc index 6672523513..3c15b1deb8 100644 --- a/tests/matrix_free/parallel_multigrid_mf.cc +++ b/tests/matrix_free/parallel_multigrid_mf.cc @@ -73,9 +73,9 @@ public: addit_data.level_mg_handler = level; // extract the constraints due to Dirichlet boundary conditions - ConstraintMatrix constraints; - Functions::ZeroFunction zero; - typename FunctionMap::type functions; + ConstraintMatrix constraints; + Functions::ZeroFunction zero; + std::map *> functions; for (std::set::const_iterator it = dirichlet_boundaries.begin(); it != dirichlet_boundaries.end(); @@ -375,9 +375,9 @@ do_test(const DoFHandler &dof) mg_matrices[level].initialize(mapping, dof, dirichlet_boundaries, level); } - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(dof, dirichlet_boundary); diff --git a/tests/matrix_free/step-37.cc b/tests/matrix_free/step-37.cc index 882e517b6f..903734f5d0 100644 --- a/tests/matrix_free/step-37.cc +++ b/tests/matrix_free/step-37.cc @@ -436,8 +436,8 @@ namespace Step37 mg_matrices.resize(0, nlevels - 1); mg_constraints.resize(0, nlevels - 1); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; std::vector> boundary_indices( triangulation.n_levels()); diff --git a/tests/meshworker/step-50-mesh_loop.cc b/tests/meshworker/step-50-mesh_loop.cc index 0017ec5af7..4db1310b9d 100644 --- a/tests/meshworker/step-50-mesh_loop.cc +++ b/tests/meshworker/step-50-mesh_loop.cc @@ -244,8 +244,8 @@ namespace Step50 constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - std::set dirichlet_boundary_ids; - typename FunctionMap::type dirichlet_boundary; + std::set dirichlet_boundary_ids; + std::map *> dirichlet_boundary; Functions::ConstantFunction homogeneous_dirichlet_bc(1.0); dirichlet_boundary_ids.insert(0); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; diff --git a/tests/mpi/interpolate_to_different_mesh_02.cc b/tests/mpi/interpolate_to_different_mesh_02.cc index 415057ca73..df29a858e7 100644 --- a/tests/mpi/interpolate_to_different_mesh_02.cc +++ b/tests/mpi/interpolate_to_different_mesh_02.cc @@ -247,11 +247,12 @@ SeventhProblem::run(unsigned int cycle) else { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - locally_relevant_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + locally_relevant_solution, + estimated_error_per_cell); parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( triangulation, estimated_error_per_cell, 0.5, 0.3); diff --git a/tests/mpi/muelu_periodicity.cc b/tests/mpi/muelu_periodicity.cc index 82151d581e..aee894f8d5 100644 --- a/tests/mpi/muelu_periodicity.cc +++ b/tests/mpi/muelu_periodicity.cc @@ -718,12 +718,13 @@ namespace Step22 Vector estimated_error_per_cell(triangulation.n_active_cells()); FEValuesExtractors::Scalar pressure(dim); - KellyErrorEstimator::estimate(dof_handler, - QGauss(degree + 1), - typename FunctionMap::type(), - solution, - estimated_error_per_cell, - fe.component_mask(pressure)); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(degree + 1), + std::map *>(), + solution, + estimated_error_per_cell, + fe.component_mask(pressure)); parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( triangulation, estimated_error_per_cell, 0.3, 0.0); diff --git a/tests/mpi/multigrid_adaptive.cc b/tests/mpi/multigrid_adaptive.cc index 877acb441c..03ccf5c231 100644 --- a/tests/mpi/multigrid_adaptive.cc +++ b/tests/mpi/multigrid_adaptive.cc @@ -193,8 +193,8 @@ namespace Step50 constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values( static_cast &>(mg_dof_handler), @@ -461,12 +461,12 @@ namespace Step50 temp_solution.reinit(idx, MPI_COMM_WORLD); temp_solution = solution; - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(3), - typename FunctionMap::type(), - temp_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(3), + std::map *>(), + temp_solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/mpi/multigrid_uniform.cc b/tests/mpi/multigrid_uniform.cc index 75a14149bf..8b46436162 100644 --- a/tests/mpi/multigrid_uniform.cc +++ b/tests/mpi/multigrid_uniform.cc @@ -193,8 +193,8 @@ namespace Step50 constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values( static_cast &>(mg_dof_handler), @@ -442,12 +442,12 @@ namespace Step50 { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/mpi/periodicity_01.cc b/tests/mpi/periodicity_01.cc index 0687bbe4fc..004c093968 100644 --- a/tests/mpi/periodicity_01.cc +++ b/tests/mpi/periodicity_01.cc @@ -296,11 +296,12 @@ namespace Step40 LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(3), - typename FunctionMap::type(), - locally_relevant_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(3), + std::map *>(), + locally_relevant_solution, + estimated_error_per_cell); parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( triangulation, estimated_error_per_cell, 0.3, 0.03); diff --git a/tests/mpi/periodicity_02.cc b/tests/mpi/periodicity_02.cc index 6462e91ce1..21678b1cf9 100644 --- a/tests/mpi/periodicity_02.cc +++ b/tests/mpi/periodicity_02.cc @@ -727,12 +727,13 @@ namespace Step22 Vector estimated_error_per_cell(triangulation.n_active_cells()); FEValuesExtractors::Scalar pressure(dim); - KellyErrorEstimator::estimate(dof_handler, - QGauss(degree + 1), - typename FunctionMap::type(), - solution, - estimated_error_per_cell, - fe.component_mask(pressure)); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(degree + 1), + std::map *>(), + solution, + estimated_error_per_cell, + fe.component_mask(pressure)); // Note: this test does parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( diff --git a/tests/mpi/periodicity_03.cc b/tests/mpi/periodicity_03.cc index 33cbcff451..b68fbcd68b 100644 --- a/tests/mpi/periodicity_03.cc +++ b/tests/mpi/periodicity_03.cc @@ -814,12 +814,13 @@ namespace Step22 Vector estimated_error_per_cell(triangulation.n_active_cells()); FEValuesExtractors::Scalar pressure(dim); - KellyErrorEstimator::estimate(dof_handler, - QGauss(degree + 1), - typename FunctionMap::type(), - solution, - estimated_error_per_cell, - fe.component_mask(pressure)); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(degree + 1), + std::map *>(), + solution, + estimated_error_per_cell, + fe.component_mask(pressure)); parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( triangulation, estimated_error_per_cell, 0.3, 0.0); diff --git a/tests/mpi/step-37.cc b/tests/mpi/step-37.cc index 1e8ea85fe8..b441917429 100644 --- a/tests/mpi/step-37.cc +++ b/tests/mpi/step-37.cc @@ -327,9 +327,10 @@ namespace Step37 DoFTools::make_hanging_node_constraints( dof_handler, hanging_nodes_laplace_constraints); - std::set dirichlet_boundary_ids; - typename FunctionMap::type dirichlet_boundary_functions; - PotentialBCFunction bc_func(240, Point()); + std::set dirichlet_boundary_ids; + std::map *> + dirichlet_boundary_functions; + PotentialBCFunction bc_func(240, Point()); dirichlet_boundary_ids.insert(0); dirichlet_boundary_functions[0] = &bc_func; VectorTools::interpolate_boundary_values(*mapping.get(), diff --git a/tests/mpi/trilinos_distribute_04.cc b/tests/mpi/trilinos_distribute_04.cc index c513400561..2a0644022d 100644 --- a/tests/mpi/trilinos_distribute_04.cc +++ b/tests/mpi/trilinos_distribute_04.cc @@ -98,8 +98,8 @@ test() cm.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(dofh, cm); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values(dofh, dirichlet_boundary, cm); diff --git a/tests/multigrid/boundary_01.cc b/tests/multigrid/boundary_01.cc index e1877fa02f..59dfab1064 100644 --- a/tests/multigrid/boundary_01.cc +++ b/tests/multigrid/boundary_01.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -67,8 +66,8 @@ check_fe(FiniteElement &fe) Triangulation tr(Triangulation::limit_level_difference_at_vertices); GridGenerator::hyper_cube(tr); tr.refine_global(2); - Functions::ZeroFunction zero; - typename FunctionMap::type fmap; + Functions::ZeroFunction zero; + std::map *> fmap; fmap.insert(std::make_pair(0, &zero)); DoFHandler mgdof(tr); diff --git a/tests/multigrid/constrained_dofs_01.cc b/tests/multigrid/constrained_dofs_01.cc index 26ad58a5a3..5b9a828415 100644 --- a/tests/multigrid/constrained_dofs_01.cc +++ b/tests/multigrid/constrained_dofs_01.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -75,8 +74,8 @@ check_fe(FiniteElement &fe) parallel::distributed::Triangulation::construct_multigrid_hierarchy); setup_tria(tr); - Functions::ZeroFunction zero; - typename FunctionMap::type fmap; + Functions::ZeroFunction zero; + std::map *> fmap; fmap.insert(std::make_pair(0, &zero)); DoFHandler dofh(tr); @@ -125,8 +124,8 @@ check_fe(FiniteElement &fe) cell->update_cell_dof_indices_cache(); } - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; mg_constrained_dofs_ref.initialize(dofhref, dirichlet_boundary); } @@ -135,8 +134,8 @@ check_fe(FiniteElement &fe) MGConstrainedDoFs mg_constrained_dofs; - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; mg_constrained_dofs.initialize(dofh, dirichlet_boundary); diff --git a/tests/multigrid/constrained_dofs_02.cc b/tests/multigrid/constrained_dofs_02.cc index bc004182cb..ce3848b73e 100644 --- a/tests/multigrid/constrained_dofs_02.cc +++ b/tests/multigrid/constrained_dofs_02.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -136,8 +135,8 @@ check_fe(FiniteElement &fe) parallel::distributed::Triangulation::construct_multigrid_hierarchy); setup_tria(tr); - Functions::ZeroFunction zero; - typename FunctionMap::type fmap; + Functions::ZeroFunction zero; + std::map *> fmap; fmap.insert(std::make_pair(0, &zero)); DoFHandler dofh(tr); @@ -186,8 +185,8 @@ check_fe(FiniteElement &fe) cell->update_cell_dof_indices_cache(); } - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; mg_constrained_dofs_ref.initialize(dofhref, dirichlet_boundary); } @@ -196,8 +195,8 @@ check_fe(FiniteElement &fe) MGConstrainedDoFs mg_constrained_dofs; - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; mg_constrained_dofs.initialize(dofh, dirichlet_boundary); diff --git a/tests/multigrid/constrained_dofs_03.cc b/tests/multigrid/constrained_dofs_03.cc index 848536c270..1779952199 100644 --- a/tests/multigrid/constrained_dofs_03.cc +++ b/tests/multigrid/constrained_dofs_03.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/tests/multigrid/dof_01.cc b/tests/multigrid/dof_01.cc index 11b26a4aaf..ffa4fe1065 100644 --- a/tests/multigrid/dof_01.cc +++ b/tests/multigrid/dof_01.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -77,8 +76,8 @@ check_fe(FiniteElement &fe) Triangulation tr(Triangulation::limit_level_difference_at_vertices); GridGenerator::hyper_cube(tr); tr.refine_global(2); - Functions::ZeroFunction zero; - typename FunctionMap::type fmap; + Functions::ZeroFunction zero; + std::map *> fmap; fmap.insert(std::make_pair(0, &zero)); DoFHandler mgdof(tr); diff --git a/tests/multigrid/dof_02.cc b/tests/multigrid/dof_02.cc index f60e2b3ca1..2cf428a05d 100644 --- a/tests/multigrid/dof_02.cc +++ b/tests/multigrid/dof_02.cc @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -83,8 +82,8 @@ check_fe(FiniteElement &fe) Triangulation tr(Triangulation::limit_level_difference_at_vertices); GridGenerator::hyper_cube(tr); tr.refine_global(2); - Functions::ZeroFunction zero; - typename FunctionMap::type fmap; + Functions::ZeroFunction zero; + std::map *> fmap; fmap.insert(std::make_pair(0, &zero)); DoFHandler mgdof(tr); diff --git a/tests/multigrid/events_01.cc b/tests/multigrid/events_01.cc index 0f65791191..d0492f2b7f 100644 --- a/tests/multigrid/events_01.cc +++ b/tests/multigrid/events_01.cc @@ -154,7 +154,7 @@ namespace Step50 constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; + std::map *> dirichlet_boundary; Functions::ConstantFunction homogeneous_dirichlet_bc(0.0); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values(mg_dof_handler, @@ -500,12 +500,12 @@ namespace Step50 temp_solution.reinit(locally_relevant_set, MPI_COMM_WORLD); temp_solution = solution; - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(degree + 1), - typename FunctionMap::type(), - temp_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(degree + 1), + std::map *>(), + temp_solution, + estimated_error_per_cell); parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( triangulation, estimated_error_per_cell, 0.3, 0.0); diff --git a/tests/multigrid/interface_matrix_entry_01.cc b/tests/multigrid/interface_matrix_entry_01.cc index 97ca541e83..80a8370fda 100644 --- a/tests/multigrid/interface_matrix_entry_01.cc +++ b/tests/multigrid/interface_matrix_entry_01.cc @@ -95,8 +95,8 @@ test() constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - std::set dirichlet_boundary_ids; - typename FunctionMap::type dirichlet_boundary; + std::set dirichlet_boundary_ids; + std::map *> dirichlet_boundary; Functions::ConstantFunction homogeneous_dirichlet_bc(0.0); dirichlet_boundary_ids.insert(0); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; diff --git a/tests/multigrid/mg_coarse_01.cc b/tests/multigrid/mg_coarse_01.cc index ff4a19f265..b3b7b82d57 100644 --- a/tests/multigrid/mg_coarse_01.cc +++ b/tests/multigrid/mg_coarse_01.cc @@ -211,7 +211,7 @@ namespace Step50 constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; + std::map *> dirichlet_boundary; Functions::ConstantFunction homogeneous_dirichlet_bc(0.0); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values(mg_dof_handler, @@ -587,12 +587,12 @@ namespace Step50 temp_solution.reinit(locally_relevant_set, MPI_COMM_WORLD); temp_solution = solution; - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(degree + 1), - typename FunctionMap::type(), - temp_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(degree + 1), + std::map *>(), + temp_solution, + estimated_error_per_cell); parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( triangulation, estimated_error_per_cell, 0.3, 0.0); diff --git a/tests/multigrid/mg_output_dirichlet.cc b/tests/multigrid/mg_output_dirichlet.cc index da30b0fcc5..e7c3c9a1b1 100644 --- a/tests/multigrid/mg_output_dirichlet.cc +++ b/tests/multigrid/mg_output_dirichlet.cc @@ -206,8 +206,9 @@ check_simple(const FiniteElement &fe) Triangulation tr(Triangulation::limit_level_difference_at_vertices); GridGenerator::hyper_cube(tr, -1, 1); - typename FunctionMap::type dirichlet_boundary_functions; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> + dirichlet_boundary_functions; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary_functions[0] = &homogeneous_dirichlet_bc; tr.refine_global(1); diff --git a/tests/multigrid/mg_output_neumann.cc b/tests/multigrid/mg_output_neumann.cc index 92b71b0f0e..be5b7c4473 100644 --- a/tests/multigrid/mg_output_neumann.cc +++ b/tests/multigrid/mg_output_neumann.cc @@ -206,7 +206,8 @@ check_simple(const FiniteElement &fe) Triangulation tr(Triangulation::limit_level_difference_at_vertices); GridGenerator::hyper_cube(tr, -1, 1); - typename FunctionMap::type dirichlet_boundary_functions; + std::map *> + dirichlet_boundary_functions; tr.refine_global(1); refine_mesh(tr); diff --git a/tests/multigrid/mg_renumbered_01.cc b/tests/multigrid/mg_renumbered_01.cc index 7524f8aebf..f8874b4de5 100644 --- a/tests/multigrid/mg_renumbered_01.cc +++ b/tests/multigrid/mg_renumbered_01.cc @@ -340,8 +340,8 @@ template void LaplaceProblem::test() { - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction dirichlet_bc(fe.n_components()); + std::map *> dirichlet_boundary; + Functions::ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[0] = &dirichlet_bc; const unsigned int min_l = mg_matrices.min_level(); diff --git a/tests/multigrid/mg_renumbered_02.cc b/tests/multigrid/mg_renumbered_02.cc index 237133e1bd..c84ee05aa9 100644 --- a/tests/multigrid/mg_renumbered_02.cc +++ b/tests/multigrid/mg_renumbered_02.cc @@ -292,8 +292,8 @@ template void LaplaceProblem::test_boundary() { - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction dirichlet_bc(fe.n_components()); + std::map *> dirichlet_boundary; + Functions::ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[0] = &dirichlet_bc; MGTools::make_boundary_list(mg_dof_handler_renumbered, dirichlet_boundary, diff --git a/tests/multigrid/mg_renumbered_03.cc b/tests/multigrid/mg_renumbered_03.cc index 3e59056a3b..58b2ee41ba 100644 --- a/tests/multigrid/mg_renumbered_03.cc +++ b/tests/multigrid/mg_renumbered_03.cc @@ -349,8 +349,8 @@ template void LaplaceProblem::test() { - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction dirichlet_bc(fe.n_components()); + std::map *> dirichlet_boundary; + Functions::ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[0] = &dirichlet_bc; MGConstrainedDoFs mg_constrained_dofs; diff --git a/tests/multigrid/step-16-02.cc b/tests/multigrid/step-16-02.cc index a76317db6f..8bd51acab0 100644 --- a/tests/multigrid/step-16-02.cc +++ b/tests/multigrid/step-16-02.cc @@ -255,8 +255,8 @@ LaplaceProblem::setup_system() constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, diff --git a/tests/multigrid/step-16-03.cc b/tests/multigrid/step-16-03.cc index e269627258..117a53900e 100644 --- a/tests/multigrid/step-16-03.cc +++ b/tests/multigrid/step-16-03.cc @@ -174,8 +174,8 @@ LaplaceProblem::setup_system() constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, @@ -419,12 +419,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/multigrid/step-16-04.cc b/tests/multigrid/step-16-04.cc index dfe915b35c..b82f2c0f9a 100644 --- a/tests/multigrid/step-16-04.cc +++ b/tests/multigrid/step-16-04.cc @@ -178,8 +178,8 @@ LaplaceProblem::setup_system() constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, @@ -444,12 +444,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/multigrid/step-16-05.cc b/tests/multigrid/step-16-05.cc index fa53e04454..aea5b7db46 100644 --- a/tests/multigrid/step-16-05.cc +++ b/tests/multigrid/step-16-05.cc @@ -178,8 +178,8 @@ LaplaceProblem::setup_system() DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); DoFTools::make_hanging_node_constraints(mg_dof_handler, hanging_node_constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, diff --git a/tests/multigrid/step-16-06.cc b/tests/multigrid/step-16-06.cc index b6057e3892..629f6b2dd4 100644 --- a/tests/multigrid/step-16-06.cc +++ b/tests/multigrid/step-16-06.cc @@ -178,8 +178,8 @@ LaplaceProblem::setup_system() DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); DoFTools::make_hanging_node_constraints(mg_dof_handler, hanging_node_constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, diff --git a/tests/multigrid/step-16-07.cc b/tests/multigrid/step-16-07.cc index f90c3f16fc..8410447e45 100644 --- a/tests/multigrid/step-16-07.cc +++ b/tests/multigrid/step-16-07.cc @@ -180,8 +180,8 @@ LaplaceProblem::setup_system() constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, @@ -514,12 +514,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/multigrid/step-16-50-mpi-linear-operator.cc b/tests/multigrid/step-16-50-mpi-linear-operator.cc index 4ce9efa67f..7994253bb6 100644 --- a/tests/multigrid/step-16-50-mpi-linear-operator.cc +++ b/tests/multigrid/step-16-50-mpi-linear-operator.cc @@ -207,8 +207,8 @@ namespace Step50 constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc; + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc; dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values(mg_dof_handler, dirichlet_boundary, @@ -504,12 +504,12 @@ namespace Step50 temp_solution.reinit(locally_relevant_set, MPI_COMM_WORLD); temp_solution = solution; - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(degree + 1), - typename FunctionMap::type(), - temp_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(degree + 1), + std::map *>(), + temp_solution, + estimated_error_per_cell); const double threshold = 0.6 * Utilities::MPI::max(estimated_error_per_cell.linfty_norm(), diff --git a/tests/multigrid/step-16-50-mpi-smoother.cc b/tests/multigrid/step-16-50-mpi-smoother.cc index 45159e0ed1..f1261b025e 100644 --- a/tests/multigrid/step-16-50-mpi-smoother.cc +++ b/tests/multigrid/step-16-50-mpi-smoother.cc @@ -207,8 +207,8 @@ namespace Step50 constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc; + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc; dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values(mg_dof_handler, dirichlet_boundary, @@ -493,12 +493,12 @@ namespace Step50 temp_solution.reinit(locally_relevant_set, MPI_COMM_WORLD); temp_solution = solution; - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(degree + 1), - typename FunctionMap::type(), - temp_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(degree + 1), + std::map *>(), + temp_solution, + estimated_error_per_cell); const double threshold = 0.6 * Utilities::MPI::max(estimated_error_per_cell.linfty_norm(), diff --git a/tests/multigrid/step-16-50-mpi.cc b/tests/multigrid/step-16-50-mpi.cc index 8a2831c7fd..c17f2d7b80 100644 --- a/tests/multigrid/step-16-50-mpi.cc +++ b/tests/multigrid/step-16-50-mpi.cc @@ -207,8 +207,8 @@ namespace Step50 constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc; + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc; dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values(mg_dof_handler, dirichlet_boundary, @@ -490,12 +490,12 @@ namespace Step50 temp_solution.reinit(locally_relevant_set, MPI_COMM_WORLD); temp_solution = solution; - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(degree + 1), - typename FunctionMap::type(), - temp_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(degree + 1), + std::map *>(), + temp_solution, + estimated_error_per_cell); const double threshold = 0.6 * Utilities::MPI::max(estimated_error_per_cell.linfty_norm(), diff --git a/tests/multigrid/step-16-50-serial.cc b/tests/multigrid/step-16-50-serial.cc index 9a7c30f006..efa367ca44 100644 --- a/tests/multigrid/step-16-50-serial.cc +++ b/tests/multigrid/step-16-50-serial.cc @@ -178,8 +178,8 @@ LaplaceProblem::setup_system() constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, @@ -414,12 +414,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(degree + 1), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(degree + 1), + std::map *>(), + solution, + estimated_error_per_cell); const double threshold = 0.6 * estimated_error_per_cell.linfty_norm(); GridRefinement::refine(triangulation, estimated_error_per_cell, threshold); diff --git a/tests/multigrid/step-16-bdry1.cc b/tests/multigrid/step-16-bdry1.cc index 2bde093414..113457519d 100644 --- a/tests/multigrid/step-16-bdry1.cc +++ b/tests/multigrid/step-16-bdry1.cc @@ -256,8 +256,8 @@ LaplaceProblem::setup_system() constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, diff --git a/tests/multigrid/step-16.cc b/tests/multigrid/step-16.cc index ad77d3632b..62135d1175 100644 --- a/tests/multigrid/step-16.cc +++ b/tests/multigrid/step-16.cc @@ -180,8 +180,8 @@ LaplaceProblem::setup_system() constraints.clear(); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MappingQGeneric mapping(1); VectorTools::interpolate_boundary_values(mapping, @@ -515,12 +515,12 @@ LaplaceProblem::refine_grid() { Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(3), + std::map *>(), + solution, + estimated_error_per_cell); GridRefinement::refine_and_coarsen_fixed_number(triangulation, estimated_error_per_cell, 0.3, diff --git a/tests/multigrid/step-50_01.cc b/tests/multigrid/step-50_01.cc index 0050d02314..d6b0da2f9f 100644 --- a/tests/multigrid/step-50_01.cc +++ b/tests/multigrid/step-50_01.cc @@ -208,7 +208,7 @@ namespace Step50 constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - typename FunctionMap::type dirichlet_boundary; + std::map *> dirichlet_boundary; Functions::ConstantFunction homogeneous_dirichlet_bc(0.0); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; VectorTools::interpolate_boundary_values(mg_dof_handler, @@ -513,12 +513,12 @@ namespace Step50 temp_solution.reinit(locally_relevant_set, MPI_COMM_WORLD); temp_solution = solution; - KellyErrorEstimator::estimate(static_cast &>( - mg_dof_handler), - QGauss(degree + 1), - typename FunctionMap::type(), - temp_solution, - estimated_error_per_cell); + KellyErrorEstimator::estimate( + mg_dof_handler, + QGauss(degree + 1), + std::map *>(), + temp_solution, + estimated_error_per_cell); parallel::distributed::GridRefinement::refine_and_coarsen_fixed_fraction( triangulation, estimated_error_per_cell, 0.3, 0.0); diff --git a/tests/multigrid/step-50_02.cc b/tests/multigrid/step-50_02.cc index 4bb3190c25..2166659c31 100644 --- a/tests/multigrid/step-50_02.cc +++ b/tests/multigrid/step-50_02.cc @@ -212,8 +212,8 @@ namespace Step50 constraints.reinit(locally_relevant_set); DoFTools::make_hanging_node_constraints(mg_dof_handler, constraints); - std::set dirichlet_boundary_ids; - typename FunctionMap::type dirichlet_boundary; + std::set dirichlet_boundary_ids; + std::map *> dirichlet_boundary; Functions::ConstantFunction homogeneous_dirichlet_bc(1.0); dirichlet_boundary_ids.insert(0); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; diff --git a/tests/multigrid/transfer_04.cc b/tests/multigrid/transfer_04.cc index d9074b1192..764e7382c6 100644 --- a/tests/multigrid/transfer_04.cc +++ b/tests/multigrid/transfer_04.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/tests/multigrid/transfer_04a.cc b/tests/multigrid/transfer_04a.cc index b4b0563a1c..640f982274 100644 --- a/tests/multigrid/transfer_04a.cc +++ b/tests/multigrid/transfer_04a.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -121,8 +120,8 @@ check_fe(FiniteElement &fe) } - Functions::ZeroFunction zero; - typename FunctionMap::type fmap; + Functions::ZeroFunction zero; + std::map *> fmap; fmap.insert(std::make_pair(0, &zero)); DoFHandler dofh(tr); diff --git a/tests/multigrid/transfer_04b.cc b/tests/multigrid/transfer_04b.cc index 72955a09cb..db52a3ba5d 100644 --- a/tests/multigrid/transfer_04b.cc +++ b/tests/multigrid/transfer_04b.cc @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -121,8 +120,8 @@ check_fe(FiniteElement &fe) } - Functions::ZeroFunction zero; - typename FunctionMap::type fmap; + Functions::ZeroFunction zero; + std::map *> fmap; fmap.insert(std::make_pair(0, &zero)); DoFHandler dofh(tr); diff --git a/tests/multigrid/transfer_05.cc b/tests/multigrid/transfer_05.cc index 272edb057e..b799c0d53a 100644 --- a/tests/multigrid/transfer_05.cc +++ b/tests/multigrid/transfer_05.cc @@ -22,7 +22,6 @@ #include #include -#include #include @@ -106,9 +105,9 @@ check(const unsigned int fe_degree) mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - MGConstrainedDoFs mg_constrained_dofs; - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); diff --git a/tests/multigrid/transfer_06.cc b/tests/multigrid/transfer_06.cc index bfb2c6fd43..551bdf0cc0 100644 --- a/tests/multigrid/transfer_06.cc +++ b/tests/multigrid/transfer_06.cc @@ -23,7 +23,6 @@ #include #include -#include #include @@ -118,9 +117,9 @@ check(const unsigned int fe_degree) const std::vector *> mgdof_ptr{&mgdof_1, &mgdof_2}; - std::vector mg_constrained_dofs_vector(2); - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + std::vector mg_constrained_dofs_vector(2); + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; for (unsigned int i = 0; i < mgdof_ptr.size(); ++i) mg_constrained_dofs_vector[i].initialize(*mgdof_ptr[i], diff --git a/tests/multigrid/transfer_matrix_free_01.cc b/tests/multigrid/transfer_matrix_free_01.cc index 3951ed44db..ef6a46505e 100644 --- a/tests/multigrid/transfer_matrix_free_01.cc +++ b/tests/multigrid/transfer_matrix_free_01.cc @@ -67,9 +67,9 @@ check(const unsigned int fe_degree) mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); diff --git a/tests/multigrid/transfer_matrix_free_02.cc b/tests/multigrid/transfer_matrix_free_02.cc index 71a2e4406f..4c75298375 100644 --- a/tests/multigrid/transfer_matrix_free_02.cc +++ b/tests/multigrid/transfer_matrix_free_02.cc @@ -96,9 +96,9 @@ check(const unsigned int fe_degree) mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); diff --git a/tests/multigrid/transfer_matrix_free_02_block.cc b/tests/multigrid/transfer_matrix_free_02_block.cc index 710fee7bf0..39f03ea23b 100644 --- a/tests/multigrid/transfer_matrix_free_02_block.cc +++ b/tests/multigrid/transfer_matrix_free_02_block.cc @@ -100,9 +100,9 @@ check(const unsigned int fe_degree) mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - MGConstrainedDoFs mg_constrained_dofs; - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); diff --git a/tests/multigrid/transfer_matrix_free_02_block_02.cc b/tests/multigrid/transfer_matrix_free_02_block_02.cc index 052beb862a..2fe11cd47e 100644 --- a/tests/multigrid/transfer_matrix_free_02_block_02.cc +++ b/tests/multigrid/transfer_matrix_free_02_block_02.cc @@ -111,9 +111,9 @@ check(const unsigned int fe_degree) const std::vector *> mgdof_ptr{&mgdof_1, &mgdof_2}; - std::vector mg_constrained_dofs_vector(2); - ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + std::vector mg_constrained_dofs_vector(2); + ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; for (unsigned int i = 0; i < mgdof_ptr.size(); ++i) mg_constrained_dofs_vector[i].initialize(*mgdof_ptr[i], diff --git a/tests/multigrid/transfer_matrix_free_03.cc b/tests/multigrid/transfer_matrix_free_03.cc index 9b3edf2a1c..16a5a339fe 100644 --- a/tests/multigrid/transfer_matrix_free_03.cc +++ b/tests/multigrid/transfer_matrix_free_03.cc @@ -65,9 +65,9 @@ check(const unsigned int fe_degree) mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); diff --git a/tests/multigrid/transfer_matrix_free_06.cc b/tests/multigrid/transfer_matrix_free_06.cc index 5b25c48e8a..bc8ccda34a 100644 --- a/tests/multigrid/transfer_matrix_free_06.cc +++ b/tests/multigrid/transfer_matrix_free_06.cc @@ -98,9 +98,9 @@ check(const unsigned int fe_degree) mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); diff --git a/tests/multigrid/transfer_prebuilt_03.cc b/tests/multigrid/transfer_prebuilt_03.cc index 1c5e40d87a..f5c0b3efac 100644 --- a/tests/multigrid/transfer_prebuilt_03.cc +++ b/tests/multigrid/transfer_prebuilt_03.cc @@ -63,8 +63,8 @@ check_simple(const FiniteElement &fe) mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction homogeneous_dirichlet_bc(1); + std::map *> dirichlet_boundary; + Functions::ZeroFunction homogeneous_dirichlet_bc(1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; MGConstrainedDoFs mg_constrained_dofs; diff --git a/tests/multigrid/transfer_prebuilt_04.cc b/tests/multigrid/transfer_prebuilt_04.cc index 21d7846d19..5fc6d573f2 100644 --- a/tests/multigrid/transfer_prebuilt_04.cc +++ b/tests/multigrid/transfer_prebuilt_04.cc @@ -65,9 +65,9 @@ check() mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - MGConstrainedDoFs mg_constrained_dofs; - Functions::ZeroFunction zero_function; - typename FunctionMap::type dirichlet_boundary; + MGConstrainedDoFs mg_constrained_dofs; + Functions::ZeroFunction zero_function; + std::map *> dirichlet_boundary; dirichlet_boundary[0] = &zero_function; mg_constrained_dofs.initialize(mgdof, dirichlet_boundary); diff --git a/tests/multigrid/transfer_select.cc b/tests/multigrid/transfer_select.cc index 33d0d028a9..bba557a453 100644 --- a/tests/multigrid/transfer_select.cc +++ b/tests/multigrid/transfer_select.cc @@ -59,8 +59,7 @@ check_select(const FiniteElement &fe, DoFHandler &dof = mgdof; mgdof.distribute_dofs(fe); mgdof.distribute_mg_dofs(fe); - DoFRenumbering::component_wise(static_cast &>(mgdof), - target_component); + DoFRenumbering::component_wise(mgdof, target_component); vector ndofs( *std::max_element(target_component.begin(), target_component.end()) + 1); DoFTools::count_dofs_per_component(dof, ndofs, true, target_component); diff --git a/tests/multigrid/transfer_system_adaptive_02.cc b/tests/multigrid/transfer_system_adaptive_02.cc index d983a45143..3789c0ea56 100644 --- a/tests/multigrid/transfer_system_adaptive_02.cc +++ b/tests/multigrid/transfer_system_adaptive_02.cc @@ -152,8 +152,8 @@ check(const FiniteElement &fe) DoFRenumbering::component_wise(mg_dof_handler, level); std::vector> boundary_indices(tr.n_levels()); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction dirichlet_bc(fe.n_components()); + std::map *> dirichlet_boundary; + Functions::ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[3] = &dirichlet_bc; MGConstrainedDoFs mg_constrained_dofs; diff --git a/tests/multigrid/transfer_system_adaptive_04.cc b/tests/multigrid/transfer_system_adaptive_04.cc index a143b97461..e5d20fdab7 100644 --- a/tests/multigrid/transfer_system_adaptive_04.cc +++ b/tests/multigrid/transfer_system_adaptive_04.cc @@ -153,8 +153,8 @@ check(const FiniteElement &fe) std::vector> boundary_indices( tr.n_levels()); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction dirichlet_bc(fe.n_components()); + std::map *> dirichlet_boundary; + Functions::ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[3] = &dirichlet_bc; MGTools::make_boundary_list(mg_dof_handler, diff --git a/tests/multigrid/transfer_system_adaptive_06.cc b/tests/multigrid/transfer_system_adaptive_06.cc index 0642c4325b..8fae1ab698 100644 --- a/tests/multigrid/transfer_system_adaptive_06.cc +++ b/tests/multigrid/transfer_system_adaptive_06.cc @@ -153,8 +153,8 @@ check(const FiniteElement &fe) std::vector> boundary_indices( tr.n_levels()); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction dirichlet_bc(fe.n_components()); + std::map *> dirichlet_boundary; + Functions::ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[3] = &dirichlet_bc; MGTools::make_boundary_list(mg_dof_handler, diff --git a/tests/multigrid/transfer_system_adaptive_08.cc b/tests/multigrid/transfer_system_adaptive_08.cc index 14b0ace005..f34544233e 100644 --- a/tests/multigrid/transfer_system_adaptive_08.cc +++ b/tests/multigrid/transfer_system_adaptive_08.cc @@ -157,8 +157,8 @@ check(const FiniteElement &fe) std::vector> boundary_indices( tr.n_levels()); - typename FunctionMap::type dirichlet_boundary; - Functions::ZeroFunction dirichlet_bc(fe.n_components()); + std::map *> dirichlet_boundary; + Functions::ZeroFunction dirichlet_bc(fe.n_components()); dirichlet_boundary[3] = &dirichlet_bc; MGTools::make_boundary_list(mg_dof_handler, diff --git a/tests/numerics/error_estimator_02.cc b/tests/numerics/error_estimator_02.cc index f7736b27b1..479084dd4f 100644 --- a/tests/numerics/error_estimator_02.cc +++ b/tests/numerics/error_estimator_02.cc @@ -300,7 +300,7 @@ test_neumann(const NeumanBC &func) dealii::deallog << std::endl; // call Kelly - typename dealii::FunctionMap::type function_map; + std::map *> function_map; function_map[0] = &func; dealii::Vector error(dof_handler.n_dofs()); @@ -420,7 +420,7 @@ test_regular(const MyFunction &func) dealii::KellyErrorEstimator::estimate( dof_handler, face_quadrature_formula, - typename dealii::FunctionMap::type(), + std::map *>(), values, error, dealii::ComponentMask(), @@ -550,7 +550,7 @@ test_irregular(const MyFunction &func) dealii::KellyErrorEstimator::estimate( dof_handler, face_quadrature_formula, - typename dealii::FunctionMap::type(), + std::map *>(), values, error, dealii::ComponentMask(), @@ -719,7 +719,7 @@ test(const MySecondFunction &func) dealii::KellyErrorEstimator::estimate( dof_handler, face_quadrature_formula, - typename dealii::FunctionMap::type(), + std::map *>(), values, error, dealii::ComponentMask(), diff --git a/tests/numerics/error_estimator_02_complex.cc b/tests/numerics/error_estimator_02_complex.cc index f55cfba6ae..30a61183ab 100644 --- a/tests/numerics/error_estimator_02_complex.cc +++ b/tests/numerics/error_estimator_02_complex.cc @@ -244,7 +244,8 @@ test_neumann(const NeumanBC &func) dealii::deallog << std::endl; // call Kelly - typename dealii::FunctionMap>::type function_map; + std::map> *> + function_map; function_map[0] = &func; dealii::Vector error(dof_handler.n_dofs()); @@ -364,7 +365,7 @@ test_regular(const MyFunction &func) dealii::KellyErrorEstimator::estimate( dof_handler, face_quadrature_formula, - typename dealii::FunctionMap>::type(), + std::map> *>(), values, error, dealii::ComponentMask(), @@ -494,7 +495,7 @@ test_irregular(const MyFunction &func) dealii::KellyErrorEstimator::estimate( dof_handler, face_quadrature_formula, - typename dealii::FunctionMap>::type(), + std::map> *>(), values, error, dealii::ComponentMask(), @@ -665,7 +666,7 @@ test(const MySecondFunction &func) dealii::KellyErrorEstimator::estimate( dof_handler, face_quadrature_formula, - typename dealii::FunctionMap>::type(), + std::map> *>(), values, error, dealii::ComponentMask(), diff --git a/tests/numerics/normal_flux_inhom_01.cc b/tests/numerics/normal_flux_inhom_01.cc index 65343ee711..6fcfafedb2 100644 --- a/tests/numerics/normal_flux_inhom_01.cc +++ b/tests/numerics/normal_flux_inhom_01.cc @@ -48,7 +48,7 @@ test(const Triangulation &tr, const FiniteElement &fe) dof.distribute_dofs(fe); Functions::ConstantFunction constant_function(1., dim); - typename FunctionMap::type function_map; + std::map *> function_map; for (unsigned int j = 0; j < GeometryInfo::faces_per_cell; ++j) function_map[j] = &constant_function; diff --git a/tests/numerics/project_boundary_01.cc b/tests/numerics/project_boundary_01.cc index 89b40d47e3..5a22a36c35 100644 --- a/tests/numerics/project_boundary_01.cc +++ b/tests/numerics/project_boundary_01.cc @@ -163,7 +163,7 @@ check() DoFHandler dof(tr); dof.distribute_dofs(fe); - typename FunctionMap::type function_map; + std::map *> function_map; function_map[0] = function_list[i]; // interpolate boundary values diff --git a/tests/numerics/project_boundary_rt_01.cc b/tests/numerics/project_boundary_rt_01.cc index fdcc835670..39ea198d21 100644 --- a/tests/numerics/project_boundary_rt_01.cc +++ b/tests/numerics/project_boundary_rt_01.cc @@ -147,9 +147,9 @@ test_projection(const Triangulation &tr, const FiniteElement &fe) QGauss quadrature(degree + 2); MappingQGeneric mapping(1); - TestFunction f(degree - 1); - std::map boundary_constraints; - typename FunctionMap::type boundary_map; + TestFunction f(degree - 1); + std::map boundary_constraints; + std::map *> boundary_map; for (types::boundary_id i = 0; i < 255; ++i) boundary_map[i] = &f; VectorTools::project_boundary_values( diff --git a/tests/numerics/tangential_flux_inhom_01.cc b/tests/numerics/tangential_flux_inhom_01.cc index b3f3431f9d..1f38804504 100644 --- a/tests/numerics/tangential_flux_inhom_01.cc +++ b/tests/numerics/tangential_flux_inhom_01.cc @@ -49,7 +49,7 @@ test(const Triangulation &tr, const FiniteElement &fe) dof.distribute_dofs(fe); Functions::ConstantFunction constant_function(1., dim); - typename FunctionMap::type function_map; + std::map *> function_map; for (unsigned int j = 0; j < GeometryInfo::faces_per_cell; ++j) function_map[j] = &constant_function; diff --git a/tests/physics/step-18-rotation_matrix.cc b/tests/physics/step-18-rotation_matrix.cc index a0dce64327..51250bb641 100644 --- a/tests/physics/step-18-rotation_matrix.cc +++ b/tests/physics/step-18-rotation_matrix.cc @@ -657,15 +657,16 @@ namespace Step18 TopLevel::refine_initial_grid() { Vector error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(2), - typename FunctionMap::type(), - incremental_displacement, - error_per_cell, - ComponentMask(), - nullptr, - MultithreadInfo::n_threads(), - this_mpi_process); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(2), + std::map *>(), + incremental_displacement, + error_per_cell, + ComponentMask(), + nullptr, + MultithreadInfo::n_threads(), + this_mpi_process); const unsigned int n_local_cells = triangulation.n_locally_owned_active_cells(); PETScWrappers::MPI::Vector distributed_error_per_cell( diff --git a/tests/physics/step-18.cc b/tests/physics/step-18.cc index 8dcd054790..a00bfff289 100644 --- a/tests/physics/step-18.cc +++ b/tests/physics/step-18.cc @@ -673,15 +673,16 @@ namespace Step18 TopLevel::refine_initial_grid() { Vector error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator::estimate(dof_handler, - QGauss(2), - typename FunctionMap::type(), - incremental_displacement, - error_per_cell, - ComponentMask(), - nullptr, - MultithreadInfo::n_threads(), - this_mpi_process); + KellyErrorEstimator::estimate( + dof_handler, + QGauss(2), + std::map *>(), + incremental_displacement, + error_per_cell, + ComponentMask(), + nullptr, + MultithreadInfo::n_threads(), + this_mpi_process); const unsigned int n_local_cells = triangulation.n_locally_owned_active_cells(); PETScWrappers::MPI::Vector distributed_error_per_cell( diff --git a/tests/trilinos/solver_control_06.cc b/tests/trilinos/solver_control_06.cc index f52fea4620..7082a88e32 100644 --- a/tests/trilinos/solver_control_06.cc +++ b/tests/trilinos/solver_control_06.cc @@ -491,11 +491,12 @@ Test_Solver_Output::refine_grid() TimerOutput::Scope t(timer, "refine"); Vector estimated_error_per_cell(triangulation.n_active_cells()); - KellyErrorEstimator<2>::estimate(dof_handler, - QGauss<2 - 1>(3), - typename FunctionMap<2>::type(), - locally_relevant_solution, - estimated_error_per_cell); + KellyErrorEstimator<2>::estimate( + dof_handler, + QGauss<2 - 1>(3), + std::map *>(), + locally_relevant_solution, + estimated_error_per_cell); parallel::distributed::GridRefinement::refine_and_coarsen_fixed_number( triangulation, estimated_error_per_cell, 0.3, 0.03); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/vector_tools/boundaries.cc b/tests/vector_tools/boundaries.cc index cdc5604202..906f69cb13 100644 --- a/tests/vector_tools/boundaries.cc +++ b/tests/vector_tools/boundaries.cc @@ -142,7 +142,7 @@ check() DoFHandler dof(tr); dof.distribute_dofs(fe); - typename FunctionMap::type function_map; + std::map *> function_map; function_map[0] = function_list[i]; // interpolate boundary values diff --git a/tests/vector_tools/boundaries_complex.cc b/tests/vector_tools/boundaries_complex.cc index db2ef3c763..d806160037 100644 --- a/tests/vector_tools/boundaries_complex.cc +++ b/tests/vector_tools/boundaries_complex.cc @@ -149,7 +149,8 @@ check() DoFHandler dof(tr); dof.distribute_dofs(fe); - typename FunctionMap>::type function_map; + std::map> *> + function_map; function_map[0] = function_list[i]; // interpolate boundary values diff --git a/tests/vector_tools/boundaries_complex_hp.cc b/tests/vector_tools/boundaries_complex_hp.cc index 526b264a21..22c4a8e69c 100644 --- a/tests/vector_tools/boundaries_complex_hp.cc +++ b/tests/vector_tools/boundaries_complex_hp.cc @@ -150,7 +150,8 @@ check() hp::DoFHandler dof(tr); dof.distribute_dofs(fe); - typename FunctionMap>::type function_map; + std::map> *> + function_map; function_map[0] = function_list[i]; // interpolate boundary values -- 2.39.5