From 48f349e324dbe4326a3dced546d7ef5e1aec28af Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 19 May 1998 13:17:38 +0000 Subject: [PATCH] Move some functions from ProblemBase to more general parts of the library. git-svn-id: https://svn.dealii.org/trunk@313 0785d39b-7218-0410-832d-ea1e28bc413d --- .../Attic/examples/convergence/convergence.cc | 27 ++++++++++++++----- .../error-estimation/error-estimation.cc | 18 +++++++++---- tests/big-tests/convergence/convergence.cc | 27 ++++++++++++++----- .../error-estimation/error-estimation.cc | 18 +++++++++---- 4 files changed, 68 insertions(+), 22 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/convergence.cc b/deal.II/deal.II/Attic/examples/convergence/convergence.cc index 2a95fa67aa..7c09fcc3f5 100644 --- a/deal.II/deal.II/Attic/examples/convergence/convergence.cc +++ b/deal.II/deal.II/Attic/examples/convergence/convergence.cc @@ -13,7 +13,7 @@ #include #include #include - +#include #include #include @@ -267,27 +267,42 @@ void PoissonProblem::run (const unsigned int level) { QGauss3 q; cout << " Calculating L1 error... "; - integrate_difference (sol, l1_error_per_cell, q, fe, L1_norm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + l1_error_per_cell, + q, fe, L1_norm); cout << l1_error_per_cell.l1_norm() << endl; l1_error.push_back (l1_error_per_cell.l1_norm()); cout << " Calculating L2 error... "; - integrate_difference (sol, l2_error_per_cell, q, fe, L2_norm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + l2_error_per_cell, + q, fe, L2_norm); cout << l2_error_per_cell.l2_norm() << endl; l2_error.push_back (l2_error_per_cell.l2_norm()); cout << " Calculating L-infinity error... "; - integrate_difference (sol, linfty_error_per_cell, q, fe, Linfty_norm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + linfty_error_per_cell, + q, fe, Linfty_norm); cout << linfty_error_per_cell.linfty_norm() << endl; linfty_error.push_back (linfty_error_per_cell.linfty_norm()); cout << " Calculating H1-seminorm error... "; - integrate_difference (sol, h1_seminorm_error_per_cell, q, fe, H1_seminorm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + h1_seminorm_error_per_cell, + q, fe, H1_seminorm); cout << h1_seminorm_error_per_cell.l2_norm() << endl; h1_seminorm_error.push_back (h1_seminorm_error_per_cell.l2_norm()); cout << " Calculating H1 error... "; - integrate_difference (sol, h1_error_per_cell, q, fe, H1_norm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + h1_error_per_cell, + q, fe, H1_norm); cout << h1_error_per_cell.l2_norm() << endl; h1_error.push_back (h1_error_per_cell.l2_norm()); diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index e0a91ecf09..fc2e807838 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -451,19 +452,26 @@ void PoissonProblem::run (ParameterHandler &prm) { QGauss3 q; cout << " Calculating L2 error... "; - integrate_difference (*solution_function, l2_error_per_cell, q, - fe, L2_norm); + VectorTools::integrate_difference (*dof_handler, + solution, *solution_function, + l2_error_per_cell, q, fe, + L2_norm); cout << l2_error_per_cell.l2_norm() << endl; l2_error.push_back (l2_error_per_cell.l2_norm()); cout << " Calculating L-infinity error... "; - integrate_difference (*solution_function, linfty_error_per_cell, q, - fe, Linfty_norm); + VectorTools::integrate_difference (*dof_handler, + solution, *solution_function, + linfty_error_per_cell, q, fe, + Linfty_norm); cout << linfty_error_per_cell.linfty_norm() << endl; linfty_error.push_back (linfty_error_per_cell.linfty_norm()); cout << " Calculating H1 error... "; - integrate_difference (*solution_function, h1_error_per_cell, q, fe, H1_norm); + VectorTools::integrate_difference (*dof_handler, + solution, *solution_function, + h1_error_per_cell, q, fe, + H1_norm); cout << h1_error_per_cell.l2_norm() << endl; h1_error.push_back (h1_error_per_cell.l2_norm()); diff --git a/tests/big-tests/convergence/convergence.cc b/tests/big-tests/convergence/convergence.cc index 2a95fa67aa..7c09fcc3f5 100644 --- a/tests/big-tests/convergence/convergence.cc +++ b/tests/big-tests/convergence/convergence.cc @@ -13,7 +13,7 @@ #include #include #include - +#include #include #include @@ -267,27 +267,42 @@ void PoissonProblem::run (const unsigned int level) { QGauss3 q; cout << " Calculating L1 error... "; - integrate_difference (sol, l1_error_per_cell, q, fe, L1_norm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + l1_error_per_cell, + q, fe, L1_norm); cout << l1_error_per_cell.l1_norm() << endl; l1_error.push_back (l1_error_per_cell.l1_norm()); cout << " Calculating L2 error... "; - integrate_difference (sol, l2_error_per_cell, q, fe, L2_norm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + l2_error_per_cell, + q, fe, L2_norm); cout << l2_error_per_cell.l2_norm() << endl; l2_error.push_back (l2_error_per_cell.l2_norm()); cout << " Calculating L-infinity error... "; - integrate_difference (sol, linfty_error_per_cell, q, fe, Linfty_norm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + linfty_error_per_cell, + q, fe, Linfty_norm); cout << linfty_error_per_cell.linfty_norm() << endl; linfty_error.push_back (linfty_error_per_cell.linfty_norm()); cout << " Calculating H1-seminorm error... "; - integrate_difference (sol, h1_seminorm_error_per_cell, q, fe, H1_seminorm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + h1_seminorm_error_per_cell, + q, fe, H1_seminorm); cout << h1_seminorm_error_per_cell.l2_norm() << endl; h1_seminorm_error.push_back (h1_seminorm_error_per_cell.l2_norm()); cout << " Calculating H1 error... "; - integrate_difference (sol, h1_error_per_cell, q, fe, H1_norm); + VectorTools::integrate_difference (*dof_handler, + solution, sol, + h1_error_per_cell, + q, fe, H1_norm); cout << h1_error_per_cell.l2_norm() << endl; h1_error.push_back (h1_error_per_cell.l2_norm()); diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index e0a91ecf09..fc2e807838 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -451,19 +452,26 @@ void PoissonProblem::run (ParameterHandler &prm) { QGauss3 q; cout << " Calculating L2 error... "; - integrate_difference (*solution_function, l2_error_per_cell, q, - fe, L2_norm); + VectorTools::integrate_difference (*dof_handler, + solution, *solution_function, + l2_error_per_cell, q, fe, + L2_norm); cout << l2_error_per_cell.l2_norm() << endl; l2_error.push_back (l2_error_per_cell.l2_norm()); cout << " Calculating L-infinity error... "; - integrate_difference (*solution_function, linfty_error_per_cell, q, - fe, Linfty_norm); + VectorTools::integrate_difference (*dof_handler, + solution, *solution_function, + linfty_error_per_cell, q, fe, + Linfty_norm); cout << linfty_error_per_cell.linfty_norm() << endl; linfty_error.push_back (linfty_error_per_cell.linfty_norm()); cout << " Calculating H1 error... "; - integrate_difference (*solution_function, h1_error_per_cell, q, fe, H1_norm); + VectorTools::integrate_difference (*dof_handler, + solution, *solution_function, + h1_error_per_cell, q, fe, + H1_norm); cout << h1_error_per_cell.l2_norm() << endl; h1_error.push_back (h1_error_per_cell.l2_norm()); -- 2.39.5