From: Wolfgang Bangerth Date: Wed, 3 May 2006 19:58:57 +0000 (+0000) Subject: Fix a few minor issues X-Git-Tag: v8.0.0~11780 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80bbb2455e66c8a5a0db59d2d35454a844550a22;p=dealii.git Fix a few minor issues git-svn-id: https://svn.dealii.org/trunk@13027 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index 2731346c4d..b0f29bcdb4 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -190,7 +190,7 @@ void LaplaceProblem::setup_system () template void LaplaceProblem::assemble_system () { - const hp::QCollection quadrature_formula(3); + const hp::QCollection quadrature_formula(QGauss(3)); hp::FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | @@ -288,7 +288,7 @@ void LaplaceProblem::refine_grid () Vector estimated_error_per_cell (triangulation.n_active_cells()); KellyErrorEstimator::estimate (dof_handler, - QGauss(3), + hp::QCollection(QGauss(3)), typename FunctionMap::type(), solution, estimated_error_per_cell); diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc index e053f7c411..741ca3cd0f 100644 --- a/tests/hp/step-7.cc +++ b/tests/hp/step-7.cc @@ -261,8 +261,8 @@ void HelmholtzProblem::setup_system () template void HelmholtzProblem::assemble_system () { - hp::QCollection quadrature_formula(3); - hp::QCollection face_quadrature_formula(3); + hp::QCollection quadrature_formula(QGauss(3)); + hp::QCollection face_quadrature_formula(QGauss(3)); const unsigned int n_q_points = quadrature_formula[0].n_quadrature_points; const unsigned int n_face_q_points = face_quadrature_formula[0].n_quadrature_points; @@ -401,7 +401,7 @@ void HelmholtzProblem::refine_grid () typename FunctionMap::type neumann_boundary; KellyErrorEstimator::estimate (dof_handler, - hp::QCollection(3), + hp::QCollection(QGauss(3)), neumann_boundary, solution, estimated_error_per_cell); @@ -432,7 +432,7 @@ void HelmholtzProblem::process_solution (const unsigned int cycle) solution, Solution(), difference_per_cell, - hp::QCollection(3), + hp::QCollection(QGauss(3)), VectorTools::L2_norm); const double L2_error = difference_per_cell.l2_norm(); @@ -440,7 +440,7 @@ void HelmholtzProblem::process_solution (const unsigned int cycle) solution, Solution(), difference_per_cell, - hp::QCollection(3), + hp::QCollection(QGauss(3)), VectorTools::H1_seminorm); const double H1_error = difference_per_cell.l2_norm(); @@ -450,7 +450,7 @@ void HelmholtzProblem::process_solution (const unsigned int cycle) solution, Solution(), difference_per_cell, - q_iterated, + hp::QCollection(q_iterated), VectorTools::Linfty_norm); const double Linfty_error = difference_per_cell.linfty_norm(); @@ -567,7 +567,7 @@ void HelmholtzProblem::run () convergence_table.set_tex_format("dofs", "r"); deallog << std::endl; - convergence_table.write_text(deallog); + convergence_table.write_text(deallog.get_file_stream()); std::string error_filename = "error"; switch (refinement_mode) @@ -620,7 +620,7 @@ void HelmholtzProblem::run () .evaluate_convergence_rates("H1", ConvergenceTable::reduction_rate_log2); deallog << std::endl; - convergence_table.write_text(deallog); + convergence_table.write_text(deallog.get_file_stream()); std::string conv_filename = "convergence"; switch (refinement_mode)