From 969aab70a398ff2b646dd1fb3002902214a0fcc7 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Tue, 19 Mar 2013 19:19:14 +0000 Subject: [PATCH] Convert unsigned int to types::global_dof_index in the tests. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28944 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/dofs/dof_tools.h | 6 ++--- .../deal.II/matrix_free/fe_evaluation.h | 2 +- deal.II/source/dofs/dof_tools.cc | 8 +++---- deal.II/source/dofs/dof_tools.inst.in | 14 ++++++------ deal.II/source/multigrid/mg_tools.cc | 4 ++-- deal.II/source/multigrid/mg_tools.inst.in | 4 ++-- tests/base/index_set_19.cc | 2 +- tests/benchmarks/old/spec2006-447.dealII.cc | 2 +- tests/benchmarks/step-22/step-22.cc | 2 +- tests/benchmarks/test_assembly/step-22.cc | 2 +- tests/benchmarks/test_poisson/poisson.cc | 2 +- tests/bits/anna_3.cc | 3 ++- tests/bits/anna_4.cc | 2 +- tests/bits/anna_6.cc | 6 ++--- tests/bits/apply_boundary_values_01.cc | 4 ++-- tests/bits/apply_boundary_values_02.cc | 4 ++-- tests/bits/apply_boundary_values_03.cc | 4 ++-- tests/bits/apply_boundary_values_04.cc | 6 ++--- tests/bits/joa_1.cc | 2 +- tests/bits/make_boundary_constraints_01.cc | 2 +- tests/bits/make_boundary_constraints_02.cc | 2 +- tests/bits/step-13.cc | 2 +- tests/bits/step-14.cc | 2 +- tests/bits/step-15.cc | 2 +- tests/bits/step-16b.cc | 4 ++-- tests/bits/step-3.cc | 2 +- tests/bits/step-4.cc | 2 +- tests/bits/step-5.cc | 2 +- tests/bits/step-6.cc | 2 +- tests/bits/step-7.cc | 2 +- tests/bits/step-8.cc | 2 +- tests/deal.II/block_matrices.cc | 22 +++++++++---------- tests/deal.II/boundaries.cc | 8 +++---- tests/deal.II/constraints_block_01.cc | 8 +++---- tests/deal.II/constraints_hanging_nodes_bc.cc | 6 ++--- tests/deal.II/constraints_local_to_global.cc | 2 +- .../constraints_local_to_global_chunk.cc | 2 +- tests/deal.II/fe_values_view_23.cc | 2 +- tests/deal.II/fe_values_view_24.cc | 2 +- tests/deal.II/fe_values_view_25.cc | 2 +- tests/deal.II/inhomogeneous_constraints.cc | 4 ++-- tests/deal.II/inhomogeneous_constraints_04.cc | 2 +- .../inhomogeneous_constraints_block.cc | 4 ++-- .../inhomogeneous_constraints_nonsymmetric.cc | 4 ++-- .../deal.II/interpolate_boundary_values_02.cc | 2 +- tests/deal.II/memory_consumption_01.cc | 4 ++-- tests/deal.II/point_value_history_02.cc | 2 +- tests/deal.II/point_value_history_03.cc | 2 +- .../count_dofs_per_block_01.cc | 2 +- tests/fail/circular_01.cc | 2 +- tests/fail/hp-step-14.cc | 2 +- tests/fail/hp-step-15.cc | 2 +- tests/fe/abf_01.cc | 6 ++--- tests/fe/deformed_projection.h | 12 +++++----- tests/fe/fe_q_dg0.cc | 6 ++--- tests/hp/compare_hp_vs_nonhp_01.cc | 4 ++-- tests/hp/count_dofs_per_block_01.cc | 14 ++++++------ tests/hp/count_dofs_per_block_02.cc | 14 ++++++------ tests/hp/crash_07.cc | 2 +- tests/hp/crash_09.cc | 2 +- tests/hp/crash_10.cc | 2 +- tests/hp/crash_11.cc | 2 +- tests/hp/crash_14.cc | 4 ++-- tests/hp/crash_15.cc | 4 ++-- tests/hp/crash_17.cc | 2 +- tests/hp/crash_17_compressed_set_sparsity.cc | 2 +- tests/hp/crash_18.cc | 2 +- tests/hp/crash_18_compressed_set_sparsity.cc | 2 +- tests/hp/crash_19.cc | 2 +- tests/hp/fe_nothing_07.cc | 2 +- tests/hp/fe_nothing_12.cc | 2 +- tests/hp/fe_nothing_13.cc | 2 +- tests/hp/fe_nothing_14.cc | 2 +- tests/hp/renumber_block_wise_01b.cc | 2 +- tests/hp/step-13.cc | 2 +- tests/hp/step-3.cc | 2 +- tests/hp/step-3a.cc | 2 +- tests/hp/step-3b.cc | 2 +- tests/hp/step-3c.cc | 2 +- tests/hp/step-4.cc | 2 +- tests/hp/step-5.cc | 2 +- tests/hp/step-6.cc | 2 +- tests/hp/step-7.cc | 2 +- tests/hp/step-8.cc | 2 +- tests/integrators/divergence_01.cc | 4 ++-- tests/integrators/elasticity_01.cc | 6 ++--- tests/integrators/laplacian_01.cc | 6 ++--- tests/lac/block_indices.cc | 2 +- tests/lac/block_matrices.cc | 4 ++-- tests/lac/block_sparsity_pattern_01.cc | 8 +++---- tests/lac/block_sparsity_pattern_02.cc | 4 ++-- tests/lac/block_vector.cc | 4 ++-- tests/lac/block_vector_copy.cc | 2 +- tests/lac/block_vector_iterator.cc | 2 +- tests/lac/block_vector_vector_assign.cc | 2 +- tests/lac/complex_block_vector.cc | 4 ++-- tests/lac/complex_block_vector_iterator.cc | 2 +- .../lac/complex_block_vector_vector_assign.cc | 2 +- tests/matrix_free/matrix_vector_common.h | 2 +- tests/matrix_free/matrix_vector_curl.cc | 2 +- tests/matrix_free/matrix_vector_div.cc | 2 +- tests/matrix_free/matrix_vector_hp.cc | 2 +- tests/matrix_free/matrix_vector_mg.cc | 2 +- tests/matrix_free/matrix_vector_stokes.cc | 2 +- .../matrix_vector_stokes_noflux.cc | 2 +- tests/matrix_free/step-37.cc | 4 ++-- tests/mpi/matrix_free_01.cc | 2 +- tests/mpi/matrix_free_03.cc | 2 +- tests/mpi/no_flux_constraints.cc | 2 +- tests/mpi/no_flux_constraints_02.cc | 2 +- tests/mpi/no_flux_constraints_03.cc | 2 +- tests/mpi/renumber_z_order_01.cc | 2 +- tests/mpi/renumber_z_order_02.cc | 2 +- tests/mpi/step-40.cc | 2 +- tests/mpi/step-40_direct_solver.cc | 2 +- tests/multigrid/boundary_01.cc | 6 ++--- tests/multigrid/count_01.cc | 4 ++-- tests/multigrid/dof_01.cc | 2 +- tests/multigrid/dof_02.cc | 2 +- tests/multigrid/mg_output.cc | 12 +++++----- tests/multigrid/mg_renumbered_01.cc | 6 ++--- tests/multigrid/mg_renumbered_02.cc | 8 +++---- tests/multigrid/mg_renumbered_03.cc | 8 +++---- tests/multigrid/renumbering_01.cc | 2 +- tests/multigrid/renumbering_03.cc | 4 ++-- tests/multigrid/transfer_03.cc | 10 ++++----- tests/multigrid/transfer_block.cc | 12 +++++----- tests/multigrid/transfer_block_select.cc | 12 +++++----- tests/multigrid/transfer_compare_01.cc | 18 +++++++-------- tests/multigrid/transfer_select.cc | 4 ++-- tests/umfpack/umfpack_04.cc | 2 +- 131 files changed, 252 insertions(+), 251 deletions(-) diff --git a/deal.II/include/deal.II/dofs/dof_tools.h b/deal.II/include/deal.II/dofs/dof_tools.h index 27990c15dc..1aa12bb336 100644 --- a/deal.II/include/deal.II/dofs/dof_tools.h +++ b/deal.II/include/deal.II/dofs/dof_tools.h @@ -2259,8 +2259,8 @@ namespace DoFTools count_dofs_per_component (const DH &dof_handler, std::vector &dofs_per_component, const bool vector_valued_once = false, - std::vector target_component - = std::vector()); + std::vector target_component + = std::vector()); /** * Count the degrees of freedom @@ -2312,7 +2312,7 @@ namespace DoFTools void count_dofs_per_component (const DoFHandler &dof_handler, std::vector &dofs_per_component, - std::vector target_component) DEAL_II_DEPRECATED; + std::vector target_component) DEAL_II_DEPRECATED; /** * This function can be used when diff --git a/deal.II/include/deal.II/matrix_free/fe_evaluation.h b/deal.II/include/deal.II/matrix_free/fe_evaluation.h index 6c729dc1ad..e3de7b15cc 100644 --- a/deal.II/include/deal.II/matrix_free/fe_evaluation.h +++ b/deal.II/include/deal.II/matrix_free/fe_evaluation.h @@ -2424,7 +2424,7 @@ FEEvaluationBase // loop over all local dofs. ind_local holds local number on cell, index // iterates over the elements of index_local_to_global and dof_indices // points to the global indices stored in index_local_to_global - const unsigned int *dof_indices = dof_info.begin_indices_plain(cell); + const types::global_dof_index *dof_indices = dof_info.begin_indices_plain(cell); // scalar case (or case when all components have the same degrees of freedom // and sit on a different vector each) diff --git a/deal.II/source/dofs/dof_tools.cc b/deal.II/source/dofs/dof_tools.cc index 6e3d4ee611..a282ddd19e 100644 --- a/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/source/dofs/dof_tools.cc @@ -4333,7 +4333,7 @@ namespace DoFTools void resolve_components (const FiniteElement &fe, const std::vector &dofs_by_component, - const std::vector &target_component, + const std::vector &target_component, const bool only_once, std::vector &dofs_per_component, unsigned int &component) @@ -4374,7 +4374,7 @@ namespace DoFTools void resolve_components (const hp::FECollection &fe_collection, const std::vector &dofs_by_component, - const std::vector &target_component, + const std::vector &target_component, const bool only_once, std::vector &dofs_per_component, unsigned int &component) @@ -4440,7 +4440,7 @@ namespace DoFTools const DH &dof_handler, std::vector &dofs_per_component, bool only_once, - std::vector target_component) + std::vector target_component) { const unsigned int n_components = dof_handler.get_fe().n_components(); @@ -4597,7 +4597,7 @@ namespace DoFTools void count_dofs_per_component (const DoFHandler &dof_handler, std::vector &dofs_per_component, - std::vector target_component) + std::vector target_component) { count_dofs_per_component (dof_handler, dofs_per_component, false, target_component); diff --git a/deal.II/source/dofs/dof_tools.inst.in b/deal.II/source/dofs/dof_tools.inst.in index 124592fb4f..787ada00eb 100644 --- a/deal.II/source/dofs/dof_tools.inst.in +++ b/deal.II/source/dofs/dof_tools.inst.in @@ -799,13 +799,13 @@ template void DoFTools::count_dofs_per_component > ( const DoFHandler&, - std::vector&, bool, std::vector); + std::vector&, bool, std::vector); template void DoFTools::count_dofs_per_component > ( const hp::DoFHandler&, - std::vector&, bool, std::vector); + std::vector&, bool, std::vector); #if deal_II_dimension < 3 @@ -813,13 +813,13 @@ template void DoFTools::count_dofs_per_component > ( const DoFHandler&, - std::vector&, bool, std::vector); + std::vector&, bool, std::vector); template void DoFTools::count_dofs_per_component > ( const hp::DoFHandler&, - std::vector&, bool, std::vector); + std::vector&, bool, std::vector); template void @@ -845,13 +845,13 @@ template void DoFTools::count_dofs_per_component > ( const DoFHandler<1,3>&, - std::vector&, bool, std::vector); + std::vector&, bool, std::vector); template void DoFTools::count_dofs_per_component > ( const hp::DoFHandler<1,3>&, - std::vector&, bool, std::vector); + std::vector&, bool, std::vector); template void @@ -897,7 +897,7 @@ template void DoFTools::count_dofs_per_component ( const DoFHandler&, - std::vector&, std::vector); + std::vector&, std::vector); template void diff --git a/deal.II/source/multigrid/mg_tools.cc b/deal.II/source/multigrid/mg_tools.cc index d014a814a2..d356360f50 100644 --- a/deal.II/source/multigrid/mg_tools.cc +++ b/deal.II/source/multigrid/mg_tools.cc @@ -945,7 +945,7 @@ namespace MGTools count_dofs_per_component (const DoFHandler &dof_handler, std::vector > &result, bool only_once, - std::vector target_component) + std::vector target_component) { const FiniteElement &fe = dof_handler.get_fe(); const unsigned int n_components = fe.n_components(); @@ -1046,7 +1046,7 @@ namespace MGTools void count_dofs_per_component (const DoFHandler &dof_handler, std::vector > &result, - std::vector target_component) + std::vector target_component) { count_dofs_per_component (dof_handler, result, false, target_component); diff --git a/deal.II/source/multigrid/mg_tools.inst.in b/deal.II/source/multigrid/mg_tools.inst.in index d4d787025f..2b9be32ad2 100644 --- a/deal.II/source/multigrid/mg_tools.inst.in +++ b/deal.II/source/multigrid/mg_tools.inst.in @@ -85,10 +85,10 @@ for (deal_II_dimension : DIMENSIONS) template void count_dofs_per_component ( const DoFHandler&, std::vector >&, - bool, std::vector); + bool, std::vector); template void count_dofs_per_component ( const DoFHandler&, std::vector >&, - std::vector); + std::vector); template void count_dofs_per_block ( const DoFHandler&, std::vector >&, std::vector); diff --git a/tests/base/index_set_19.cc b/tests/base/index_set_19.cc index a66f1ee0aa..385a06002c 100644 --- a/tests/base/index_set_19.cc +++ b/tests/base/index_set_19.cc @@ -33,7 +33,7 @@ void test () for (unsigned int i=0; i<9*is1.size()/10; ++i) is1.add_index (rand() % is1.size()); - std::vector indices; + std::vector indices; is1.fill_index_vector (indices); deallog << "Original index set: " << std::endl; diff --git a/tests/benchmarks/old/spec2006-447.dealII.cc b/tests/benchmarks/old/spec2006-447.dealII.cc index 73ca71506a..8b020dee3d 100644 --- a/tests/benchmarks/old/spec2006-447.dealII.cc +++ b/tests/benchmarks/old/spec2006-447.dealII.cc @@ -725,7 +725,7 @@ namespace LaplaceSolver assemble_rhs (linear_system.rhs); linear_system.hanging_node_constraints.condense (linear_system.rhs); - std::map boundary_value_map; + std::map boundary_value_map; VectorTools::interpolate_boundary_values (dof_handler, 0, *boundary_values, diff --git a/tests/benchmarks/step-22/step-22.cc b/tests/benchmarks/step-22/step-22.cc index fff0e79922..1ed6a8f13a 100644 --- a/tests/benchmarks/step-22/step-22.cc +++ b/tests/benchmarks/step-22/step-22.cc @@ -793,7 +793,7 @@ namespace Step22 FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); Vector local_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const RightHandSide right_hand_side; std::vector > rhs_values (n_q_points, diff --git a/tests/benchmarks/test_assembly/step-22.cc b/tests/benchmarks/test_assembly/step-22.cc index 7ae7707e5a..a8c0282bdd 100644 --- a/tests/benchmarks/test_assembly/step-22.cc +++ b/tests/benchmarks/test_assembly/step-22.cc @@ -768,7 +768,7 @@ namespace Step22 FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); Vector local_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const RightHandSide right_hand_side; std::vector > rhs_values (n_q_points, diff --git a/tests/benchmarks/test_poisson/poisson.cc b/tests/benchmarks/test_poisson/poisson.cc index 90af0d8dc3..b3d448e349 100644 --- a/tests/benchmarks/test_poisson/poisson.cc +++ b/tests/benchmarks/test_poisson/poisson.cc @@ -120,7 +120,7 @@ void HelmholtzProblem::assemble_system () FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); FEValues fe_values (fe, quadrature_formula, update_values | update_gradients | diff --git a/tests/bits/anna_3.cc b/tests/bits/anna_3.cc index 62ae08b977..6bb1da07f6 100644 --- a/tests/bits/anna_3.cc +++ b/tests/bits/anna_3.cc @@ -98,7 +98,8 @@ void SystemTest::check () deallog << " DoF " << i << std::endl; }; - std::vector dofs_per_component (fe.n_components(), 0U); + std::vector dofs_per_component (fe.n_components(), + static_cast(0)); DoFTools::count_dofs_per_component (dof_handler, dofs_per_component); deallog << "DoFs per component: "; for (unsigned int i=0; i::dirichlet_conditions () // correctly implemented by now - std::map dirichlet_dofs; + std::map dirichlet_dofs; // we declare a vector of bools, // which tells the diff --git a/tests/bits/anna_6.cc b/tests/bits/anna_6.cc index eb9233b28e..b3ed7da5a0 100644 --- a/tests/bits/anna_6.cc +++ b/tests/bits/anna_6.cc @@ -155,7 +155,7 @@ template void ImposeBC::get_ready () { dof_handler.distribute_dofs (fe); - std::vector dofs_per_comp (fe.n_components()); + std::vector dofs_per_comp (fe.n_components()); DoFTools::count_dofs_per_component(dof_handler, dofs_per_comp); // For an FESystem with Nedelec-elements as @@ -173,7 +173,7 @@ template void ImposeBC::test_extract_boundary_DoFs () { - std::map boundary_values; + std::map boundary_values; std::vector bc_component_select(dim + 1); // extract boundary DoFs for the Nedelec-component @@ -202,7 +202,7 @@ template void ImposeBC::test_interpolate_BC () { - std::map boundary_values; + std::map boundary_values; std::vector bc_component_select(dim + 1, false); diff --git a/tests/bits/apply_boundary_values_01.cc b/tests/bits/apply_boundary_values_01.cc index ef1221b4f7..8610fa6310 100644 --- a/tests/bits/apply_boundary_values_01.cc +++ b/tests/bits/apply_boundary_values_01.cc @@ -80,13 +80,13 @@ void test () // (1) writing them into the matrix and // applying boundary values later on, or // (2) applying them right away - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ConstantFunction(1.), boundary_values); - std::vector local_dofs (fe.dofs_per_cell); + std::vector local_dofs (fe.dofs_per_cell); FullMatrix local_matrix (fe.dofs_per_cell, fe.dofs_per_cell); Vector local_vector (fe.dofs_per_cell); for (typename DoFHandler::active_cell_iterator diff --git a/tests/bits/apply_boundary_values_02.cc b/tests/bits/apply_boundary_values_02.cc index 9632d620f8..d8eac1b064 100644 --- a/tests/bits/apply_boundary_values_02.cc +++ b/tests/bits/apply_boundary_values_02.cc @@ -80,13 +80,13 @@ void test () // (1) writing them into the matrix and // applying boundary values later on, or // (2) applying them right away - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ConstantFunction(1.), boundary_values); - std::vector local_dofs (fe.dofs_per_cell); + std::vector local_dofs (fe.dofs_per_cell); FullMatrix local_matrix (fe.dofs_per_cell, fe.dofs_per_cell); Vector local_vector (fe.dofs_per_cell); for (typename DoFHandler::active_cell_iterator diff --git a/tests/bits/apply_boundary_values_03.cc b/tests/bits/apply_boundary_values_03.cc index d491375968..598cc96a6e 100644 --- a/tests/bits/apply_boundary_values_03.cc +++ b/tests/bits/apply_boundary_values_03.cc @@ -52,11 +52,11 @@ void test () // (1) writing them into the matrix and // applying boundary values later on, or // (2) applying them right away - std::map boundary_values; + std::map boundary_values; boundary_values[N/2] = 42; // then fill the matrices - std::vector local_dofs (N); + std::vector local_dofs (N); FullMatrix local_matrix (N,N); Vector local_vector (N); { diff --git a/tests/bits/apply_boundary_values_04.cc b/tests/bits/apply_boundary_values_04.cc index d14d4761d8..baa0160e10 100644 --- a/tests/bits/apply_boundary_values_04.cc +++ b/tests/bits/apply_boundary_values_04.cc @@ -52,16 +52,16 @@ void test () // (1) writing them into the matrix and // applying boundary values later on, or // (2) applying them right away - std::map boundary_values; + std::map boundary_values; boundary_values[N/2] = 42; // then fill the matrices - std::vector local_dofs (N); + std::vector local_dofs (N); FullMatrix local_matrix (N,N); Vector local_vector (N); { for (unsigned int i=0; i::assemble_system () // from the system of equations // happens *after* the elimination // of hanging nodes. - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/bits/make_boundary_constraints_01.cc b/tests/bits/make_boundary_constraints_01.cc index 3644d5103a..e74ef72810 100644 --- a/tests/bits/make_boundary_constraints_01.cc +++ b/tests/bits/make_boundary_constraints_01.cc @@ -80,7 +80,7 @@ void test () // initialize object denoting zero // boundary values and boundary // constraints - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ConstantFunction(1.), diff --git a/tests/bits/make_boundary_constraints_02.cc b/tests/bits/make_boundary_constraints_02.cc index 4e5ab2e5ad..1f051876ee 100644 --- a/tests/bits/make_boundary_constraints_02.cc +++ b/tests/bits/make_boundary_constraints_02.cc @@ -89,7 +89,7 @@ void test () // initialize object denoting zero // boundary values and boundary // constraints - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 1, ConstantFunction(1.), diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc index d4bc46f149..31e1015463 100644 --- a/tests/bits/step-13.cc +++ b/tests/bits/step-13.cc @@ -373,7 +373,7 @@ namespace LaplaceSolver assemble_rhs (linear_system.rhs); linear_system.hanging_node_constraints.condense (linear_system.rhs); - std::map boundary_value_map; + std::map boundary_value_map; VectorTools::interpolate_boundary_values (dof_handler, 0, *boundary_values, diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc index 81785870e3..a0627342d3 100644 --- a/tests/bits/step-14.cc +++ b/tests/bits/step-14.cc @@ -462,7 +462,7 @@ namespace LaplaceSolver assemble_rhs (linear_system.rhs); linear_system.hanging_node_constraints.condense (linear_system.rhs); - std::map boundary_value_map; + std::map boundary_value_map; VectorTools::interpolate_boundary_values (dof_handler, 0, *boundary_values, diff --git a/tests/bits/step-15.cc b/tests/bits/step-15.cc index 17ff61c140..e03034c6ff 100644 --- a/tests/bits/step-15.cc +++ b/tests/bits/step-15.cc @@ -266,7 +266,7 @@ void MinimizationProblem::assemble_step () hanging_node_constraints.condense (matrix); hanging_node_constraints.condense (residual); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/bits/step-16b.cc b/tests/bits/step-16b.cc index 0683ef0570..2844948664 100644 --- a/tests/bits/step-16b.cc +++ b/tests/bits/step-16b.cc @@ -146,7 +146,7 @@ void LaplaceProblem::assemble_system () FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = mg_dof_handler.begin_active(), endc = mg_dof_handler.end(); @@ -202,7 +202,7 @@ void LaplaceProblem::assemble_multigrid () FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename MGDoFHandler::cell_iterator cell = mg_dof_handler.begin(), endc = mg_dof_handler.end(); diff --git a/tests/bits/step-3.cc b/tests/bits/step-3.cc index a3ec37eeef..78e04d2aa1 100644 --- a/tests/bits/step-3.cc +++ b/tests/bits/step-3.cc @@ -165,7 +165,7 @@ void LaplaceProblem::assemble_system () } - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction<2>(), diff --git a/tests/bits/step-4.cc b/tests/bits/step-4.cc index ce1a9a59c3..ffb744e7fb 100644 --- a/tests/bits/step-4.cc +++ b/tests/bits/step-4.cc @@ -222,7 +222,7 @@ void LaplaceProblem::assemble_system () } - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, BoundaryValues(), diff --git a/tests/bits/step-5.cc b/tests/bits/step-5.cc index d5428c07b8..b7b51da76f 100644 --- a/tests/bits/step-5.cc +++ b/tests/bits/step-5.cc @@ -225,7 +225,7 @@ void LaplaceProblem::assemble_system () } } - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc index 9a04d8e495..047ac9955d 100644 --- a/tests/bits/step-6.cc +++ b/tests/bits/step-6.cc @@ -252,7 +252,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc index 862dda83e1..d316e512d0 100644 --- a/tests/bits/step-7.cc +++ b/tests/bits/step-7.cc @@ -356,7 +356,7 @@ void HelmholtzProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, Solution(), diff --git a/tests/bits/step-8.cc b/tests/bits/step-8.cc index c712be1e68..3c0a107d5a 100644 --- a/tests/bits/step-8.cc +++ b/tests/bits/step-8.cc @@ -300,7 +300,7 @@ void ElasticProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(dim), diff --git a/tests/deal.II/block_matrices.cc b/tests/deal.II/block_matrices.cc index d36f894e16..b75dcc371b 100644 --- a/tests/deal.II/block_matrices.cc +++ b/tests/deal.II/block_matrices.cc @@ -182,8 +182,8 @@ void LaplaceProblem,BlockSparseMatrix,BlockSparsityP { case 2: { - const unsigned int n_dofs = dof_handler.n_dofs(); - const unsigned int block_size[2] = { n_dofs/3, n_dofs - n_dofs/3 }; + const types::global_dof_index n_dofs = dof_handler.n_dofs(); + const types::global_dof_index block_size[2] = { n_dofs/3, n_dofs - n_dofs/3 }; for (unsigned int i=0; i<2; ++i) for (unsigned int j=0; j<2; ++j) @@ -196,8 +196,8 @@ void LaplaceProblem,BlockSparseMatrix,BlockSparsityP case 3: { - const unsigned int n_dofs = dof_handler.n_dofs(); - const unsigned int block_size[3] = { n_dofs/5, n_dofs/7, n_dofs - n_dofs/5 - n_dofs/7 }; + const types::global_dof_index n_dofs = dof_handler.n_dofs(); + const types::global_dof_index block_size[3] = { n_dofs/5, n_dofs/7, n_dofs - n_dofs/5 - n_dofs/7 }; for (unsigned int i=0; i<3; ++i) for (unsigned int j=0; j<3; ++j) @@ -222,9 +222,9 @@ void LaplaceProblem,BlockSparseMatrix,BlockSparsityP { case 2: { - const unsigned int n_dofs = dof_handler.n_dofs(); - const unsigned int block_size_[2] = { n_dofs/3, n_dofs - n_dofs/3 }; - const std::vector block_size (&block_size_[0], + const types::global_dof_index n_dofs = dof_handler.n_dofs(); + const types::global_dof_index block_size_[2] = { n_dofs/3, n_dofs - n_dofs/3 }; + const std::vector block_size (&block_size_[0], &block_size_[2]); solution.reinit (block_size); @@ -235,9 +235,9 @@ void LaplaceProblem,BlockSparseMatrix,BlockSparsityP case 3: { - const unsigned int n_dofs = dof_handler.n_dofs(); - const unsigned int block_size_[3] = { n_dofs/5, n_dofs/7, n_dofs - n_dofs/5 - n_dofs/7 }; - const std::vector block_size (&block_size_[0], + const types::global_dof_index n_dofs = dof_handler.n_dofs(); + const types::global_dof_index block_size_[3] = { n_dofs/5, n_dofs/7, n_dofs - n_dofs/5 - n_dofs/7 }; + const std::vector block_size (&block_size_[0], &block_size_[3]); solution.reinit (block_size); @@ -305,7 +305,7 @@ void LaplaceProblem::assemble_system () }; - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction<2>(), diff --git a/tests/deal.II/boundaries.cc b/tests/deal.II/boundaries.cc index 7e456053b1..8776c33dc8 100644 --- a/tests/deal.II/boundaries.cc +++ b/tests/deal.II/boundaries.cc @@ -70,9 +70,9 @@ boundary_q (const DoFHandler<1> &) } -void write_map (const std::map &bv) +void write_map (const std::map &bv) { - for (std::map::const_iterator + for (std::map::const_iterator i=bv.begin(); i!=bv.end(); ++i) deallog << i->first << ' ' << i->second < interpolated_bv; + std::map interpolated_bv; VectorTools::interpolate_boundary_values (mapping, dof, function_map, interpolated_bv, std::vector()); write_map (interpolated_bv); @@ -148,7 +148,7 @@ check () if (dim != 3) { deallog << "Projected boundary values" << std::endl; - std::map projected_bv; + std::map projected_bv; VectorTools::project_boundary_values (mapping, dof, function_map, boundary_q(dof), projected_bv); write_map (projected_bv); diff --git a/tests/deal.II/constraints_block_01.cc b/tests/deal.II/constraints_block_01.cc index 2437d4dfd4..74ed1c7223 100644 --- a/tests/deal.II/constraints_block_01.cc +++ b/tests/deal.II/constraints_block_01.cc @@ -146,7 +146,7 @@ int main () block_component[comp] = 2; }//comp - std::vector dofs_per_block(3,0);//3 blocks, count dofs: + std::vector dofs_per_block(3,0);//3 blocks, count dofs: DoFTools::count_dofs_per_component (dh, dofs_per_block, false, block_component); DoFRenumbering::component_wise(dh, block_component); @@ -219,8 +219,8 @@ int main () const unsigned int dofs_per_fl_msh_face = fluid_fe->dofs_per_face; const unsigned int dofs_per_solid_face = solid_fe->dofs_per_face; - std::vector fl_msh_face_dof_indices (dofs_per_fl_msh_face); - std::vector solid_face_dof_indices (dofs_per_solid_face ); + std::vector fl_msh_face_dof_indices (dofs_per_fl_msh_face); + std::vector solid_face_dof_indices (dofs_per_solid_face ); std::vector > solid_fluid_pairs; std::vector > solid_mesh_pairs; @@ -313,7 +313,7 @@ int main () FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); for (hp::DoFHandler::active_cell_iterator cell = dh.begin_active(); diff --git a/tests/deal.II/constraints_hanging_nodes_bc.cc b/tests/deal.II/constraints_hanging_nodes_bc.cc index 214439f9e4..9f66092b36 100644 --- a/tests/deal.II/constraints_hanging_nodes_bc.cc +++ b/tests/deal.II/constraints_hanging_nodes_bc.cc @@ -74,12 +74,12 @@ void test () library_constraints.merge (correct_constraints); { - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof, 0, ConstantFunction(1.), boundary_values); - std::map::const_iterator boundary_value = + std::map::const_iterator boundary_value = boundary_values.begin(); for ( ; boundary_value !=boundary_values.end(); ++boundary_value) { @@ -110,7 +110,7 @@ void test () { Assert (correct_constraints.is_constrained(i) == library_constraints.is_constrained(i), ExcInternalError()); - typedef const std::vector >& constraint_format; + typedef const std::vector >& constraint_format; if (correct_constraints.is_constrained(i)) { constraint_format correct = *correct_constraints.get_constraint_entries(i); diff --git a/tests/deal.II/constraints_local_to_global.cc b/tests/deal.II/constraints_local_to_global.cc index 51b119e3a8..408de4c7d1 100644 --- a/tests/deal.II/constraints_local_to_global.cc +++ b/tests/deal.II/constraints_local_to_global.cc @@ -70,7 +70,7 @@ void test () FullMatrix full (dof.n_dofs(), dof.n_dofs()); FullMatrix local_mat (fe.dofs_per_cell, fe.dofs_per_cell); - std::vector local_dof_indices (fe.dofs_per_cell); + std::vector local_dof_indices (fe.dofs_per_cell); // loop over cells, fill local matrix with // random values, insert both into sparse and diff --git a/tests/deal.II/constraints_local_to_global_chunk.cc b/tests/deal.II/constraints_local_to_global_chunk.cc index 5638055142..2424cb0856 100644 --- a/tests/deal.II/constraints_local_to_global_chunk.cc +++ b/tests/deal.II/constraints_local_to_global_chunk.cc @@ -74,7 +74,7 @@ void test (unsigned int chunk_size) ChunkSparseMatrix chunk_sparse (chunk_sparsity); FullMatrix local_mat (fe.dofs_per_cell, fe.dofs_per_cell); - std::vector local_dof_indices (fe.dofs_per_cell); + std::vector local_dof_indices (fe.dofs_per_cell); // loop over cells, fill local matrix with // random values, insert both into sparse and diff --git a/tests/deal.II/fe_values_view_23.cc b/tests/deal.II/fe_values_view_23.cc index f84ca57aaa..2fe49827be 100644 --- a/tests/deal.II/fe_values_view_23.cc +++ b/tests/deal.II/fe_values_view_23.cc @@ -60,7 +60,7 @@ void test (const Triangulation& tr, .get_function_divergences (fe_function, divergences); // now do the same "by hand" - std::vector local_dof_indices (fe.dofs_per_cell); + std::vector local_dof_indices (fe.dofs_per_cell); dof.begin_active()->get_dof_indices (local_dof_indices); for (unsigned int q=0; q& tr, .get_function_divergences (fe_function, divergences); // now do the same "by hand" - std::vector local_dof_indices (fe.dofs_per_cell); + std::vector local_dof_indices (fe.dofs_per_cell); dof.begin_active()->get_dof_indices (local_dof_indices); for (unsigned int i=0; i& tr, .get_function_divergences (fe_function, divergences); // now do the same "by hand" - std::vector local_dof_indices (fe.dofs_per_cell); + std::vector local_dof_indices (fe.dofs_per_cell); dof.begin_active()->get_dof_indices (local_dof_indices); for (unsigned int i=0; i::setup_system () // function. { test_all_constraints.merge (hanging_nodes_only); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, BoundaryValues(), @@ -337,7 +337,7 @@ void LaplaceProblem::assemble_reference () } hanging_nodes_only.condense (reference_matrix, reference_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, BoundaryValues(), diff --git a/tests/deal.II/inhomogeneous_constraints_04.cc b/tests/deal.II/inhomogeneous_constraints_04.cc index 023dda873e..2559eaed47 100644 --- a/tests/deal.II/inhomogeneous_constraints_04.cc +++ b/tests/deal.II/inhomogeneous_constraints_04.cc @@ -114,7 +114,7 @@ void test(bool use_constraint_matrix) rhs (local_dofs2[i]) += local_vec (i); } - std::map boundary_values; + std::map boundary_values; boundary_values.insert (std::pair(1, -5.0)); boundary_values.insert (std::pair(3, 2.0)); boundary_values.insert (std::pair(4, 0.0)); diff --git a/tests/deal.II/inhomogeneous_constraints_block.cc b/tests/deal.II/inhomogeneous_constraints_block.cc index 76d6ceb00e..88881930a8 100644 --- a/tests/deal.II/inhomogeneous_constraints_block.cc +++ b/tests/deal.II/inhomogeneous_constraints_block.cc @@ -130,7 +130,7 @@ void AdvectionProblem::setup_system () // add boundary conditions as // inhomogeneous constraints here. { - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ConstantFunction(1.,2), @@ -312,7 +312,7 @@ void AdvectionProblem::assemble_reference () // use some other rhs vector as dummy for // application of Dirichlet conditions - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ConstantFunction(1.,2), diff --git a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc index 87db51fd37..5fa66fa125 100644 --- a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc +++ b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc @@ -134,7 +134,7 @@ void AdvectionProblem::setup_system () // take the right hand side function as // boundary function { - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, RightHandSide(), @@ -276,7 +276,7 @@ void AdvectionProblem::assemble_reference () // use some other rhs vector as dummy for // application of Dirichlet conditions - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, RightHandSide(), diff --git a/tests/deal.II/interpolate_boundary_values_02.cc b/tests/deal.II/interpolate_boundary_values_02.cc index fdb148c732..985ab1c6da 100644 --- a/tests/deal.II/interpolate_boundary_values_02.cc +++ b/tests/deal.II/interpolate_boundary_values_02.cc @@ -54,7 +54,7 @@ void test () dof_handler.distribute_dofs (fe); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 10, Functions::SquareFunction(), diff --git a/tests/deal.II/memory_consumption_01.cc b/tests/deal.II/memory_consumption_01.cc index 6c2fd84d83..ecaf5c4584 100644 --- a/tests/deal.II/memory_consumption_01.cc +++ b/tests/deal.II/memory_consumption_01.cc @@ -199,7 +199,7 @@ void Step6::assemble_system () FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const Coefficient coefficient; std::vector coefficient_values (n_q_points); @@ -246,7 +246,7 @@ void Step6::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/deal.II/point_value_history_02.cc b/tests/deal.II/point_value_history_02.cc index 272c171298..e833c75cbb 100644 --- a/tests/deal.II/point_value_history_02.cc +++ b/tests/deal.II/point_value_history_02.cc @@ -216,7 +216,7 @@ void TestPointValueHistory::run() Quadrature quadrature_formula(finite_element.get_unit_support_points ()); FEValues fe_values(finite_element, quadrature_formula, update_values | update_quadrature_points); // just need local_dof_indices and quadrature_points - std::vector local_dof_indices(finite_element.dofs_per_cell); + std::vector local_dof_indices(finite_element.dofs_per_cell); std::vector > dof_locations(finite_element.dofs_per_cell); typename DoFHandler::active_cell_iterator cell, endc; diff --git a/tests/deal.II/point_value_history_03.cc b/tests/deal.II/point_value_history_03.cc index 040dcda29f..8f3b9a55c8 100644 --- a/tests/deal.II/point_value_history_03.cc +++ b/tests/deal.II/point_value_history_03.cc @@ -185,7 +185,7 @@ void TestPointValueHistory::run() Quadrature quadrature_formula(finite_element.get_unit_support_points ()); FEValues fe_values(finite_element, quadrature_formula, update_values | update_quadrature_points); // just need local_dof_indices and quadrature_points - std::vector local_dof_indices(finite_element.dofs_per_cell); + std::vector local_dof_indices(finite_element.dofs_per_cell); std::vector > dof_locations(finite_element.dofs_per_cell); typename DoFHandler::active_cell_iterator cell, endc; diff --git a/tests/distributed_grids/count_dofs_per_block_01.cc b/tests/distributed_grids/count_dofs_per_block_01.cc index 03956767ee..ded8515509 100644 --- a/tests/distributed_grids/count_dofs_per_block_01.cc +++ b/tests/distributed_grids/count_dofs_per_block_01.cc @@ -84,7 +84,7 @@ void test() triangulation.execute_coarsening_and_refinement (); dof_handler.distribute_dofs (fe); - std::vector dofs_per_block (fe.n_components()); + std::vector dofs_per_block (fe.n_components()); DoFTools::count_dofs_per_block (dof_handler, dofs_per_block); Assert (std::accumulate (dofs_per_block.begin(), dofs_per_block.end(), 0U) diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc index 2b555470c3..777a8b65d6 100644 --- a/tests/fail/circular_01.cc +++ b/tests/fail/circular_01.cc @@ -252,7 +252,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); condense.stop(); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc index b14472954a..1f9bfb206d 100644 --- a/tests/fail/hp-step-14.cc +++ b/tests/fail/hp-step-14.cc @@ -459,7 +459,7 @@ namespace LaplaceSolver assemble_rhs (linear_system.rhs); linear_system.hanging_node_constraints.condense (linear_system.rhs); - std::map boundary_value_map; + std::map boundary_value_map; VectorTools::interpolate_boundary_values (dof_handler, 0, *boundary_values, diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc index d980e29acd..3421110113 100644 --- a/tests/fail/hp-step-15.cc +++ b/tests/fail/hp-step-15.cc @@ -267,7 +267,7 @@ void MinimizationProblem::assemble_step () hanging_node_constraints.condense (matrix); hanging_node_constraints.condense (residual); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc index 51ace17b4f..3594d76bb5 100644 --- a/tests/fe/abf_01.cc +++ b/tests/fe/abf_01.cc @@ -163,7 +163,7 @@ void create_mass_matrix (const Mapping &mapping, std::vector > coefficient_vector_values (n_q_points, Vector (n_components)); - std::vector dof_indices (dofs_per_cell); + std::vector dof_indices (dofs_per_cell); std::vector > rhs_values(n_q_points, Vector(n_components)); @@ -436,7 +436,7 @@ void project (const Mapping &mapping, const FiniteElement &fe = dof.get_fe(); // make up boundary values - std::map boundary_values; + std::map boundary_values; if (enforce_zero_boundary == true) // no need to project boundary @@ -467,7 +467,7 @@ void project (const Mapping &mapping, // one line or one vertex typename DoFHandler::active_cell_iterator cell = dof.begin_active(), endc = dof.end(); - std::vector face_dof_indices (fe.dofs_per_face); + std::vector face_dof_indices (fe.dofs_per_face); for (; cell!=endc; ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->face(f)->at_boundary()) diff --git a/tests/fe/deformed_projection.h b/tests/fe/deformed_projection.h index 5259b26a73..846d7bdfd6 100644 --- a/tests/fe/deformed_projection.h +++ b/tests/fe/deformed_projection.h @@ -213,7 +213,7 @@ void create_mass_matrix (const Mapping &mapping, std::vector > coefficient_vector_values (n_q_points, Vector (n_components)); - std::vector dof_indices (dofs_per_cell); + std::vector dof_indices (dofs_per_cell); std::vector > rhs_values(n_q_points, Vector(n_components)); @@ -286,7 +286,7 @@ void create_mass_matrix (const Mapping &mapping, // between two faces. std::vector sign_change (dofs_per_cell, 1.0); const unsigned int dofs_per_face = fe.dofs_per_face; - std::vector face_dof_indices (dofs_per_face); + std::vector face_dof_indices (dofs_per_face); for (unsigned int f = 0; f < 2; ++f) { @@ -398,7 +398,7 @@ void create_right_hand_side (const Mapping &mapping, n_q_points = fe_values.n_quadrature_points, n_components = fe.n_components(); - std::vector dofs (dofs_per_cell); + std::vector dofs (dofs_per_cell); Vector cell_vector (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), @@ -483,7 +483,7 @@ void project (const Mapping &mapping, const FiniteElement &fe = dof.get_fe(); // make up boundary values - std::map boundary_values; + std::map boundary_values; if (enforce_zero_boundary == true) // no need to project boundary @@ -514,7 +514,7 @@ void project (const Mapping &mapping, // one line or one vertex typename DoFHandler::active_cell_iterator cell = dof.begin_active(), endc = dof.end(); - std::vector face_dof_indices (fe.dofs_per_face); + std::vector face_dof_indices (fe.dofs_per_face); for (; cell!=endc; ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) if (cell->face(f)->at_boundary()) @@ -647,7 +647,7 @@ void plot_shapes (DoFHandler<2> &dof_handler) // Create set of all DoFs, which are on the boundary. DoFHandler<2>::active_cell_iterator cell = dof_handler.begin_active(), endc = dof_handler.end(); - std::vector face_dof_indices (dof_handler.get_fe().dofs_per_face); + std::vector face_dof_indices (dof_handler.get_fe().dofs_per_face); for (; cell!=endc; ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) { diff --git a/tests/fe/fe_q_dg0.cc b/tests/fe/fe_q_dg0.cc index 76adec4a9c..17156aaeff 100644 --- a/tests/fe/fe_q_dg0.cc +++ b/tests/fe/fe_q_dg0.cc @@ -433,7 +433,7 @@ namespace Step22 typename DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), endc = dof_handler.end(); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); cell->get_dof_indices(local_dof_indices); unsigned int first_disc_dof=local_dof_indices[dofs_per_cell-1]; @@ -518,7 +518,7 @@ namespace Step22 FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); Vector local_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const RightHandSide right_hand_side; std::vector > rhs_values (n_q_points, @@ -889,7 +889,7 @@ namespace Step22 cell = dof_handler.begin_active(), endc = dof_handler.end(); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); for (; cell!=endc; ++cell) { fe_v.reinit(cell); diff --git a/tests/hp/compare_hp_vs_nonhp_01.cc b/tests/hp/compare_hp_vs_nonhp_01.cc index 8cd46bc85d..64172db00d 100644 --- a/tests/hp/compare_hp_vs_nonhp_01.cc +++ b/tests/hp/compare_hp_vs_nonhp_01.cc @@ -185,7 +185,7 @@ namespace with_hp } - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, exact_solution, @@ -334,7 +334,7 @@ namespace without_hp } - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, exact_solution, diff --git a/tests/hp/count_dofs_per_block_01.cc b/tests/hp/count_dofs_per_block_01.cc index a921f8e04f..4e84707b35 100644 --- a/tests/hp/count_dofs_per_block_01.cc +++ b/tests/hp/count_dofs_per_block_01.cc @@ -40,7 +40,7 @@ std::string output_file_name = "count_dofs_per_block_01/output"; -void print (const std::vector &v) +void print (const std::vector &v) { deallog << v.size(); for (unsigned int i=0; i dpc(dim+1); + std::vector dpc(dim+1); DoFTools::count_dofs_per_component (dof_handler, dpc); print (dpc); } { - std::vector dpc(dim+1); + std::vector dpc(dim+1); DoFTools::count_dofs_per_block (dof_handler, dpc); print (dpc); } @@ -101,7 +101,7 @@ check () { std::vector group(dim+1, 0); group[dim] = 1; - std::vector dpc(2); + std::vector dpc(2); DoFTools::count_dofs_per_component (dof_handler, dpc, false, group); Assert (dpc.size() == 2, ExcInternalError()); print (dpc); @@ -110,7 +110,7 @@ check () { std::vector group(dim+1, 0); group[dim] = 1; - std::vector dpc(2); + std::vector dpc(2); DoFTools::count_dofs_per_block (dof_handler, dpc, group); Assert (dpc.size() == 2, ExcInternalError()); print (dpc); @@ -121,7 +121,7 @@ check () { std::vector group(dim+1, 2*dim); group[dim] = 0; - std::vector dpc(2*dim+1); + std::vector dpc(2*dim+1); DoFTools::count_dofs_per_component (dof_handler, dpc, false, group); Assert (dpc.size() == 2*dim+1, ExcInternalError()); print (dpc); @@ -130,7 +130,7 @@ check () { std::vector group(dim+1, 2*dim); group[dim] = 0; - std::vector dpc(2*dim+1); + std::vector dpc(2*dim+1); DoFTools::count_dofs_per_block (dof_handler, dpc, group); Assert (dpc.size() == 2*dim+1, ExcInternalError()); print (dpc); diff --git a/tests/hp/count_dofs_per_block_02.cc b/tests/hp/count_dofs_per_block_02.cc index 9a2bb0d3e9..be9ebed74a 100644 --- a/tests/hp/count_dofs_per_block_02.cc +++ b/tests/hp/count_dofs_per_block_02.cc @@ -40,7 +40,7 @@ std::string output_file_name = "count_dofs_per_block_02/output"; -void print (const std::vector &v) +void print (const std::vector &v) { deallog << v.size(); for (unsigned int i=0; i dpc(dim+1); + std::vector dpc(dim+1); DoFTools::count_dofs_per_component (dof_handler, dpc); print (dpc); } { - std::vector dpc(dim+1); + std::vector dpc(dim+1); DoFTools::count_dofs_per_block (dof_handler, dpc); print (dpc); } @@ -101,7 +101,7 @@ check () { std::vector group(dim+1, 0); group[dim] = 1; - std::vector dpc(2); + std::vector dpc(2); DoFTools::count_dofs_per_component (dof_handler, dpc, false, group); Assert (dpc.size() == 2, ExcInternalError()); print (dpc); @@ -110,7 +110,7 @@ check () { std::vector group(dim+1, 0); group[dim] = 1; - std::vector dpc(2); + std::vector dpc(2); DoFTools::count_dofs_per_block (dof_handler, dpc, group); Assert (dpc.size() == 2, ExcInternalError()); print (dpc); @@ -121,7 +121,7 @@ check () { std::vector group(dim+1, 2*dim); group[dim] = 0; - std::vector dpc(2*dim+1); + std::vector dpc(2*dim+1); DoFTools::count_dofs_per_component (dof_handler, dpc, false, group); Assert (dpc.size() == 2*dim+1, ExcInternalError()); print (dpc); @@ -130,7 +130,7 @@ check () { std::vector group(dim+1, 2*dim); group[dim] = 0; - std::vector dpc(2*dim+1); + std::vector dpc(2*dim+1); DoFTools::count_dofs_per_block (dof_handler, dpc, group); Assert (dpc.size() == 2*dim+1, ExcInternalError()); print (dpc); diff --git a/tests/hp/crash_07.cc b/tests/hp/crash_07.cc index 897eea8e9b..88a24a54b7 100644 --- a/tests/hp/crash_07.cc +++ b/tests/hp/crash_07.cc @@ -120,7 +120,7 @@ int main () deallog << " active_fe_index=" << cell->active_fe_index() << std::endl; deallog << " dofs="; - std::vector local_dofs (fe[cell->active_fe_index()].dofs_per_cell); + std::vector local_dofs (fe[cell->active_fe_index()].dofs_per_cell); cell->get_dof_indices (local_dofs); for (unsigned int i=0; iactive_fe_index()].dofs_per_cell; ++i) deallog << local_dofs[i] << ' '; diff --git a/tests/hp/crash_09.cc b/tests/hp/crash_09.cc index ff1889bb7d..b7c77602d6 100644 --- a/tests/hp/crash_09.cc +++ b/tests/hp/crash_09.cc @@ -125,7 +125,7 @@ int main () for (unsigned int i=0; i<3; ++i) { deallog << "DoF indices for fe_index=" << i << ": "; - std::vector line_dofs (fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex); + std::vector line_dofs (fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex); cell->line(l)->get_dof_indices (line_dofs, i); for (unsigned int j=0; j line_dofs (fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex); + std::vector line_dofs (fe[i].dofs_per_line + 2*fe[i].dofs_per_vertex); cell->line(l)->get_dof_indices (line_dofs, i); for (unsigned int j=0; j face_dof_indices; - std::vector neighbor_face_dof_indices; + std::vector face_dof_indices; + std::vector neighbor_face_dof_indices; for (typename hp::DoFHandler::active_cell_iterator cell=dof_handler.begin_active(); cell!=dof_handler.end(); ++cell) diff --git a/tests/hp/crash_15.cc b/tests/hp/crash_15.cc index a1c55098f2..533a3b60f2 100644 --- a/tests/hp/crash_15.cc +++ b/tests/hp/crash_15.cc @@ -65,9 +65,9 @@ void test () dof_handler.distribute_dofs(fe_collection); - std::vector line_dof_indices_1 (fe_collection[0].dofs_per_line + + std::vector line_dof_indices_1 (fe_collection[0].dofs_per_line + 2 * fe_collection[0].dofs_per_vertex); - std::vector line_dof_indices_2 (fe_collection[0].dofs_per_line + + std::vector line_dof_indices_2 (fe_collection[0].dofs_per_line + 2 * fe_collection[0].dofs_per_vertex); for (typename hp::DoFHandler::active_cell_iterator diff --git a/tests/hp/crash_17.cc b/tests/hp/crash_17.cc index faf3c521f4..a44d8802eb 100644 --- a/tests/hp/crash_17.cc +++ b/tests/hp/crash_17.cc @@ -252,7 +252,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); condense.stop(); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/hp/crash_17_compressed_set_sparsity.cc b/tests/hp/crash_17_compressed_set_sparsity.cc index 8e67bcdf6f..efcc553983 100644 --- a/tests/hp/crash_17_compressed_set_sparsity.cc +++ b/tests/hp/crash_17_compressed_set_sparsity.cc @@ -254,7 +254,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); condense.stop(); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/hp/crash_18.cc b/tests/hp/crash_18.cc index 1cc41934ea..9feee0968e 100644 --- a/tests/hp/crash_18.cc +++ b/tests/hp/crash_18.cc @@ -257,7 +257,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); condense.stop(); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/hp/crash_18_compressed_set_sparsity.cc b/tests/hp/crash_18_compressed_set_sparsity.cc index 34dd18c58f..bdb1a0d556 100644 --- a/tests/hp/crash_18_compressed_set_sparsity.cc +++ b/tests/hp/crash_18_compressed_set_sparsity.cc @@ -260,7 +260,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); condense.stop(); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/hp/crash_19.cc b/tests/hp/crash_19.cc index 36af88503d..d6add85e3d 100644 --- a/tests/hp/crash_19.cc +++ b/tests/hp/crash_19.cc @@ -89,7 +89,7 @@ void test () << std::endl; ExactSolution exact_solution; - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, exact_solution, diff --git a/tests/hp/fe_nothing_07.cc b/tests/hp/fe_nothing_07.cc index c20ef92635..8d79e1dcf0 100644 --- a/tests/hp/fe_nothing_07.cc +++ b/tests/hp/fe_nothing_07.cc @@ -164,7 +164,7 @@ void test () { deallog << cell << ' ' << cell->active_fe_index() << std::endl << " "; - std::vector local_dof_indices (cell->get_fe().dofs_per_cell); + std::vector local_dof_indices (cell->get_fe().dofs_per_cell); cell->get_dof_indices (local_dof_indices); for (unsigned int i=0; iget_fe().dofs_per_cell; ++i) diff --git a/tests/hp/fe_nothing_12.cc b/tests/hp/fe_nothing_12.cc index 5868f6f9e6..8aa8c34ad9 100644 --- a/tests/hp/fe_nothing_12.cc +++ b/tests/hp/fe_nothing_12.cc @@ -96,7 +96,7 @@ void test () { deallog << cell << ' ' << cell->active_fe_index() << std::endl << " "; - std::vector local_dof_indices (cell->get_fe().dofs_per_cell); + std::vector local_dof_indices (cell->get_fe().dofs_per_cell); cell->get_dof_indices (local_dof_indices); for (unsigned int i=0; iget_fe().dofs_per_cell; ++i) diff --git a/tests/hp/fe_nothing_13.cc b/tests/hp/fe_nothing_13.cc index d5247edcd8..27ef93a9f7 100644 --- a/tests/hp/fe_nothing_13.cc +++ b/tests/hp/fe_nothing_13.cc @@ -99,7 +99,7 @@ void test () { deallog << cell << ' ' << cell->active_fe_index() << std::endl << " "; - std::vector local_dof_indices (cell->get_fe().dofs_per_cell); + std::vector local_dof_indices (cell->get_fe().dofs_per_cell); cell->get_dof_indices (local_dof_indices); for (unsigned int i=0; iget_fe().dofs_per_cell; ++i) diff --git a/tests/hp/fe_nothing_14.cc b/tests/hp/fe_nothing_14.cc index f5890e6702..05bb61ac29 100644 --- a/tests/hp/fe_nothing_14.cc +++ b/tests/hp/fe_nothing_14.cc @@ -112,7 +112,7 @@ void test () { deallog << cell << ' ' << cell->active_fe_index() << std::endl << " "; - std::vector local_dof_indices (cell->get_fe().dofs_per_cell); + std::vector local_dof_indices (cell->get_fe().dofs_per_cell); cell->get_dof_indices (local_dof_indices); for (unsigned int i=0; iget_fe().dofs_per_cell; ++i) diff --git a/tests/hp/renumber_block_wise_01b.cc b/tests/hp/renumber_block_wise_01b.cc index b4e278c411..2614a990d0 100644 --- a/tests/hp/renumber_block_wise_01b.cc +++ b/tests/hp/renumber_block_wise_01b.cc @@ -68,7 +68,7 @@ check () dof.distribute_dofs(fe_collection); std::vector touched(dof.n_dofs(), false); - std::vector local_dof_indices; + std::vector local_dof_indices; for (typename hp::DoFHandler::active_cell_iterator cell=dof.begin_active(); cell != dof.end(); ++cell) { diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc index 88a992d8d9..792283ed04 100644 --- a/tests/hp/step-13.cc +++ b/tests/hp/step-13.cc @@ -373,7 +373,7 @@ namespace LaplaceSolver assemble_rhs (linear_system.rhs); linear_system.hanging_node_constraints.condense (linear_system.rhs); - std::map boundary_value_map; + std::map boundary_value_map; VectorTools::interpolate_boundary_values (dof_handler, 0, *boundary_values, diff --git a/tests/hp/step-3.cc b/tests/hp/step-3.cc index 74ecfd0b55..5b007f1685 100644 --- a/tests/hp/step-3.cc +++ b/tests/hp/step-3.cc @@ -165,7 +165,7 @@ void LaplaceProblem::assemble_system () } - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction<2>(), diff --git a/tests/hp/step-3a.cc b/tests/hp/step-3a.cc index cf1f98bf4f..6532629e8b 100644 --- a/tests/hp/step-3a.cc +++ b/tests/hp/step-3a.cc @@ -205,7 +205,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction<2>(), diff --git a/tests/hp/step-3b.cc b/tests/hp/step-3b.cc index 45fcdf156e..6db87c1293 100644 --- a/tests/hp/step-3b.cc +++ b/tests/hp/step-3b.cc @@ -202,7 +202,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction<2>(), diff --git a/tests/hp/step-3c.cc b/tests/hp/step-3c.cc index ecb41f18ca..96e399ba09 100644 --- a/tests/hp/step-3c.cc +++ b/tests/hp/step-3c.cc @@ -204,7 +204,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction<2>(), diff --git a/tests/hp/step-4.cc b/tests/hp/step-4.cc index 05602407f4..532bc2d4c1 100644 --- a/tests/hp/step-4.cc +++ b/tests/hp/step-4.cc @@ -221,7 +221,7 @@ void LaplaceProblem::assemble_system () } - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, BoundaryValues(), diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc index 0b5b5b2d9b..8b2d291796 100644 --- a/tests/hp/step-5.cc +++ b/tests/hp/step-5.cc @@ -224,7 +224,7 @@ void LaplaceProblem::assemble_system () } } - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index 2d61cfb488..6fe5644e29 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -251,7 +251,7 @@ void LaplaceProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(), diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc index 91c0575cce..cb053c49ab 100644 --- a/tests/hp/step-7.cc +++ b/tests/hp/step-7.cc @@ -355,7 +355,7 @@ void HelmholtzProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, Solution(), diff --git a/tests/hp/step-8.cc b/tests/hp/step-8.cc index 93e97abf34..02d6704c79 100644 --- a/tests/hp/step-8.cc +++ b/tests/hp/step-8.cc @@ -299,7 +299,7 @@ void ElasticProblem::assemble_system () hanging_node_constraints.condense (system_matrix); hanging_node_constraints.condense (system_rhs); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(dim), diff --git a/tests/integrators/divergence_01.cc b/tests/integrators/divergence_01.cc index fe07a8235f..c083bb3941 100644 --- a/tests/integrators/divergence_01.cc +++ b/tests/integrators/divergence_01.cc @@ -49,7 +49,7 @@ void test_cell(const FEValuesBase& fev, const FEValuesBase& fes) std::vector > > ugrad(dim,std::vector >(fev.n_quadrature_points)); - std::vector indices(nv); + std::vector indices(nv); for (unsigned int i=0;i& fev, const FEValuesBase& fes) std::vector > uval (dim,std::vector(fev.n_quadrature_points)); - std::vector indices(nv); + std::vector indices(nv); for (unsigned int i=0;i& fev) std::vector > > ugrad(dim,std::vector >(fev.n_quadrature_points)); - std::vector indices(n); + std::vector indices(n); for (unsigned int i=0;i& fev) std::vector > > ugrad (d,std::vector >(fev.n_quadrature_points)); - std::vector indices(n); + std::vector indices(n); for (unsigned int i=0;i& fev1, u1grad(d,std::vector >(fev1.n_quadrature_points)), u2grad(d,std::vector >(fev2.n_quadrature_points)); - std::vector indices1(n1), indices2(n2); + std::vector indices1(n1), indices2(n2); for (unsigned int i=0;i& fev) std::vector > > ugrad(d,std::vector >(fev.n_quadrature_points)); - std::vector indices(n); + std::vector indices(n); for (unsigned int i=0;i& fev) std::vector > > ugrad (d,std::vector >(fev.n_quadrature_points)); - std::vector indices(n); + std::vector indices(n); for (unsigned int i=0;i& fev1, u1grad(d,std::vector >(fev1.n_quadrature_points)), u2grad(d,std::vector >(fev2.n_quadrature_points)); - std::vector indices1(n1), indices2(n2); + std::vector indices1(n1), indices2(n2); for (unsigned int i=0;i v(4); + std::vector v(4); for (unsigned int i=0;i src; - std::vector src_sizes (2); + std::vector src_sizes (2); src_sizes[0] = 10; src_sizes[1] = 19; src.reinit (src_sizes); BlockVector dst; - std::vector dst_sizes (3); + std::vector dst_sizes (3); dst_sizes[0] = 2; dst_sizes[1] = 7; dst_sizes[2] = 10; diff --git a/tests/lac/block_sparsity_pattern_01.cc b/tests/lac/block_sparsity_pattern_01.cc index f7e0d4b107..abbe4294e7 100644 --- a/tests/lac/block_sparsity_pattern_01.cc +++ b/tests/lac/block_sparsity_pattern_01.cc @@ -32,21 +32,21 @@ int main() deallog.threshold_double(1.e-10); BlockSparsityPattern sparsity; - std::vector row_blocks(4); + std::vector row_blocks(4); row_blocks[0] = 4; row_blocks[1] = 5; row_blocks[2] = 1; row_blocks[3] = 4; - std::vector col_blocks(3); + std::vector col_blocks(3); col_blocks[0] = 2; col_blocks[1] = 3; col_blocks[2] = 2; BlockIndices rows(row_blocks); BlockIndices cols(col_blocks); - std::vector > + std::vector > row_length(cols.size(), - std::vector(rows.total_size())); + std::vector(rows.total_size())); for (unsigned int jb=0;jb row_blocks(4); + std::vector row_blocks(4); row_blocks[0] = 4; row_blocks[1] = 5; row_blocks[2] = 1; row_blocks[3] = 4; - std::vector col_blocks(3); + std::vector col_blocks(3); col_blocks[0] = 2; col_blocks[1] = 3; col_blocks[2] = 2; diff --git a/tests/lac/block_vector.cc b/tests/lac/block_vector.cc index 97de1ab200..36fafae3b7 100644 --- a/tests/lac/block_vector.cc +++ b/tests/lac/block_vector.cc @@ -26,13 +26,13 @@ void test () { deallog.push("BlockIndices"); - std::vector ivector(4); + std::vector ivector(4); ivector[0] = 3; ivector[1] = 0; ivector[2] = 1; ivector[3] = 2; - const std::vector vector_indices(ivector); + const std::vector vector_indices(ivector); BlockIndices i1(ivector); BlockIndices i2 = i1; diff --git a/tests/lac/block_vector_copy.cc b/tests/lac/block_vector_copy.cc index 070b34017e..aec89aa13e 100644 --- a/tests/lac/block_vector_copy.cc +++ b/tests/lac/block_vector_copy.cc @@ -27,7 +27,7 @@ void test () for (unsigned int i = 0; i < v.size(); ++i) v[i] = double(i+1); - std::vector partition(3); + std::vector partition(3); for (unsigned int i = 0; i < partition.size(); ++i) partition[i] = 3; diff --git a/tests/lac/block_vector_iterator.cc b/tests/lac/block_vector_iterator.cc index 18b8cba2c5..cbc68dab03 100644 --- a/tests/lac/block_vector_iterator.cc +++ b/tests/lac/block_vector_iterator.cc @@ -38,7 +38,7 @@ bool operator == (const BlockVector &v1, void test () { - std::vector ivector(4); + std::vector ivector(4); ivector[0] = 2; ivector[1] = 4; ivector[2] = 3; diff --git a/tests/lac/block_vector_vector_assign.cc b/tests/lac/block_vector_vector_assign.cc index 6865ffcbed..3ddbdc3594 100644 --- a/tests/lac/block_vector_vector_assign.cc +++ b/tests/lac/block_vector_vector_assign.cc @@ -39,7 +39,7 @@ bool operator == (const Vector1 &v1, void test () { - std::vector ivector(4); + std::vector ivector(4); ivector[0] = 2; ivector[1] = 4; ivector[2] = 3; diff --git a/tests/lac/complex_block_vector.cc b/tests/lac/complex_block_vector.cc index 2862227d75..a95c8c89fd 100644 --- a/tests/lac/complex_block_vector.cc +++ b/tests/lac/complex_block_vector.cc @@ -26,13 +26,13 @@ void test () { deallog.push("BlockIndices"); - std::vector ivector(4); + std::vector ivector(4); ivector[0] = 3; ivector[1] = 0; ivector[2] = 1; ivector[3] = 2; - const std::vector vector_indices(ivector); + const std::vector vector_indices(ivector); BlockIndices i1(ivector); BlockIndices i2 = i1; diff --git a/tests/lac/complex_block_vector_iterator.cc b/tests/lac/complex_block_vector_iterator.cc index 0de08c9aed..797df07e05 100644 --- a/tests/lac/complex_block_vector_iterator.cc +++ b/tests/lac/complex_block_vector_iterator.cc @@ -38,7 +38,7 @@ bool operator == (const BlockVector &v1, void test () { - std::vector ivector(4); + std::vector ivector(4); ivector[0] = 2; ivector[1] = 4; ivector[2] = 3; diff --git a/tests/lac/complex_block_vector_vector_assign.cc b/tests/lac/complex_block_vector_vector_assign.cc index 60f001734e..da74a7baf2 100644 --- a/tests/lac/complex_block_vector_vector_assign.cc +++ b/tests/lac/complex_block_vector_vector_assign.cc @@ -39,7 +39,7 @@ bool operator == (const Vector1 &v1, void test () { - std::vector ivector(4); + std::vector ivector(4); ivector[0] = 2; ivector[1] = 4; ivector[2] = 3; diff --git a/tests/matrix_free/matrix_vector_common.h b/tests/matrix_free/matrix_vector_common.h index f0518dc904..f1a2b719bd 100644 --- a/tests/matrix_free/matrix_vector_common.h +++ b/tests/matrix_free/matrix_vector_common.h @@ -170,7 +170,7 @@ void do_test (const DoFHandler &dof, const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof.begin_active(), diff --git a/tests/matrix_free/matrix_vector_curl.cc b/tests/matrix_free/matrix_vector_curl.cc index 6b0fcdd61f..a3def4f76d 100644 --- a/tests/matrix_free/matrix_vector_curl.cc +++ b/tests/matrix_free/matrix_vector_curl.cc @@ -185,7 +185,7 @@ void test () FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const FEValuesExtractors::Vector sc (0); diff --git a/tests/matrix_free/matrix_vector_div.cc b/tests/matrix_free/matrix_vector_div.cc index aeaa39bcb6..9db01fccc7 100644 --- a/tests/matrix_free/matrix_vector_div.cc +++ b/tests/matrix_free/matrix_vector_div.cc @@ -185,7 +185,7 @@ void test () FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const FEValuesExtractors::Vector sc (0); diff --git a/tests/matrix_free/matrix_vector_hp.cc b/tests/matrix_free/matrix_vector_hp.cc index fa7e807efa..f31aeebff0 100644 --- a/tests/matrix_free/matrix_vector_hp.cc +++ b/tests/matrix_free/matrix_vector_hp.cc @@ -168,7 +168,7 @@ void test () update_values | update_gradients | update_JxW_values); FullMatrix cell_matrix; - std::vector local_dof_indices; + std::vector local_dof_indices; typename hp::DoFHandler::active_cell_iterator cell = dof.begin_active(), diff --git a/tests/matrix_free/matrix_vector_mg.cc b/tests/matrix_free/matrix_vector_mg.cc index e4dbf08f17..93dff9ad8d 100644 --- a/tests/matrix_free/matrix_vector_mg.cc +++ b/tests/matrix_free/matrix_vector_mg.cc @@ -105,7 +105,7 @@ void test () const unsigned int n_quadrature_points = quad.size(); const unsigned int dofs_per_cell = fe.dofs_per_cell; FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof.begin_active(), diff --git a/tests/matrix_free/matrix_vector_stokes.cc b/tests/matrix_free/matrix_vector_stokes.cc index da14dd4149..e201bc83b7 100644 --- a/tests/matrix_free/matrix_vector_stokes.cc +++ b/tests/matrix_free/matrix_vector_stokes.cc @@ -205,7 +205,7 @@ void test () FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const FEValuesExtractors::Vector velocities (0); const FEValuesExtractors::Scalar pressure (dim); diff --git a/tests/matrix_free/matrix_vector_stokes_noflux.cc b/tests/matrix_free/matrix_vector_stokes_noflux.cc index 13b369fe3a..ae78558ab3 100644 --- a/tests/matrix_free/matrix_vector_stokes_noflux.cc +++ b/tests/matrix_free/matrix_vector_stokes_noflux.cc @@ -213,7 +213,7 @@ void test () FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const FEValuesExtractors::Vector velocities (0); const FEValuesExtractors::Scalar pressure (dim); diff --git a/tests/matrix_free/step-37.cc b/tests/matrix_free/step-37.cc index e3fbc8ba25..1c8a8298f7 100644 --- a/tests/matrix_free/step-37.cc +++ b/tests/matrix_free/step-37.cc @@ -463,7 +463,7 @@ namespace Step37 const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const Coefficient coefficient; std::vector coefficient_values (n_q_points); @@ -499,7 +499,7 @@ namespace Step37 const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); const Coefficient coefficient; std::vector coefficient_values (n_q_points); FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); diff --git a/tests/mpi/matrix_free_01.cc b/tests/mpi/matrix_free_01.cc index 79c00d5063..05931f575e 100644 --- a/tests/mpi/matrix_free_01.cc +++ b/tests/mpi/matrix_free_01.cc @@ -207,7 +207,7 @@ void test () const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof.begin_active(), diff --git a/tests/mpi/matrix_free_03.cc b/tests/mpi/matrix_free_03.cc index 4e549b746c..cfbc574168 100644 --- a/tests/mpi/matrix_free_03.cc +++ b/tests/mpi/matrix_free_03.cc @@ -208,7 +208,7 @@ void test () const unsigned int n_q_points = quadrature_formula.size(); FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof.begin_active(), diff --git a/tests/mpi/no_flux_constraints.cc b/tests/mpi/no_flux_constraints.cc index 1432e6d9c3..0475e44352 100644 --- a/tests/mpi/no_flux_constraints.cc +++ b/tests/mpi/no_flux_constraints.cc @@ -133,7 +133,7 @@ void test() vector.reinit (dofh.locally_owned_dofs(), MPI_COMM_WORLD); { const unsigned int dofs_per_cell = fe.dofs_per_cell; - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); Vector local_vector (dofs_per_cell); for (unsigned int i=0; i local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); Vector local_vector (dofs_per_cell); for (unsigned int i=0; i local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); Vector local_vector (dofs_per_cell); for (unsigned int i=0; i fe_values (fe, quadrature_formula, update_quadrature_points | update_JxW_values | update_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); Vector local_vector (dofs_per_cell); const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/mpi/renumber_z_order_02.cc b/tests/mpi/renumber_z_order_02.cc index 1cc055aeb6..e62052b852 100644 --- a/tests/mpi/renumber_z_order_02.cc +++ b/tests/mpi/renumber_z_order_02.cc @@ -88,7 +88,7 @@ void test() FEValues fe_values (fe, quadrature_formula, update_quadrature_points | update_JxW_values | update_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); Vector local_vector (dofs_per_cell); const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/mpi/step-40.cc b/tests/mpi/step-40.cc index 5bbf71aaaa..745fc51bff 100644 --- a/tests/mpi/step-40.cc +++ b/tests/mpi/step-40.cc @@ -184,7 +184,7 @@ namespace Step40 FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), diff --git a/tests/mpi/step-40_direct_solver.cc b/tests/mpi/step-40_direct_solver.cc index e0293e5b1e..0fda23bc85 100644 --- a/tests/mpi/step-40_direct_solver.cc +++ b/tests/mpi/step-40_direct_solver.cc @@ -184,7 +184,7 @@ namespace Step40 FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), diff --git a/tests/multigrid/boundary_01.cc b/tests/multigrid/boundary_01.cc index 1d08c819f5..ef529056a7 100644 --- a/tests/multigrid/boundary_01.cc +++ b/tests/multigrid/boundary_01.cc @@ -38,12 +38,12 @@ using namespace std; -void log_vector (const std::vector >& count) +void log_vector (const std::vector >& count) { for (unsigned int l=0;l::const_iterator c=count[l].begin(); + for (std::set::const_iterator c=count[l].begin(); c != count[l].end();++c) deallog << ' ' << *c; deallog << std::endl; @@ -66,7 +66,7 @@ void check_fe(FiniteElement& fe) MGDoFHandler mgdof(tr); mgdof.distribute_dofs(fe); - std::vector > boundary_indices(tr.n_levels()); + std::vector > boundary_indices(tr.n_levels()); MGTools::make_boundary_list(mgdof, fmap, boundary_indices); log_vector(boundary_indices); } diff --git a/tests/multigrid/count_01.cc b/tests/multigrid/count_01.cc index cbb01a9272..ac5a49e662 100644 --- a/tests/multigrid/count_01.cc +++ b/tests/multigrid/count_01.cc @@ -35,7 +35,7 @@ using namespace std; -void log_vector (const std::vector >& count) +void log_vector (const std::vector >& count) { for (unsigned int l=0;l& fe) MGDoFHandler mgdof(tr); mgdof.distribute_dofs(fe); - std::vector > count(tr.n_levels()); + std::vector > count(tr.n_levels()); MGTools::count_dofs_per_component(mgdof, count, false); log_vector(count); MGTools::count_dofs_per_component(mgdof, count, true); diff --git a/tests/multigrid/dof_01.cc b/tests/multigrid/dof_01.cc index 5353f1515a..c9f09cd31c 100644 --- a/tests/multigrid/dof_01.cc +++ b/tests/multigrid/dof_01.cc @@ -45,7 +45,7 @@ void dofs(const MGDoFHandler& dof) typename MGDoFHandler::cell_iterator cell; const typename MGDoFHandler::cell_iterator end = dof.end(); - std::vector indices; + std::vector indices; for (cell = dof.begin(); cell != end; ++cell) { diff --git a/tests/multigrid/dof_02.cc b/tests/multigrid/dof_02.cc index d81631f2e2..50e0a66312 100644 --- a/tests/multigrid/dof_02.cc +++ b/tests/multigrid/dof_02.cc @@ -45,7 +45,7 @@ void dofs(const MGDoFHandler& dof) typename MGDoFHandler::cell_iterator cell; const typename MGDoFHandler::cell_iterator end = dof.end(); - std::vector indices; + std::vector indices; for (cell = dof.begin(); cell != end; ++cell) { diff --git a/tests/multigrid/mg_output.cc b/tests/multigrid/mg_output.cc index 1aa5a40c10..d528848a56 100644 --- a/tests/multigrid/mg_output.cc +++ b/tests/multigrid/mg_output.cc @@ -99,7 +99,7 @@ void initialize (const MGDoFHandler &dof, { unsigned int counter=0; const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); for (typename MGDoFHandler::active_cell_iterator cell = dof.begin_active(); cell != dof.end(); ++cell) @@ -116,8 +116,8 @@ void initialize (const MGDoFHandler &dof, { const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; const unsigned int dofs_per_face = dof.get_fe().dofs_per_face; - std::vector dof_indices(dofs_per_cell); - std::vector face_indices(dofs_per_face); + std::vector dof_indices(dofs_per_cell); + std::vector face_indices(dofs_per_face); for(unsigned int l=0; l &dof, MGLevelObject > &u) { const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); for(unsigned int l=0; l &dof_1, const MGDoFHandler &dof_2, Vector diff; diff.reinit (u); const unsigned int dofs_per_cell = dof_1.get_fe().dofs_per_cell; - std::vector dof_indices_1(dofs_per_cell); - std::vector dof_indices_2(dofs_per_cell); + std::vector dof_indices_1(dofs_per_cell); + std::vector dof_indices_2(dofs_per_cell); for (typename MGDoFHandler::active_cell_iterator cell_1 = dof_1.begin_active(), cell_2 = dof_2.begin_active(); cell_1 != dof_1.end(); ++cell_1, ++cell_2) diff --git a/tests/multigrid/mg_renumbered_01.cc b/tests/multigrid/mg_renumbered_01.cc index e35e9cb19b..31eead6035 100644 --- a/tests/multigrid/mg_renumbered_01.cc +++ b/tests/multigrid/mg_renumbered_01.cc @@ -78,7 +78,7 @@ void initialize (const MGDoFHandler &dof, { unsigned int counter=0; const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); for (typename MGDoFHandler::active_cell_iterator cell = dof.begin_active(); cell != dof.end(); ++cell) @@ -113,8 +113,8 @@ void print_diff (const MGDoFHandler &dof_1, const MGDoFHandler &dof_2, Vector diff; diff.reinit (u); const unsigned int dofs_per_cell = dof_1.get_fe().dofs_per_cell; - std::vector dof_indices_1(dofs_per_cell); - std::vector dof_indices_2(dofs_per_cell); + std::vector dof_indices_1(dofs_per_cell); + std::vector dof_indices_2(dofs_per_cell); for (typename MGDoFHandler::active_cell_iterator cell_1 = dof_1.begin_active(), cell_2 = dof_2.begin_active(); cell_1 != dof_1.end(); ++cell_1, ++cell_2) diff --git a/tests/multigrid/mg_renumbered_02.cc b/tests/multigrid/mg_renumbered_02.cc index 971cda159b..8655bb729c 100644 --- a/tests/multigrid/mg_renumbered_02.cc +++ b/tests/multigrid/mg_renumbered_02.cc @@ -69,7 +69,7 @@ void initialize (const MGDoFHandler &dof, Vector &u) { const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); for (typename MGDoFHandler::active_cell_iterator cell = dof.begin_active(); cell != dof.end(); ++cell) @@ -90,7 +90,7 @@ void initialize (const MGDoFHandler &dof, { unsigned int counter=0; const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); typename MGDoFHandler::cell_iterator cell = dof.begin(0); cell->get_mg_dof_indices(dof_indices); @@ -179,7 +179,7 @@ class LaplaceProblem MGDoFHandler mg_dof_handler_renumbered; const unsigned int degree; - std::vector > + std::vector > boundary_indices_renumbered; }; @@ -273,7 +273,7 @@ void LaplaceProblem::test_boundary () u[l].reinit(mg_dof_handler_renumbered.n_dofs(l)); u[l] = 1.; - for(std::set::const_iterator i = boundary_indices_renumbered[l].begin(); + for(std::set::const_iterator i = boundary_indices_renumbered[l].begin(); i!=boundary_indices_renumbered[l].end(); ++i) { u[l](*i) = 0; diff --git a/tests/multigrid/mg_renumbered_03.cc b/tests/multigrid/mg_renumbered_03.cc index 59d001f614..1f9d489caf 100644 --- a/tests/multigrid/mg_renumbered_03.cc +++ b/tests/multigrid/mg_renumbered_03.cc @@ -69,7 +69,7 @@ void initialize (const MGDoFHandler &dof, Vector &u) { const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); for (typename MGDoFHandler::active_cell_iterator cell = dof.begin_active(); cell != dof.end(); ++cell) @@ -91,7 +91,7 @@ void initialize (const MGDoFHandler &dof, { unsigned int counter=0; const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); typename MGDoFHandler::cell_iterator cell = dof.begin(0); cell->get_mg_dof_indices(dof_indices); @@ -106,7 +106,7 @@ void diff (Vector &diff, const MGDoFHandler &dof, { diff.reinit (v); const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector mg_dof_indices(dofs_per_cell); + std::vector mg_dof_indices(dofs_per_cell); const unsigned int n_comp = dof.get_fe().n_components(); for (typename MGDoFHandler::cell_iterator cell= dof.begin(level); @@ -149,7 +149,7 @@ template void print(const MGDoFHandler &dof, std::vector > &interface_dofs) { const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); for(unsigned int l=0; l local_dof_indices (fe.dofs_per_cell); - std::vector mg_dof_indices (fe.dofs_per_cell); + std::vector mg_dof_indices (fe.dofs_per_cell); for (; cell!=endc; ++cell) { if (!cell->has_children()) diff --git a/tests/multigrid/renumbering_03.cc b/tests/multigrid/renumbering_03.cc index 3aff3d4cd5..ffef2e913c 100644 --- a/tests/multigrid/renumbering_03.cc +++ b/tests/multigrid/renumbering_03.cc @@ -56,8 +56,8 @@ void check() mg_dof_handler.distribute_dofs(fe); for (unsigned int level=0; level new_numbers(n_dofs); + const types::global_dof_index n_dofs=mg_dof_handler.n_dofs(level); + vector new_numbers(n_dofs); for (unsigned int i=0; i &dof, { unsigned int counter=0; const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); for (typename MGDoFHandler::active_cell_iterator cell = dof.begin_active(); cell != dof.end(); ++cell) @@ -115,7 +115,7 @@ void initialize (const MGDoFHandler &dof, { unsigned int counter=0; const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); typename MGDoFHandler::cell_iterator cell = dof.begin(0); cell->get_mg_dof_indices(dof_indices); @@ -128,7 +128,7 @@ void print (const MGDoFHandler &dof, MGLevelObject > &u) { const unsigned int dofs_per_cell = dof.get_fe().dofs_per_cell; - std::vector dof_indices(dofs_per_cell); + std::vector dof_indices(dofs_per_cell); for(unsigned int l=0; l &dof_1, const MGDoFHandler &dof_2, Vector diff; diff.reinit (u); const unsigned int dofs_per_cell = dof_1.get_fe().dofs_per_cell; - std::vector dof_indices_1(dofs_per_cell); - std::vector dof_indices_2(dofs_per_cell); + std::vector dof_indices_1(dofs_per_cell); + std::vector dof_indices_2(dofs_per_cell); for (typename MGDoFHandler::active_cell_iterator cell_1 = dof_1.begin_active(), cell_2 = dof_2.begin_active(); cell_1 != dof_1.end(); ++cell_1, ++cell_2) diff --git a/tests/multigrid/transfer_block.cc b/tests/multigrid/transfer_block.cc index 058df01d63..cd0f35f220 100644 --- a/tests/multigrid/transfer_block.cc +++ b/tests/multigrid/transfer_block.cc @@ -44,7 +44,7 @@ reinit_vector_by_blocks ( const dealii::MGDoFHandler &mg_dof, MGLevelObject > &v, const std::vector &sel, - std::vector >& ndofs) + std::vector >& ndofs) { std::vector selected=sel; // Compute the number of blocks needed @@ -55,9 +55,9 @@ reinit_vector_by_blocks ( if (ndofs.size() == 0) { - std::vector > + std::vector > new_dofs(mg_dof.get_tria().n_levels(), - std::vector(selected.size())); + std::vector(selected.size())); std::swap(ndofs, new_dofs); MGTools::count_dofs_per_block (mg_dof, ndofs); } @@ -97,13 +97,13 @@ void check_block(const FiniteElement& fe, DoFHandler& dof=mgdof; mgdof.distribute_dofs(fe); DoFRenumbering::component_wise(mgdof); - vector ndofs(fe.n_blocks()); + vector ndofs(fe.n_blocks()); DoFTools::count_dofs_per_block(mgdof, ndofs); for (unsigned int l=0;l > mg_ndofs(mgdof.get_tria().n_levels(), - std::vector(fe.n_blocks())); + std::vector > mg_ndofs(mgdof.get_tria().n_levels(), + std::vector(fe.n_blocks())); MGTools::count_dofs_per_block(mgdof, mg_ndofs); deallog << "Global dofs:"; diff --git a/tests/multigrid/transfer_block_select.cc b/tests/multigrid/transfer_block_select.cc index 733f91a6bd..6919064215 100644 --- a/tests/multigrid/transfer_block_select.cc +++ b/tests/multigrid/transfer_block_select.cc @@ -44,7 +44,7 @@ reinit_vector_by_blocks ( const dealii::MGDoFHandler &mg_dof, MGLevelObject > &v, const unsigned int selected_block, - std::vector >& ndofs) + std::vector >& ndofs) { const unsigned int n_blocks = mg_dof.get_fe().n_blocks(); Assert(selected_block < n_blocks, ExcIndexRange(selected_block, 0, n_blocks)); @@ -54,9 +54,9 @@ reinit_vector_by_blocks ( if (ndofs.size() == 0) { - std::vector > + std::vector > new_dofs(mg_dof.get_tria().n_levels(), - std::vector(selected.size())); + std::vector(selected.size())); std::swap(ndofs, new_dofs); MGTools::count_dofs_per_block (mg_dof, ndofs); } @@ -83,13 +83,13 @@ void check_select(const FiniteElement& fe, unsigned int selected) DoFHandler& dof=mgdof; mgdof.distribute_dofs(fe); DoFRenumbering::component_wise(mgdof); - vector ndofs(fe.n_blocks()); + vector ndofs(fe.n_blocks()); DoFTools::count_dofs_per_block(mgdof, ndofs); for (unsigned int l=0;l > mg_ndofs(mgdof.get_tria().n_levels(), - std::vector(fe.n_blocks())); + std::vector > mg_ndofs(mgdof.get_tria().n_levels(), + std::vector(fe.n_blocks())); MGTools::count_dofs_per_block(mgdof, mg_ndofs); deallog << "Global dofs:"; diff --git a/tests/multigrid/transfer_compare_01.cc b/tests/multigrid/transfer_compare_01.cc index efdfc78198..e70b350c8c 100644 --- a/tests/multigrid/transfer_compare_01.cc +++ b/tests/multigrid/transfer_compare_01.cc @@ -47,7 +47,7 @@ reinit_vector_by_blocks ( const dealii::MGDoFHandler &mg_dof, MGLevelObject > &v, const unsigned int selected_block, - std::vector >& ndofs) + std::vector >& ndofs) { const unsigned int n_blocks = mg_dof.get_fe().n_blocks(); Assert(selected_block < n_blocks, ExcIndexRange(selected_block, 0, n_blocks)); @@ -57,7 +57,7 @@ reinit_vector_by_blocks ( if (ndofs.size() == 0) { - std::vector > + std::vector > new_dofs(mg_dof.get_tria().n_levels(), std::vector(selected.size())); std::swap(ndofs, new_dofs); @@ -78,7 +78,7 @@ reinit_vector_by_blocks ( const dealii::MGDoFHandler &mg_dof, MGLevelObject > &v, const std::vector &sel, - std::vector >& ndofs) + std::vector >& ndofs) { std::vector selected=sel; // Compute the number of blocks needed @@ -89,9 +89,9 @@ reinit_vector_by_blocks ( if (ndofs.size() == 0) { - std::vector > + std::vector > new_dofs(mg_dof.get_tria().n_levels(), - std::vector(selected.size())); + std::vector(selected.size())); std::swap(ndofs, new_dofs); MGTools::count_dofs_per_block (mg_dof, ndofs); } @@ -143,10 +143,10 @@ void check_block(const FiniteElement& fe) } // Store sizes - vector ndofs(fe.n_blocks()); + vector ndofs(fe.n_blocks()); DoFTools::count_dofs_per_block(mgdof, ndofs); - std::vector > mg_ndofs(mgdof.get_tria().n_levels(), - std::vector(fe.n_blocks())); + std::vector > mg_ndofs(mgdof.get_tria().n_levels(), + std::vector(fe.n_blocks())); MGTools::count_dofs_per_block(mgdof, mg_ndofs); MGTransferPrebuilt > transfer; @@ -224,7 +224,7 @@ void check_block(const FiniteElement& fe) for (unsigned int i=0;i > cached_sizes; + std::vector > cached_sizes; MGLevelObject > v; MGLevelObject > wb; MGLevelObject > ws; diff --git a/tests/multigrid/transfer_select.cc b/tests/multigrid/transfer_select.cc index ad4bba7a32..ccbe746cf9 100644 --- a/tests/multigrid/transfer_select.cc +++ b/tests/multigrid/transfer_select.cc @@ -57,14 +57,14 @@ void check_select(const FiniteElement& fe, mgdof.distribute_dofs(fe); DoFRenumbering::component_wise(static_cast&>(mgdof), target_component); - vector ndofs(*std::max_element (target_component.begin(), + vector ndofs(*std::max_element (target_component.begin(), target_component.end()) + 1); DoFTools::count_dofs_per_component(dof, ndofs, true, target_component); for (unsigned int l=0;l > mg_ndofs(mgdof.get_tria().n_levels()); + std::vector > mg_ndofs(mgdof.get_tria().n_levels()); MGTools::count_dofs_per_component(mgdof, mg_ndofs, true, mg_target_component); deallog << "Global dofs:"; diff --git a/tests/umfpack/umfpack_04.cc b/tests/umfpack/umfpack_04.cc index 3e8b199682..8036c17705 100644 --- a/tests/umfpack/umfpack_04.cc +++ b/tests/umfpack/umfpack_04.cc @@ -157,7 +157,7 @@ void test () assemble_laplace(Bb, bb, dof_handler, fe); assemble_laplace(B, b, dof_handler, fe); - std::map boundary_values; + std::map boundary_values; VectorTools::interpolate_boundary_values (dof_handler, 0, ZeroFunction(size.size()), -- 2.39.5