From: Marc Fehling Date: Tue, 24 Nov 2020 20:05:08 +0000 (-0700) Subject: Remove template argument `DoFHandlerType` from tests. X-Git-Tag: v9.4.0-rc1~1329^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156127177790309f09d5270a099973a052ac423d;p=dealii.git Remove template argument `DoFHandlerType` from tests. --- diff --git a/tests/bits/fe_field_function_01.cc b/tests/bits/fe_field_function_01.cc index d0f7aa2a35..b4fe4b7025 100644 --- a/tests/bits/fe_field_function_01.cc +++ b/tests/bits/fe_field_function_01.cc @@ -64,7 +64,8 @@ test() VectorTools::interpolate(dh, ff, v1); deallog << "V norm: " << v1.l2_norm() << std::endl; - Functions::FEFieldFunction, Vector> fef(dh, v1); + Functions::FEFieldFunction> fef(dh, v1); + VectorTools::interpolate(dh, fef, v2); diff --git a/tests/bits/fe_field_function_01_vector.cc b/tests/bits/fe_field_function_01_vector.cc index cba17f1919..1dc6d17a75 100644 --- a/tests/bits/fe_field_function_01_vector.cc +++ b/tests/bits/fe_field_function_01_vector.cc @@ -81,7 +81,8 @@ test() VectorTools::interpolate(dh, F(), v1); deallog << "V norm: " << v1.l2_norm() << std::endl; - Functions::FEFieldFunction, Vector> fef(dh, v1); + Functions::FEFieldFunction> fef(dh, v1); + VectorTools::interpolate(dh, fef, v2); diff --git a/tests/bits/fe_field_function_02.cc b/tests/bits/fe_field_function_02.cc index 50dacd3db8..910b00cc7f 100644 --- a/tests/bits/fe_field_function_02.cc +++ b/tests/bits/fe_field_function_02.cc @@ -67,7 +67,8 @@ test() VectorTools::interpolate(dh, ff, v1); deallog << "V norm: " << v1.l2_norm() << std::endl; - Functions::FEFieldFunction, Vector> fef(dh, v1); + Functions::FEFieldFunction> fef(dh, v1); + // project the discrete function fef back // onto the finite element space. this diff --git a/tests/bits/fe_field_function_02_vector.cc b/tests/bits/fe_field_function_02_vector.cc index 88ceeafcc2..570d0aa4c8 100644 --- a/tests/bits/fe_field_function_02_vector.cc +++ b/tests/bits/fe_field_function_02_vector.cc @@ -85,7 +85,8 @@ test() VectorTools::interpolate(dh, ff, v1); deallog << "V norm: " << v1.l2_norm() << std::endl; - Functions::FEFieldFunction, Vector> fef(dh, v1); + Functions::FEFieldFunction> fef(dh, v1); + // project the discrete function fef back // onto the finite element space. this diff --git a/tests/bits/fe_field_function_03.cc b/tests/bits/fe_field_function_03.cc index 1e627dc543..3f7d8d03e5 100644 --- a/tests/bits/fe_field_function_03.cc +++ b/tests/bits/fe_field_function_03.cc @@ -55,7 +55,8 @@ test() VectorTools::interpolate(dh, ff, v1); deallog << "V norm: " << v1.l2_norm() << std::endl; - Functions::FEFieldFunction, Vector> fef(dh, v1); + Functions::FEFieldFunction> fef(dh, v1); + // create the origin Point p; diff --git a/tests/bits/step-3.cc b/tests/bits/step-3.cc index fe65a0227d..f97efce620 100644 --- a/tests/bits/step-3.cc +++ b/tests/bits/step-3.cc @@ -193,7 +193,7 @@ LaplaceProblem::solve() void LaplaceProblem::output_results() const { - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); data_out.build_patches(); diff --git a/tests/bits/step-4.cc b/tests/bits/step-4.cc index 7ce6c84950..75c8bb87ad 100644 --- a/tests/bits/step-4.cc +++ b/tests/bits/step-4.cc @@ -259,7 +259,7 @@ template void LaplaceProblem::output_results() const { - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/bits/step-5.cc b/tests/bits/step-5.cc index a4913ac97d..2c35f34669 100644 --- a/tests/bits/step-5.cc +++ b/tests/bits/step-5.cc @@ -271,7 +271,7 @@ LaplaceProblem::output_results(const unsigned int cycle) const if (cycle >= 2) return; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/bits/step-6-racoptimize-2.cc b/tests/bits/step-6-racoptimize-2.cc index 537eeff014..964ffc70f2 100644 --- a/tests/bits/step-6-racoptimize-2.cc +++ b/tests/bits/step-6-racoptimize-2.cc @@ -363,7 +363,7 @@ LaplaceProblem::run() DataOutBase::EpsFlags eps_flags; eps_flags.z_scaling = 4; - DataOut> data_out; + DataOut data_out; data_out.set_flags(eps_flags); data_out.attach_dof_handler(dof_handler); diff --git a/tests/bits/step-6-racoptimize.cc b/tests/bits/step-6-racoptimize.cc index 9e9f2d26a0..518f736284 100644 --- a/tests/bits/step-6-racoptimize.cc +++ b/tests/bits/step-6-racoptimize.cc @@ -362,7 +362,7 @@ LaplaceProblem::run() DataOutBase::EpsFlags eps_flags; eps_flags.z_scaling = 4; - DataOut> data_out; + DataOut data_out; data_out.set_flags(eps_flags); data_out.attach_dof_handler(dof_handler); diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc index 9e95d303a0..2199d0ca59 100644 --- a/tests/bits/step-6.cc +++ b/tests/bits/step-6.cc @@ -364,7 +364,7 @@ LaplaceProblem::run() DataOutBase::EpsFlags eps_flags; eps_flags.z_scaling = 4; - DataOut> data_out; + DataOut data_out; data_out.set_flags(eps_flags); data_out.attach_dof_handler(dof_handler); diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc index d8fd90074b..688bd565d6 100644 --- a/tests/bits/step-7.cc +++ b/tests/bits/step-7.cc @@ -544,7 +544,7 @@ HelmholtzProblem::run() gmv_filename += ".gmv"; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/bits/step-8.cc b/tests/bits/step-8.cc index e63e071438..b7df5b94b9 100644 --- a/tests/bits/step-8.cc +++ b/tests/bits/step-8.cc @@ -358,7 +358,7 @@ ElasticProblem::output_results(const unsigned int cycle) const filename += ".gmv"; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); diff --git a/tests/codim_one/bem.cc b/tests/codim_one/bem.cc index 8f64761897..f8415d8334 100644 --- a/tests/codim_one/bem.cc +++ b/tests/codim_one/bem.cc @@ -406,17 +406,15 @@ template void BEM::output_results() { - DataOut> dataout; + DataOut dataout; dataout.attach_dof_handler(dof_handler_q); dataout.add_data_vector(dof_handler_q, smooth_solution, "linear_potential"); - dataout.add_data_vector( - tangential_derivative, - "tangential_velocity", - DataOut>::type_cell_data); - dataout.add_data_vector( - error, - "error", - DataOut>::type_cell_data); + dataout.add_data_vector(tangential_derivative, + "tangential_velocity", + DataOut::type_cell_data); + dataout.add_data_vector(error, + "error", + DataOut::type_cell_data); dataout.build_patches(); dataout.write_vtk(deallog.get_file_stream()); } diff --git a/tests/codim_one/data_out.cc b/tests/codim_one/data_out.cc index 5838fbeafa..36c7a796ab 100644 --- a/tests/codim_one/data_out.cc +++ b/tests/codim_one/data_out.cc @@ -62,7 +62,7 @@ test(std::string filename) for (unsigned int i = 0; i < numbering.size(); ++i) numbering(i) = i; - DataOut> dataout; + DataOut dataout; dataout.add_data_vector(dof_handler, numbering, "numbering"); dataout.build_patches(); dataout.write_vtk(deallog.get_file_stream()); diff --git a/tests/codim_one/data_out_02.cc b/tests/codim_one/data_out_02.cc index 9cfcf6b8c6..6ac3fee40a 100644 --- a/tests/codim_one/data_out_02.cc +++ b/tests/codim_one/data_out_02.cc @@ -59,11 +59,12 @@ main() soln = 0; for (unsigned int i = 0; i < soln.size(); ++i) soln(i) = i; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); - data_out.add_data_vector( - soln, "scalar_data", DataOut>::type_dof_data); + data_out.add_data_vector(soln, + "scalar_data", + DataOut::type_dof_data); data_out.build_patches(); data_out.write_vtk(deallog.get_file_stream()); diff --git a/tests/codim_one/data_out_03.cc b/tests/codim_one/data_out_03.cc index ce10c131c9..df56028158 100644 --- a/tests/codim_one/data_out_03.cc +++ b/tests/codim_one/data_out_03.cc @@ -111,11 +111,11 @@ main() std::vector solution_names(3, "position"); - DataOut<2, DoFHandler<2, 3>> data_out; + DataOut<2, 3> data_out; data_out.attach_dof_handler(dh_test); data_out.add_data_vector(position, solution_names, - DataOut<2, DoFHandler<2, 3>>::type_dof_data, + DataOut<2, 3>::type_dof_data, data_component_interpretation); data_out.build_patches(mapping, 2); diff --git a/tests/codim_one/error_estimator_02.cc b/tests/codim_one/error_estimator_02.cc index 38ec4caa02..0a98a8b324 100644 --- a/tests/codim_one/error_estimator_02.cc +++ b/tests/codim_one/error_estimator_02.cc @@ -162,10 +162,11 @@ check() deallog << error(i) << std::endl; { - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof); - data_out.add_data_vector( - v, "solution", DataOut>::type_dof_data); + data_out.add_data_vector(v, + "solution", + DataOut::type_dof_data); data_out.add_data_vector(error, "error"); data_out.build_patches(); std::string filename = spacedim == 2 ? "solution-2d-" : "solution-3d-"; diff --git a/tests/codim_one/gradients.cc b/tests/codim_one/gradients.cc index 9967c6a521..6efb97a6af 100644 --- a/tests/codim_one/gradients.cc +++ b/tests/codim_one/gradients.cc @@ -175,7 +175,7 @@ test(std::string filename) } // write graphical output - DataOut> dataout; + DataOut dataout; dataout.attach_triangulation(triangulation); dataout.add_data_vector(projected_directional_derivative, "derivative"); dataout.build_patches(); diff --git a/tests/codim_one/interpolation_2.cc b/tests/codim_one/interpolation_2.cc index f2e82c1870..021ba2e19b 100644 --- a/tests/codim_one/interpolation_2.cc +++ b/tests/codim_one/interpolation_2.cc @@ -66,7 +66,7 @@ test(std::string filename) Functions::CosineFunction cosine; VectorTools::interpolate(dof_handler, cosine, interpolated_one); - DataOut> dataout; + DataOut dataout; dataout.add_data_vector(dof_handler, interpolated_one, "numbering"); dataout.build_patches(); dataout.write_vtk(deallog.get_file_stream()); diff --git a/tests/codim_one/interpolation_3.cc b/tests/codim_one/interpolation_3.cc index e2e958550f..909acf73c5 100644 --- a/tests/codim_one/interpolation_3.cc +++ b/tests/codim_one/interpolation_3.cc @@ -75,7 +75,7 @@ test(std::string filename) VectorTools::interpolate(dof_handler, func, interpolated_one); - DataOut> dataout; + DataOut dataout; dataout.attach_dof_handler(dof_handler); dataout.add_data_vector(interpolated_one, "test"); dataout.build_patches(); diff --git a/tests/codim_one/mapping_fe_field_01.cc b/tests/codim_one/mapping_fe_field_01.cc index 4ea25d82b7..7fc602d81e 100644 --- a/tests/codim_one/mapping_fe_field_01.cc +++ b/tests/codim_one/mapping_fe_field_01.cc @@ -84,18 +84,16 @@ test(const unsigned int refs, MappingFEField mapping(map_dh, euler_vec); ; - DataOut> data_out_scal; + DataOut data_out_scal; data_out_scal.attach_dof_handler(dof_handler); - data_out_scal.add_data_vector( - scal_sol, - "scalar_data", - DataOut>::type_dof_data); + data_out_scal.add_data_vector(scal_sol, + "scalar_data", + DataOut::type_dof_data); - data_out_scal.build_patches( - mapping, - subdivisions, - DataOut>::curved_inner_cells); + data_out_scal.build_patches(mapping, + subdivisions, + DataOut::curved_inner_cells); std::string filename_scal = ("scal_check_" + Utilities::int_to_string(id) + ".vtu"); @@ -108,18 +106,16 @@ test(const unsigned int refs, data_component_interpretation( spacedim, DataComponentInterpretation::component_is_part_of_vector); - DataOut> data_out_euler; + DataOut data_out_euler; data_out_euler.attach_dof_handler(map_dh); - data_out_euler.add_data_vector( - euler_vec, - "euler_vec", - DataOut>::type_dof_data, - data_component_interpretation); - data_out_euler.build_patches( - mapping, - degree, - DataOut>::curved_inner_cells); + data_out_euler.add_data_vector(euler_vec, + "euler_vec", + DataOut::type_dof_data, + data_component_interpretation); + data_out_euler.build_patches(mapping, + degree, + DataOut::curved_inner_cells); std::string filename_euler = ("euler_check_" + Utilities::int_to_string(id) + ".vtu"); diff --git a/tests/codim_one/projection.cc b/tests/codim_one/projection.cc index 8c7d354fa7..0d85e93a44 100644 --- a/tests/codim_one/projection.cc +++ b/tests/codim_one/projection.cc @@ -72,7 +72,7 @@ test(std::string filename, unsigned int n) constraints.close(); VectorTools::project(dof_handler, constraints, quad, cosine, projected_one); - DataOut> dataout; + DataOut dataout; dataout.add_data_vector(dof_handler, projected_one, "projection"); dataout.build_patches(); dataout.write_vtk(deallog.get_file_stream()); diff --git a/tests/codim_one/projection_dgp.cc b/tests/codim_one/projection_dgp.cc index 9d70d69f25..a0db1cf570 100644 --- a/tests/codim_one/projection_dgp.cc +++ b/tests/codim_one/projection_dgp.cc @@ -74,7 +74,7 @@ test(std::string filename, unsigned int n) VectorTools::project( dof_handler, constraints, quad, cosine, interpolated_one); - DataOut> dataout; + DataOut dataout; dataout.attach_dof_handler(dof_handler); dataout.add_data_vector(interpolated_one, "numbering"); dataout.build_patches(); diff --git a/tests/codim_one/solution_transfer_01.cc b/tests/codim_one/solution_transfer_01.cc index 1b94e3f3a7..171da1bb51 100644 --- a/tests/codim_one/solution_transfer_01.cc +++ b/tests/codim_one/solution_transfer_01.cc @@ -76,7 +76,7 @@ main() // Do some refinement boundary_mesh.begin_active()->set_refine_flag(); - SolutionTransfer, DoFHandler> soltrans(dh); + SolutionTransfer, spacedim> soltrans(dh); boundary_mesh.prepare_coarsening_and_refinement(); diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc index 1743d148ca..7a11d3f059 100644 --- a/tests/fail/circular_01.cc +++ b/tests/fail/circular_01.cc @@ -556,7 +556,7 @@ LaplaceProblem::output_results(const unsigned int cycle) const const std::string filename = "solution-" + Utilities::int_to_string(cycle, 2) + ".vtk"; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc index a6f854a06c..793512157e 100644 --- a/tests/fail/hp-step-14.cc +++ b/tests/fail/hp-step-14.cc @@ -439,6 +439,7 @@ namespace LaplaceSolver { using active_cell_iterator = typename DoFHandler::active_cell_iterator; + const unsigned int n_threads = MultithreadInfo::n_threads(); std::vector> thread_ranges = @@ -524,6 +525,7 @@ namespace LaplaceSolver template Solver::LinearSystem::LinearSystem(const DoFHandler &dof_handler) + { hanging_node_constraints.clear(); @@ -646,7 +648,7 @@ namespace LaplaceSolver void PrimalSolver::output_solution() const { - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(this->dof_handler); data_out.add_data_vector(this->solution, "solution"); data_out.build_patches(); @@ -1127,6 +1129,7 @@ namespace DualFunctional virtual void assemble_rhs(const DoFHandler &dof_handler, Vector &rhs) const; + DeclException1(ExcEvaluationPointNotFound, Point, << "The evaluation point " << arg1 @@ -1147,7 +1150,8 @@ namespace DualFunctional template void PointValueEvaluation::assemble_rhs(const DoFHandler &dof_handler, - Vector & rhs) const + + Vector &rhs) const { rhs.reinit(dof_handler.n_dofs()); @@ -1177,6 +1181,7 @@ namespace DualFunctional virtual void assemble_rhs(const DoFHandler &dof_handler, Vector &rhs) const; + DeclException1(ExcEvaluationPointNotFound, Point, << "The evaluation point " << arg1 @@ -1373,9 +1378,12 @@ namespace LaplaceSolver using active_cell_iterator = typename DoFHandler::active_cell_iterator; + using FaceIntegrals = typename std::map::face_iterator, double>; + + struct CellData { hp::FEValues fe_values; @@ -1597,7 +1605,7 @@ namespace LaplaceSolver primal_hanging_node_constraints, dual_solution); - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(primal_solver.dof_handler); data_out.add_data_vector(primal_solver.solution, "primal_solution"); @@ -1864,6 +1872,7 @@ namespace LaplaceSolver const typename DoFHandler::face_iterator face = cell->face(face_no); const typename DoFHandler::cell_iterator neighbor = + cell->neighbor(face_no); Assert(neighbor.state() == IteratorState::valid, ExcInternalError()); Assert(neighbor->has_children(), ExcInternalError()); diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc index 1488193eba..85cafd7796 100644 --- a/tests/fail/hp-step-15.cc +++ b/tests/fail/hp-step-15.cc @@ -121,6 +121,7 @@ private: energy(const DoFHandler &dof_handler, const Vector &function); + const unsigned int run_number; Triangulation triangulation; @@ -376,7 +377,7 @@ template void MinimizationProblem::output_results() const { - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(present_solution, "solution"); data_out.build_patches(); diff --git a/tests/fe/fe_enriched_07.cc b/tests/fe/fe_enriched_07.cc index 278d262b94..e7654731c0 100644 --- a/tests/fe/fe_enriched_07.cc +++ b/tests/fe/fe_enriched_07.cc @@ -163,7 +163,7 @@ test6(const bool do_href, shape_functions.push_back(shape_function); } - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); // get material ids: diff --git a/tests/fe/fe_enriched_08.cc b/tests/fe/fe_enriched_08.cc index 2f0d81466e..54ea6ac3a1 100644 --- a/tests/fe/fe_enriched_08.cc +++ b/tests/fe/fe_enriched_08.cc @@ -151,7 +151,7 @@ test2cells(const unsigned int p_feq = 2, const unsigned int p_feen = 1) shape_functions.push_back(shape_function); } - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); // get material ids: diff --git a/tests/fe/fe_enriched_color_05.cc b/tests/fe/fe_enriched_color_05.cc index b2473ab97a..a67986a5e6 100644 --- a/tests/fe/fe_enriched_color_05.cc +++ b/tests/fe/fe_enriched_color_05.cc @@ -129,7 +129,7 @@ plot_shape_function(DoFHandler &dof_handler, unsigned int patches = 5) shape_functions.push_back(shape_function); } - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); // get material ids: diff --git a/tests/fe/fe_enriched_color_07.cc b/tests/fe/fe_enriched_color_07.cc index 8356942c7d..b0c9605e92 100644 --- a/tests/fe/fe_enriched_color_07.cc +++ b/tests/fe/fe_enriched_color_07.cc @@ -1010,7 +1010,7 @@ plot_shape_function(DoFHandler &dof_handler, unsigned int patches = 5) std::cout << "...finished printing support points" << std::endl; } - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); // get material ids: @@ -1668,7 +1668,7 @@ LaplaceProblem::output_results(const unsigned int cycle) filename += ".vtk"; std::ofstream output(filename.c_str()); - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(localized_solution, "solution"); if (prm.exact_soln_expr != "") diff --git a/tests/fe/fe_enriched_color_08.cc b/tests/fe/fe_enriched_color_08.cc index 79006dda62..fd6a508706 100644 --- a/tests/fe/fe_enriched_color_08.cc +++ b/tests/fe/fe_enriched_color_08.cc @@ -141,7 +141,7 @@ plot_shape_function(DoFHandler &dof_handler, unsigned int patches = 5) deallog << "...finished printing support points" << std::endl; } - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); // get material ids: diff --git a/tests/fe/fe_enriched_step-36.cc b/tests/fe/fe_enriched_step-36.cc index d8918c9d34..ee8c1d4113 100644 --- a/tests/fe/fe_enriched_step-36.cc +++ b/tests/fe/fe_enriched_step-36.cc @@ -554,7 +554,7 @@ namespace Step36 filename += ".vtk"; std::ofstream output(filename.c_str()); - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(eigenfunctions_locally_relevant[0], "solution"); @@ -570,7 +570,7 @@ namespace Step36 filename += ".vtk"; std::ofstream output(filename.c_str()); - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(fe_index, "fe_index"); data_out.add_data_vector(estimated_error_per_cell, "estimated_error"); diff --git a/tests/fe/fe_enriched_step-36b.cc b/tests/fe/fe_enriched_step-36b.cc index cc386abea1..666da06700 100644 --- a/tests/fe/fe_enriched_step-36b.cc +++ b/tests/fe/fe_enriched_step-36b.cc @@ -817,7 +817,7 @@ namespace Step36 Postprocessor postprocessor( enrichment); // has to live until the DataOut object is destroyed; // objects are destroyed in reverse order of declaration - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(eigenfunctions_locally_relevant[0], "solution"); @@ -835,7 +835,7 @@ namespace Step36 filename += ".vtk"; std::ofstream output(filename.c_str()); - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(fe_index, "fe_index"); data_out.add_data_vector(estimated_error_per_cell, "estimated_error"); diff --git a/tests/grid/grid_tools_halo_layer_04.cc b/tests/grid/grid_tools_halo_layer_04.cc index 21430d5294..2a09a2f420 100644 --- a/tests/grid/grid_tools_halo_layer_04.cc +++ b/tests/grid/grid_tools_halo_layer_04.cc @@ -61,11 +61,12 @@ write_vtk(const DoFHandler &dof_handler, const std::string filename) 1, DataComponentInterpretation::component_is_scalar); const std::vector data_names(1, "active_fe_index"); - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(active_fe_index, + data_names, - DataOut>::type_cell_data, + DataOut::type_cell_data, data_component_interpretation); data_out.build_patches(); diff --git a/tests/grid/grid_tools_halo_layer_05.cc b/tests/grid/grid_tools_halo_layer_05.cc index a3e2ef1f99..afa554a35f 100644 --- a/tests/grid/grid_tools_halo_layer_05.cc +++ b/tests/grid/grid_tools_halo_layer_05.cc @@ -61,11 +61,12 @@ write_vtk(const DoFHandler &dof_handler, const std::string filename) 1, DataComponentInterpretation::component_is_scalar); const std::vector data_names(1, "active_fe_index"); - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(active_fe_index, + data_names, - DataOut>::type_cell_data, + DataOut::type_cell_data, data_component_interpretation); data_out.build_patches(); diff --git a/tests/hp/crash_17.cc b/tests/hp/crash_17.cc index 07a2fa4c23..b881966de6 100644 --- a/tests/hp/crash_17.cc +++ b/tests/hp/crash_17.cc @@ -553,7 +553,7 @@ LaplaceProblem::output_results(const unsigned int cycle) const const std::string filename = "solution-" + Utilities::int_to_string(cycle, 2) + ".vtk"; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/hp/crash_18.cc b/tests/hp/crash_18.cc index 8fed37e6b2..44c5e5dcec 100644 --- a/tests/hp/crash_18.cc +++ b/tests/hp/crash_18.cc @@ -561,7 +561,7 @@ LaplaceProblem::output_results(const unsigned int cycle) const const std::string filename = "solution-" + Utilities::int_to_string(cycle, 2) + ".vtk"; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/hp/do_function_derivatives_01.cc b/tests/hp/do_function_derivatives_01.cc index c2384639fd..0609024907 100644 --- a/tests/hp/do_function_derivatives_01.cc +++ b/tests/hp/do_function_derivatives_01.cc @@ -80,8 +80,7 @@ main() solution = 1.0; - SolutionTransfer<2, Vector, DoFHandler<2>> solultion_trans( - dof_handler); + SolutionTransfer<2, Vector> solultion_trans(dof_handler); solultion_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); @@ -95,6 +94,7 @@ main() q.push_back(QMidpoint<2>()); hp::FEValues<2> x_fe_values(fe_collection, q, update_gradients); for (DoFHandler<2>::active_cell_iterator cell = dof_handler.begin_active(); + cell != dof_handler.end(); ++cell) { diff --git a/tests/hp/do_function_hessians_01.cc b/tests/hp/do_function_hessians_01.cc index 18a55f6be2..d3f51f5bf5 100644 --- a/tests/hp/do_function_hessians_01.cc +++ b/tests/hp/do_function_hessians_01.cc @@ -80,8 +80,7 @@ main() solution = 1.0; - SolutionTransfer<2, Vector, DoFHandler<2>> solultion_trans( - dof_handler); + SolutionTransfer<2, Vector> solultion_trans(dof_handler); solultion_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); @@ -95,6 +94,7 @@ main() q.push_back(QMidpoint<2>()); hp::FEValues<2> x_fe_values(fe_collection, q, update_hessians); for (DoFHandler<2>::active_cell_iterator cell = dof_handler.begin_active(); + cell != dof_handler.end(); ++cell) { diff --git a/tests/hp/do_function_laplacians_01.cc b/tests/hp/do_function_laplacians_01.cc index e4511b25e9..50bd4c91a0 100644 --- a/tests/hp/do_function_laplacians_01.cc +++ b/tests/hp/do_function_laplacians_01.cc @@ -80,8 +80,7 @@ main() solution = 1.0; - SolutionTransfer<2, Vector, DoFHandler<2>> solultion_trans( - dof_handler); + SolutionTransfer<2, Vector> solultion_trans(dof_handler); solultion_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); @@ -95,6 +94,7 @@ main() q.push_back(QMidpoint<2>()); hp::FEValues<2> x_fe_values(fe_collection, q, update_hessians); for (DoFHandler<2>::active_cell_iterator cell = dof_handler.begin_active(); + cell != dof_handler.end(); ++cell) { diff --git a/tests/hp/hp_constraints_neither_dominate_01.cc b/tests/hp/hp_constraints_neither_dominate_01.cc index 64a24ab06b..b13dd1709b 100644 --- a/tests/hp/hp_constraints_neither_dominate_01.cc +++ b/tests/hp/hp_constraints_neither_dominate_01.cc @@ -145,7 +145,7 @@ test2cells(const unsigned int p1 = 2, const unsigned int p2 = 1) shape_functions.push_back(shape_function); } - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); // get material ids: diff --git a/tests/hp/hp_constraints_neither_dominate_02.cc b/tests/hp/hp_constraints_neither_dominate_02.cc index cc38b6d625..15536e1d2f 100644 --- a/tests/hp/hp_constraints_neither_dominate_02.cc +++ b/tests/hp/hp_constraints_neither_dominate_02.cc @@ -192,7 +192,7 @@ test2cells(const FiniteElement &fe_0, shape_functions.push_back(shape_function); } - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); // get material ids: diff --git a/tests/hp/hp_q_hierarchical_constraints.cc b/tests/hp/hp_q_hierarchical_constraints.cc index 296e69e7c0..e7809e3ea9 100644 --- a/tests/hp/hp_q_hierarchical_constraints.cc +++ b/tests/hp/hp_q_hierarchical_constraints.cc @@ -126,7 +126,7 @@ test(const bool apply_constrains, const unsigned int hp) } #ifdef FEQH_DEBUG_OUTPUT - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(v, "shape_function"); diff --git a/tests/hp/laplace.h b/tests/hp/laplace.h index cf81f70a3c..590dc956cc 100644 --- a/tests/hp/laplace.h +++ b/tests/hp/laplace.h @@ -443,8 +443,9 @@ Laplace::refine_grid(const unsigned int cycle) } // 3.4. Solution Transfer - SolutionTransfer> - soltrans(dof_handler); + SolutionTransfer soltrans(dof_handler); + + // copy current functions TrilinosWrappers::MPI::Vector solution_coarse; diff --git a/tests/hp/solution_transfer.cc b/tests/hp/solution_transfer.cc index 98c48c8fbf..291689ca4a 100644 --- a/tests/hp/solution_transfer.cc +++ b/tests/hp/solution_transfer.cc @@ -129,10 +129,9 @@ transfer(std::ostream &out) VectorTools::interpolate(mapping, q_dof_handler, function, q_solution); VectorTools::interpolate(mapping, dgq_dof_handler, function, dgq_solution); - SolutionTransfer, DoFHandler> q_soltrans( - q_dof_handler); - SolutionTransfer, DoFHandler> dgq_soltrans( - dgq_dof_handler); + SolutionTransfer> q_soltrans(q_dof_handler); + SolutionTransfer> dgq_soltrans(dgq_dof_handler); + // test b): do some coarsening and @@ -197,6 +196,7 @@ transfer(std::ostream &out) typename DoFHandler::active_cell_iterator cell = q_dof_handler .begin_active(), endc = q_dof_handler.end(); + for (; cell != endc; ++cell) { hp_fe_val.reinit(cell, 0); diff --git a/tests/hp/solution_transfer_02.cc b/tests/hp/solution_transfer_02.cc index 729500aa08..9e28d9b1e2 100644 --- a/tests/hp/solution_transfer_02.cc +++ b/tests/hp/solution_transfer_02.cc @@ -74,7 +74,8 @@ transfer(std::ostream &out) for (unsigned int i = 0; i < solution.size(); ++i) solution(i) = i; - SolutionTransfer, DoFHandler> soltrans(dof_handler); + SolutionTransfer> soltrans(dof_handler); + typename Triangulation::active_cell_iterator cell = tria.begin_active(), endc = tria.end(); diff --git a/tests/hp/solution_transfer_03.cc b/tests/hp/solution_transfer_03.cc index f8aae145d9..2e034182b9 100644 --- a/tests/hp/solution_transfer_03.cc +++ b/tests/hp/solution_transfer_03.cc @@ -80,7 +80,7 @@ main() // Save output - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "Solution"); data_out.build_patches(); @@ -88,8 +88,7 @@ main() // Interpoalte solution - SolutionTransfer<2, Vector, DoFHandler<2>> solultion_trans( - dof_handler); + SolutionTransfer<2, Vector> solultion_trans(dof_handler); solultion_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); @@ -106,7 +105,7 @@ main() // Save output - DataOut<2, DoFHandler<2>> data_out2; + DataOut<2> data_out2; data_out2.attach_dof_handler(dof_handler); data_out2.add_data_vector(new_solution, "Solution"); data_out2.build_patches(); diff --git a/tests/hp/solution_transfer_04.cc b/tests/hp/solution_transfer_04.cc index f92700e57f..14619c2392 100644 --- a/tests/hp/solution_transfer_04.cc +++ b/tests/hp/solution_transfer_04.cc @@ -79,8 +79,7 @@ main() solution = 1.0; - SolutionTransfer<2, Vector, DoFHandler<2>> solultion_trans( - dof_handler); + SolutionTransfer<2, Vector> solultion_trans(dof_handler); solultion_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/hp/solution_transfer_05.cc b/tests/hp/solution_transfer_05.cc index 3a29b479a3..599edd3b9b 100644 --- a/tests/hp/solution_transfer_05.cc +++ b/tests/hp/solution_transfer_05.cc @@ -79,8 +79,7 @@ main() solution = 1.0; - SolutionTransfer<2, Vector, DoFHandler<2>> solultion_trans( - dof_handler); + SolutionTransfer<2, Vector> solultion_trans(dof_handler); solultion_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); @@ -91,7 +90,7 @@ main() // a follow-up error to the one fixed with _04 was that DataOut also got // itself confused - DataOut<2, DoFHandler<2>> data_out2; + DataOut<2> data_out2; data_out2.attach_dof_handler(dof_handler); data_out2.add_data_vector(new_solution, "Solution"); data_out2.build_patches(); diff --git a/tests/hp/solution_transfer_06.cc b/tests/hp/solution_transfer_06.cc index 515c1e39ef..33761b3d60 100644 --- a/tests/hp/solution_transfer_06.cc +++ b/tests/hp/solution_transfer_06.cc @@ -64,8 +64,7 @@ test() // set refine flag for the only cell we have, then do the refinement - SolutionTransfer, DoFHandler> solution_trans( - dof_handler); + SolutionTransfer> solution_trans(dof_handler); dof_handler.begin_active()->set_refine_flag(); solution_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/hp/solution_transfer_07.cc b/tests/hp/solution_transfer_07.cc index 9a48aabbcb..d69d2c15fc 100644 --- a/tests/hp/solution_transfer_07.cc +++ b/tests/hp/solution_transfer_07.cc @@ -64,8 +64,7 @@ test() // set refine flag for the only cell we have, then do the refinement - SolutionTransfer, DoFHandler> solution_trans( - dof_handler); + SolutionTransfer> solution_trans(dof_handler); dof_handler.begin_active()->set_refine_flag(); solution_trans.prepare_for_pure_refinement(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/hp/solution_transfer_08.cc b/tests/hp/solution_transfer_08.cc index 9102ec2325..3e7e3f3ad1 100644 --- a/tests/hp/solution_transfer_08.cc +++ b/tests/hp/solution_transfer_08.cc @@ -63,8 +63,7 @@ test() solution = 1.0; // coarsen everything away - SolutionTransfer, DoFHandler> solution_trans( - dof_handler); + SolutionTransfer> solution_trans(dof_handler); for (unsigned int c = 0; c < dof_handler.begin(0)->n_children(); ++c) dof_handler.begin(0)->child(c)->set_coarsen_flag(); diff --git a/tests/hp/solution_transfer_09.cc b/tests/hp/solution_transfer_09.cc index a7b06b577e..de6d7fe5e3 100644 --- a/tests/hp/solution_transfer_09.cc +++ b/tests/hp/solution_transfer_09.cc @@ -62,8 +62,7 @@ test() // set refine flag for the only cell we have, then do the refinement - SolutionTransfer, DoFHandler> solution_trans( - dof_handler); + SolutionTransfer> solution_trans(dof_handler); dof_handler.begin_active()->set_refine_flag(); solution_trans.prepare_for_pure_refinement(); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/hp/solution_transfer_10.cc b/tests/hp/solution_transfer_10.cc index 83b4979f4b..240e38a8cf 100644 --- a/tests/hp/solution_transfer_10.cc +++ b/tests/hp/solution_transfer_10.cc @@ -98,8 +98,7 @@ main() triangulation.prepare_coarsening_and_refinement(); // Interpolate solution - SolutionTransfer<2, Vector, DoFHandler<2>> solultion_trans( - dof_handler); + SolutionTransfer<2, Vector> solultion_trans(dof_handler); solultion_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/hp/solution_transfer_11.cc b/tests/hp/solution_transfer_11.cc index bce373f923..d1a9f92d91 100644 --- a/tests/hp/solution_transfer_11.cc +++ b/tests/hp/solution_transfer_11.cc @@ -63,7 +63,8 @@ transfer(std::ostream &out) for (unsigned int i = 0; i < solution.size(); ++i) solution(i) = i; - SolutionTransfer, DoFHandler> soltrans(dof_handler); + SolutionTransfer> soltrans(dof_handler); + typename Triangulation::active_cell_iterator cell = tria.begin_active(), endc = tria.end(); diff --git a/tests/hp/solution_transfer_12.cc b/tests/hp/solution_transfer_12.cc index d662ec82a1..1cee10bf79 100644 --- a/tests/hp/solution_transfer_12.cc +++ b/tests/hp/solution_transfer_12.cc @@ -105,6 +105,7 @@ transfer(std::ostream &out) typename DoFHandler::active_cell_iterator cell = q_dof_handler .begin_active(), endc = q_dof_handler.end(); + for (; cell != endc; ++cell, ++counter) { if (counter < 15) @@ -136,6 +137,7 @@ transfer(std::ostream &out) typename DoFHandler::active_cell_iterator cell = q_dof_handler .begin_active(), endc = q_dof_handler.end(); + for (; cell != endc; ++cell) { hp_fe_val.reinit(cell, 0); @@ -155,8 +157,8 @@ transfer(std::ostream &out) } } - SolutionTransfer, DoFHandler> q_soltrans( - q_dof_handler); + SolutionTransfer> q_soltrans(q_dof_handler); + // test b): do some coarsening and @@ -186,6 +188,7 @@ transfer(std::ostream &out) typename DoFHandler::active_cell_iterator cell = q_dof_handler .begin_active(), endc = q_dof_handler.end(); + for (; cell != endc; ++cell, ++counter) { if (counter > 20 && counter < 90) @@ -211,6 +214,7 @@ transfer(std::ostream &out) typename DoFHandler::active_cell_iterator cell = q_dof_handler .begin_active(), endc = q_dof_handler.end(); + for (; cell != endc; ++cell) { hp_fe_val.reinit(cell, 0); diff --git a/tests/hp/solution_transfer_13.cc b/tests/hp/solution_transfer_13.cc index e9f669dc10..fe564cd482 100644 --- a/tests/hp/solution_transfer_13.cc +++ b/tests/hp/solution_transfer_13.cc @@ -97,7 +97,7 @@ main() } // Save output - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "Solution"); data_out.add_data_vector(FE_Type, "FE_Type"); @@ -124,8 +124,8 @@ main() triangulation.prepare_coarsening_and_refinement(); // Interpolate solution - SolutionTransfer<2, Vector, DoFHandler<2>> solution_trans( - dof_handler); + SolutionTransfer<2, Vector> solution_trans(dof_handler); + solution_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); @@ -146,7 +146,7 @@ main() } // Save new solution - DataOut<2, DoFHandler<2>> data_out2; + DataOut<2> data_out2; data_out2.attach_dof_handler(dof_handler); data_out2.add_data_vector(new_solution, "Solution"); data_out2.add_data_vector(FE_Type, "FE_type"); @@ -175,8 +175,7 @@ main() triangulation.prepare_coarsening_and_refinement(); // Interpolate solution - SolutionTransfer<2, Vector, DoFHandler<2>> solution_trans2( - dof_handler); + SolutionTransfer<2, Vector> solution_trans2(dof_handler); solution_trans2.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); @@ -197,7 +196,7 @@ main() } // Save new solution - DataOut<2, DoFHandler<2>> data_out3; + DataOut<2> data_out3; data_out3.attach_dof_handler(dof_handler); data_out3.add_data_vector(new_solution2, "Solution"); data_out3.add_data_vector(FE_Type, "FE_type"); diff --git a/tests/hp/solution_transfer_14.cc b/tests/hp/solution_transfer_14.cc index 47d7d696c1..c90fce4f8d 100644 --- a/tests/hp/solution_transfer_14.cc +++ b/tests/hp/solution_transfer_14.cc @@ -78,8 +78,9 @@ transfer(const MPI_Comm &mpi_communicator) if (locally_owned_dofs.is_element(i)) solution(i) = i; - SolutionTransfer> - soltrans(dof_handler); + SolutionTransfer soltrans(dof_handler); + + typename Triangulation::active_cell_iterator cell = tria.begin_active(), endc = tria.end(); diff --git a/tests/hp/solution_transfer_15.cc b/tests/hp/solution_transfer_15.cc index 3824810832..1f0546c288 100644 --- a/tests/hp/solution_transfer_15.cc +++ b/tests/hp/solution_transfer_15.cc @@ -132,8 +132,10 @@ transfer(const MPI_Comm &mpi_communicator) if (locally_owned_dofs.is_element(i)) solution(i) = i; - SolutionTransfer> - soltrans(dof_handler); + SolutionTransfer soltrans( + dof_handler); + + typename Triangulation::active_cell_iterator cell = tria.begin_active(), endc = tria.end(); diff --git a/tests/hp/solution_transfer_16.cc b/tests/hp/solution_transfer_16.cc index ffc20bfa95..89a0666faf 100644 --- a/tests/hp/solution_transfer_16.cc +++ b/tests/hp/solution_transfer_16.cc @@ -71,8 +71,8 @@ main() triangulation.prepare_coarsening_and_refinement(); // Interpolate solution - SolutionTransfer<2, Vector, DoFHandler<2>> solution_trans( - dof_handler); + SolutionTransfer<2, Vector> solution_trans(dof_handler); + solution_trans.prepare_for_coarsening_and_refinement(solution); triangulation.execute_coarsening_and_refinement(); diff --git a/tests/hp/step-12.cc b/tests/hp/step-12.cc index 8e400305da..28a9b12eae 100644 --- a/tests/hp/step-12.cc +++ b/tests/hp/step-12.cc @@ -540,6 +540,7 @@ DGMethod::assemble_system1() { typename DoFHandler::face_iterator face = cell->face(face_no); + ue_vi_matrix = 0; if (face->at_boundary()) @@ -716,6 +717,7 @@ DGMethod::assemble_system2() { typename DoFHandler::face_iterator face = cell->face(face_no); + if (face->at_boundary()) { fe_v_face.reinit(cell, face_no); @@ -738,6 +740,7 @@ DGMethod::assemble_system2() ++subface_no) { typename DoFHandler::cell_iterator neighbor_child = + cell->neighbor_child_on_subface(face_no, subface_no); Assert(neighbor_child->face(neighbor2) == face->child(subface_no), @@ -892,7 +895,7 @@ DGMethod::output_results(const unsigned int cycle) const deallog << "Writing solution to <" << filename << ">..." << std::endl << std::endl; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution2, "u"); diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc index 9f29332fc3..de8d0338f5 100644 --- a/tests/hp/step-13.cc +++ b/tests/hp/step-13.cc @@ -186,7 +186,7 @@ namespace Evaluation SolutionOutput::operator()(const DoFHandler &dof_handler, const Vector & solution) const { - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); data_out.build_patches(); @@ -351,6 +351,7 @@ namespace LaplaceSolver { using active_cell_iterator = typename DoFHandler::active_cell_iterator; + const unsigned int n_threads = MultithreadInfo::n_threads(); std::vector> thread_ranges = @@ -438,6 +439,7 @@ namespace LaplaceSolver template Solver::LinearSystem::LinearSystem(const DoFHandler &dof_handler) + { hanging_node_constraints.clear(); diff --git a/tests/hp/step-27.cc b/tests/hp/step-27.cc index 7dcce4c57d..f6240182d8 100644 --- a/tests/hp/step-27.cc +++ b/tests/hp/step-27.cc @@ -320,7 +320,7 @@ namespace Step27 fe_collection[cell->active_fe_index()].degree; } - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/hp/step-3.cc b/tests/hp/step-3.cc index 11f87606c1..661e04b040 100644 --- a/tests/hp/step-3.cc +++ b/tests/hp/step-3.cc @@ -192,7 +192,7 @@ LaplaceProblem::solve() void LaplaceProblem::output_results() const { - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); data_out.build_patches(); diff --git a/tests/hp/step-3a.cc b/tests/hp/step-3a.cc index 29e1fdaea2..50673f2dd2 100644 --- a/tests/hp/step-3a.cc +++ b/tests/hp/step-3a.cc @@ -238,7 +238,7 @@ LaplaceProblem::solve() void LaplaceProblem::output_results() const { - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); data_out.build_patches(); diff --git a/tests/hp/step-3a_mapping_collection.cc b/tests/hp/step-3a_mapping_collection.cc index 5aaf7f2f96..cbbe6da09c 100644 --- a/tests/hp/step-3a_mapping_collection.cc +++ b/tests/hp/step-3a_mapping_collection.cc @@ -242,7 +242,7 @@ LaplaceProblem::solve() void LaplaceProblem::output_results() const { - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); data_out.build_patches(); diff --git a/tests/hp/step-3b.cc b/tests/hp/step-3b.cc index 6f67ba5f16..028eca375b 100644 --- a/tests/hp/step-3b.cc +++ b/tests/hp/step-3b.cc @@ -235,7 +235,7 @@ LaplaceProblem::solve() void LaplaceProblem::output_results() const { - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); data_out.build_patches(); diff --git a/tests/hp/step-3c.cc b/tests/hp/step-3c.cc index 7745dc0c44..90d56adb9f 100644 --- a/tests/hp/step-3c.cc +++ b/tests/hp/step-3c.cc @@ -243,7 +243,7 @@ LaplaceProblem::solve() void LaplaceProblem::output_results() const { - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); data_out.build_patches(); diff --git a/tests/hp/step-4.cc b/tests/hp/step-4.cc index 046f32dbe3..c53ac2f355 100644 --- a/tests/hp/step-4.cc +++ b/tests/hp/step-4.cc @@ -262,7 +262,7 @@ template void LaplaceProblem::output_results() const { - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc index d160c120f4..fbb7db7bf9 100644 --- a/tests/hp/step-5.cc +++ b/tests/hp/step-5.cc @@ -271,7 +271,7 @@ LaplaceProblem::output_results(const unsigned int cycle) const if (cycle >= 2) return; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index ecbd39441f..e2aad0f94c 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -366,7 +366,7 @@ LaplaceProblem::run() DataOutBase::EpsFlags eps_flags; eps_flags.z_scaling = 4; - DataOut> data_out; + DataOut data_out; data_out.set_flags(eps_flags); data_out.attach_dof_handler(dof_handler); diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc index e09463fcbe..9c6fb56b8e 100644 --- a/tests/hp/step-7.cc +++ b/tests/hp/step-7.cc @@ -547,7 +547,7 @@ HelmholtzProblem::run() gmv_filename += ".gmv"; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); diff --git a/tests/hp/step-8.cc b/tests/hp/step-8.cc index cfbb5a0ef8..4106f7f099 100644 --- a/tests/hp/step-8.cc +++ b/tests/hp/step-8.cc @@ -361,7 +361,7 @@ ElasticProblem::output_results(const unsigned int cycle) const filename += ".gmv"; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); diff --git a/tests/integrators/mesh_worker_1d_dg.cc b/tests/integrators/mesh_worker_1d_dg.cc index cbffcdbd0f..0fa41b758f 100644 --- a/tests/integrators/mesh_worker_1d_dg.cc +++ b/tests/integrators/mesh_worker_1d_dg.cc @@ -410,7 +410,7 @@ namespace Advection data_out.add_data_vector(solution, solution_names, - DataOut>::type_dof_data, + DataOut::type_dof_data, interpretation); data_out.build_patches(fe.degree); diff --git a/tests/mappings/mapping_manifold_step-3.cc b/tests/mappings/mapping_manifold_step-3.cc index 9c71041790..e000566c3f 100644 --- a/tests/mappings/mapping_manifold_step-3.cc +++ b/tests/mappings/mapping_manifold_step-3.cc @@ -193,7 +193,7 @@ LaplaceProblem::solve() void LaplaceProblem::output_results() const { - DataOut<2, DoFHandler<2>> data_out; + DataOut<2> data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution, "solution"); data_out.build_patches(); diff --git a/tests/mappings/mapping_q_cache_07.cc b/tests/mappings/mapping_q_cache_07.cc index 3b8d3ec665..79ea3b3b5b 100644 --- a/tests/mappings/mapping_q_cache_07.cc +++ b/tests/mappings/mapping_q_cache_07.cc @@ -82,15 +82,14 @@ test(const bool vector_describes_relative_displacement, vector_describes_relative_displacement); DataOutBase::VtkFlags flags; - DataOut> data_out; + DataOut data_out; data_out.set_flags(flags); data_out.attach_dof_handler(dof_handler); data_out.build_patches( mapping, fe_degree + 1, - DataOut>::CurvedCellRegion::curved_inner_cells); + DataOut::CurvedCellRegion::curved_inner_cells); static unsigned int counter = 0; diff --git a/tests/mpi/codim_01.cc b/tests/mpi/codim_01.cc index 4d00b4614e..4b9752b24f 100644 --- a/tests/mpi/codim_01.cc +++ b/tests/mpi/codim_01.cc @@ -80,7 +80,7 @@ test(std::ostream & /*out*/) dh.distribute_dofs(fe); deallog << "dofs " << dh.n_dofs() << std::endl; - DataOut> data_out; + DataOut data_out; data_out.attach_triangulation(tr); Vector subdomain(tr.n_active_cells()); for (unsigned int i = 0; i < subdomain.size(); ++i) diff --git a/tests/mpi/fe_field_function_01.cc b/tests/mpi/fe_field_function_01.cc index f16fe3cb4b..1e86862628 100644 --- a/tests/mpi/fe_field_function_01.cc +++ b/tests/mpi/fe_field_function_01.cc @@ -81,9 +81,9 @@ test() TrilinosWrappers::MPI::Vector x_rel(relevant_set, MPI_COMM_WORLD); x_rel = interpolated; - Functions:: - FEFieldFunction, TrilinosWrappers::MPI::Vector> - field_function(dofh, x_rel); + Functions::FEFieldFunction field_function( + dofh, x_rel); + for (unsigned int test = 0; test < 4; ++test) { diff --git a/tests/mpi/fe_field_function_02.cc b/tests/mpi/fe_field_function_02.cc index 5ce3c3489c..72c72c54a9 100644 --- a/tests/mpi/fe_field_function_02.cc +++ b/tests/mpi/fe_field_function_02.cc @@ -104,9 +104,9 @@ test() TrilinosWrappers::MPI::Vector x_rel(relevant_set, MPI_COMM_WORLD); x_rel = interpolated; - Functions:: - FEFieldFunction, TrilinosWrappers::MPI::Vector> - field_function(dofh, x_rel); + Functions::FEFieldFunction field_function( + dofh, x_rel); + std::vector> points; diff --git a/tests/mpi/fe_field_function_03.cc b/tests/mpi/fe_field_function_03.cc index c91857ed16..a0e698b873 100644 --- a/tests/mpi/fe_field_function_03.cc +++ b/tests/mpi/fe_field_function_03.cc @@ -93,9 +93,9 @@ test() TrilinosWrappers::MPI::Vector x_rel(relevant_set, MPI_COMM_WORLD); x_rel = interpolated; - typename Functions:: - FEFieldFunction, TrilinosWrappers::MPI::Vector> - field_func(dofh, x_rel); + typename Functions::FEFieldFunction + + field_func(dofh, x_rel); Point<2> p(0.1, 0.0); std::vector> points; diff --git a/tests/mpi/p4est_save_06.cc b/tests/mpi/p4est_save_06.cc index e2dffb37c8..5153e5d9cd 100644 --- a/tests/mpi/p4est_save_06.cc +++ b/tests/mpi/p4est_save_06.cc @@ -92,9 +92,8 @@ test() locally_relevant_dofs, com_small); - parallel::distributed:: - SolutionTransfer> - soltrans(dh); + parallel::distributed::SolutionTransfer + soltrans(dh); for (unsigned int i = 0; i < locally_owned_dofs.n_elements(); ++i) { @@ -134,6 +133,7 @@ test() for (unsigned int i = 0; i < max_degree; ++i) fe_collection.push_back(FE_Q(max_degree - i)); + dh.deserialize_active_fe_indices(); dh.distribute_dofs(fe_collection); @@ -145,9 +145,8 @@ test() PETScWrappers::MPI::Vector solution(locally_owned_dofs, com_all); solution = PetscScalar(); - parallel::distributed:: - SolutionTransfer> - soltrans(dh); + parallel::distributed::SolutionTransfer + soltrans(dh); soltrans.deserialize(solution); diff --git a/tests/mpi/solution_transfer_02.cc b/tests/mpi/solution_transfer_02.cc index 1e3bbbed42..e125c88af6 100644 --- a/tests/mpi/solution_transfer_02.cc +++ b/tests/mpi/solution_transfer_02.cc @@ -75,8 +75,7 @@ transfer(const MPI_Comm &mpi_communicator) if (locally_owned_dofs.is_element(i)) solution(i) = i; - SolutionTransfer> - soltrans(dof_handler); + SolutionTransfer soltrans(dof_handler); typename Triangulation::active_cell_iterator cell = tria.begin_active(), endc = tria.end(); diff --git a/tests/mpi/solution_transfer_03.cc b/tests/mpi/solution_transfer_03.cc index b8a0e0e316..56ff3bd673 100644 --- a/tests/mpi/solution_transfer_03.cc +++ b/tests/mpi/solution_transfer_03.cc @@ -128,8 +128,8 @@ transfer(const MPI_Comm &mpi_communicator) if (locally_owned_dofs.is_element(i)) solution(i) = i; - SolutionTransfer> - soltrans(dof_handler); + SolutionTransfer soltrans( + dof_handler); typename Triangulation::active_cell_iterator cell = tria.begin_active(), endc = tria.end(); diff --git a/tests/mpi/solution_transfer_04.cc b/tests/mpi/solution_transfer_04.cc index 3ef2f400e2..29104aa33c 100644 --- a/tests/mpi/solution_transfer_04.cc +++ b/tests/mpi/solution_transfer_04.cc @@ -99,9 +99,8 @@ test() // ----- transfer ----- - parallel::distributed:: - SolutionTransfer> - soltrans(dh); + parallel::distributed::SolutionTransfer + soltrans(dh); soltrans.prepare_for_coarsening_and_refinement(old_solution); tria.execute_coarsening_and_refinement(); diff --git a/tests/mpi/solution_transfer_05.cc b/tests/mpi/solution_transfer_05.cc index 5166081744..4507900fd7 100644 --- a/tests/mpi/solution_transfer_05.cc +++ b/tests/mpi/solution_transfer_05.cc @@ -82,11 +82,11 @@ test() dgq_solution); dgq_solution.update_ghost_values(); - parallel::distributed::SolutionTransfer< - dim, - LinearAlgebra::distributed::Vector, - DoFHandler> - dgq_soltrans(dgq_dof_handler); + parallel::distributed:: + SolutionTransfer> + + + dgq_soltrans(dgq_dof_handler); dgq_soltrans.prepare_for_coarsening_and_refinement(dgq_solution); // refine and transfer diff --git a/tests/multigrid-global-coarsening/multigrid_a_01.cc b/tests/multigrid-global-coarsening/multigrid_a_01.cc index 27e573616e..fbdc709a90 100644 --- a/tests/multigrid-global-coarsening/multigrid_a_01.cc +++ b/tests/multigrid-global-coarsening/multigrid_a_01.cc @@ -142,7 +142,7 @@ test(const unsigned int n_refinements, data_out.add_data_vector( results[l], "solution", - DataOut_DoFData, dim>::DataVectorType::type_dof_data); + DataOut_DoFData::DataVectorType::type_dof_data); data_out.build_patches(*mapping_, 2); std::ofstream output("test." + std::to_string(dim) + "." + diff --git a/tests/multigrid-global-coarsening/multigrid_p_01.cc b/tests/multigrid-global-coarsening/multigrid_p_01.cc index edbeae4249..567baa866b 100644 --- a/tests/multigrid-global-coarsening/multigrid_p_01.cc +++ b/tests/multigrid-global-coarsening/multigrid_p_01.cc @@ -172,7 +172,7 @@ test(const unsigned int n_refinements, data_out.add_data_vector( results[l], "solution", - DataOut_DoFData, dim>::DataVectorType::type_dof_data); + DataOut_DoFData::DataVectorType::type_dof_data); data_out.build_patches(*mapping_, 2); std::ofstream output("test." + std::to_string(dim) + "." + diff --git a/tests/numerics/error_estimator_02.cc b/tests/numerics/error_estimator_02.cc index 0394b4217f..754f707680 100644 --- a/tests/numerics/error_estimator_02.cc +++ b/tests/numerics/error_estimator_02.cc @@ -243,7 +243,7 @@ output(const std::string name, fe_degrees(index) = dof_handler.get_fe(cell->active_fe_index()).degree; } - dealii::DataOut> data_out; + dealii::DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(values, std::string("function_interpolation")); data_out.add_data_vector(fe_degrees, std::string("fe_degree")); diff --git a/tests/numerics/error_estimator_02_complex.cc b/tests/numerics/error_estimator_02_complex.cc index efa822912b..d725259ecc 100644 --- a/tests/numerics/error_estimator_02_complex.cc +++ b/tests/numerics/error_estimator_02_complex.cc @@ -188,7 +188,7 @@ output(const std::string name, fe_degrees(index) = dof_handler.get_fe(cell->active_fe_index()).degree; } - dealii::DataOut> data_out; + dealii::DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(values, std::string("function_interpolation")); data_out.add_data_vector(fe_degrees, std::string("fe_degree")); diff --git a/tests/numerics/fe_field.cc b/tests/numerics/fe_field.cc index baa181afd2..cc76fb4a3a 100644 --- a/tests/numerics/fe_field.cc +++ b/tests/numerics/fe_field.cc @@ -60,9 +60,8 @@ check() for (unsigned int i = 0; i < dof_handler.n_dofs(); ++i) vector(i) = i; - Functions::FEFieldFunction> fe_field(dof_handler, - vector); - QGauss quadrature(5); + Functions::FEFieldFunction fe_field(dof_handler, vector); + QGauss quadrature(5); deallog << "values:" << std::endl; diff --git a/tests/numerics/no_flux_hp_04.cc b/tests/numerics/no_flux_hp_04.cc index e059d78a1e..8326b03333 100644 --- a/tests/numerics/no_flux_hp_04.cc +++ b/tests/numerics/no_flux_hp_04.cc @@ -100,7 +100,7 @@ test(const Triangulation &tr, const hp::FECollection &fe) if (std::fabs(v(i)) < 1e-12) v(i) = 0; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dh); std::vector @@ -108,8 +108,9 @@ test(const Triangulation &tr, const hp::FECollection &fe) dim, DataComponentInterpretation::component_is_part_of_vector); data_out.add_data_vector(v, + "x", - DataOut>::type_dof_data, + DataOut::type_dof_data, data_component_interpretation); data_out.build_patches(fe[0].degree); diff --git a/tests/remote_point_evaluation/remote_point_evaluation_01.cc b/tests/remote_point_evaluation/remote_point_evaluation_01.cc index 20545e276f..62355fee90 100644 --- a/tests/remote_point_evaluation/remote_point_evaluation_01.cc +++ b/tests/remote_point_evaluation/remote_point_evaluation_01.cc @@ -509,15 +509,15 @@ test() DataOutBase::VtkFlags flags; // flags.write_higher_order_cells = true; - DataOut> data_out; + DataOut data_out; data_out.set_flags(flags); data_out.add_data_vector(dof_handler, curvature_vector, "curvature"); data_out.add_data_vector(dof_handler_dim, normal_vector, "normal"); - data_out.build_patches(mapping, - fe_degree + 1, - DataOut>:: - CurvedCellRegion::curved_inner_cells); + data_out.build_patches( + mapping, + fe_degree + 1, + DataOut::CurvedCellRegion::curved_inner_cells); data_out.write_vtu_with_pvtu_record("./", "data_surface", 0, diff --git a/tests/remote_point_evaluation/remote_point_evaluation_02.cc b/tests/remote_point_evaluation/remote_point_evaluation_02.cc index c6c2a7e8c7..2918d4a943 100644 --- a/tests/remote_point_evaluation/remote_point_evaluation_02.cc +++ b/tests/remote_point_evaluation/remote_point_evaluation_02.cc @@ -445,14 +445,14 @@ test() DataOutBase::VtkFlags flags; // flags.write_higher_order_cells = true; - DataOut> data_out; + DataOut data_out; data_out.set_flags(flags); data_out.attach_dof_handler(dof_handler); - data_out.build_patches(mapping, - fe_degree + 1, - DataOut>:: - CurvedCellRegion::curved_inner_cells); + data_out.build_patches( + mapping, + fe_degree + 1, + DataOut::CurvedCellRegion::curved_inner_cells); data_out.write_vtu_with_pvtu_record("./", "data_surface", 0, diff --git a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc index fa180b5821..d2d251bb33 100644 --- a/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc +++ b/tests/remote_point_evaluation/vector_tools_evaluate_at_points_05.cc @@ -84,7 +84,7 @@ print(const Mapping & mapping, if (dim == spacedim) flags.write_higher_order_cells = true; - DataOut> data_out; + DataOut data_out; data_out.set_flags(flags); data_out.attach_dof_handler(dof_handler); diff --git a/tests/simplex/step-12b.cc b/tests/simplex/step-12b.cc index 330b1c55ad..ccc00ba976 100644 --- a/tests/simplex/step-12b.cc +++ b/tests/simplex/step-12b.cc @@ -919,7 +919,7 @@ DGMethod::output_results(const unsigned int cycle) const deallog << "Writing solution to <" << filename << ">..." << std::endl << std::endl; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution2, "u"); diff --git a/tests/simplex/step-12c.cc b/tests/simplex/step-12c.cc index f3bf5d7978..49b5b6150f 100644 --- a/tests/simplex/step-12c.cc +++ b/tests/simplex/step-12c.cc @@ -944,7 +944,7 @@ DGMethod::output_results(const unsigned int cycle) const deallog << "Writing solution to <" << filename << ">..." << std::endl << std::endl; - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); data_out.add_data_vector(solution1, "u"); diff --git a/tests/simplex/step-18.cc b/tests/simplex/step-18.cc index 142551eac3..518a640192 100644 --- a/tests/simplex/step-18.cc +++ b/tests/simplex/step-18.cc @@ -750,11 +750,11 @@ namespace Step18 DataComponentInterpretation::DataComponentInterpretation:: component_is_part_of_vector); - data_out.add_data_vector(incremental_displacement, - solution_names, - DataOut_DoFData, dim, dim>:: - DataVectorType::type_automatic, - solution_interpretation); + data_out.add_data_vector( + incremental_displacement, + solution_names, + DataOut_DoFData::DataVectorType::type_automatic, + solution_interpretation); Vector norm_of_stress(triangulation.n_active_cells()); diff --git a/tests/simplex/step-38.cc b/tests/simplex/step-38.cc index 57e0cab967..d799e87a14 100644 --- a/tests/simplex/step-38.cc +++ b/tests/simplex/step-38.cc @@ -359,12 +359,11 @@ namespace Step38 void LaplaceBeltramiProblem::output_results() const { - DataOut> data_out; + DataOut data_out; data_out.attach_dof_handler(dof_handler); - data_out.add_data_vector( - solution, - "solution", - DataOut>::type_dof_data); + data_out.add_data_vector(solution, + "solution", + DataOut::type_dof_data); data_out.build_patches(mapping, mapping.get_degree()); const std::string filename = diff --git a/tests/vector_tools/get_position_vector_01.cc b/tests/vector_tools/get_position_vector_01.cc index 67f68c7131..3cf4b15551 100644 --- a/tests/vector_tools/get_position_vector_01.cc +++ b/tests/vector_tools/get_position_vector_01.cc @@ -66,15 +66,14 @@ test() { DataOutBase::VtkFlags flags; - DataOut> data_out; + DataOut data_out; data_out.set_flags(flags); data_out.attach_dof_handler(dof_handler); data_out.build_patches( MappingQGeneric(4), fe_degree + 1, - DataOut>::CurvedCellRegion::curved_inner_cells); + DataOut::CurvedCellRegion::curved_inner_cells); #if false std::ofstream output("test.0.vtk"); @@ -94,15 +93,14 @@ test() MappingFEField mapping(dof_handler_dim, euler_vector); DataOutBase::VtkFlags flags; - DataOut> data_out; + DataOut data_out; data_out.set_flags(flags); data_out.attach_dof_handler(dof_handler); data_out.build_patches( mapping, fe_degree + 1, - DataOut>::CurvedCellRegion::curved_inner_cells); + DataOut::CurvedCellRegion::curved_inner_cells); #if false std::ofstream output("test.1.vtk");