]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Move some functions from ProblemBase to more general parts of the library.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 19 May 1998 13:17:38 +0000 (13:17 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 19 May 1998 13:17:38 +0000 (13:17 +0000)
git-svn-id: https://svn.dealii.org/trunk@313 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/Attic/examples/convergence/convergence.cc
deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc
tests/big-tests/convergence/convergence.cc
tests/big-tests/error-estimation/error-estimation.cc

index 2a95fa67aa1258e665641617b3681d54beced8ce..7c09fcc3f59490bb45b5e1d38d496e98c89fe9e8 100644 (file)
@@ -13,7 +13,7 @@
 #include <fe/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
-
+#include <numerics/vectors.h>
 
 #include <map.h>
 #include <fstream.h>
@@ -267,27 +267,42 @@ void PoissonProblem<dim>::run (const unsigned int level) {
   QGauss3<dim>  q;
   
   cout << "    Calculating L1 error... ";
-  integrate_difference (sol, l1_error_per_cell, q, fe, L1_norm);
+  VectorTools<dim>::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<dim>::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<dim>::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<dim>::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<dim>::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());
 
index e0a91ecf09121660c1812fadc8e193f6186e4ca4..fc2e8078388928986a147650d6780fcc5ffc837d 100644 (file)
@@ -14,6 +14,7 @@
 #include <fe/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
+#include <numerics/vectors.h>
 #include <numerics/error_estimator.h>
 
 #include <map.h>
@@ -451,19 +452,26 @@ void PoissonProblem<dim>::run (ParameterHandler &prm) {
       QGauss3<dim>  q;
   
       cout << "    Calculating L2 error... ";
-      integrate_difference (*solution_function, l2_error_per_cell, q,
-                           fe, L2_norm);
+      VectorTools<dim>::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<dim>::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<dim>::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());
 
index 2a95fa67aa1258e665641617b3681d54beced8ce..7c09fcc3f59490bb45b5e1d38d496e98c89fe9e8 100644 (file)
@@ -13,7 +13,7 @@
 #include <fe/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
-
+#include <numerics/vectors.h>
 
 #include <map.h>
 #include <fstream.h>
@@ -267,27 +267,42 @@ void PoissonProblem<dim>::run (const unsigned int level) {
   QGauss3<dim>  q;
   
   cout << "    Calculating L1 error... ";
-  integrate_difference (sol, l1_error_per_cell, q, fe, L1_norm);
+  VectorTools<dim>::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<dim>::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<dim>::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<dim>::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<dim>::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());
 
index e0a91ecf09121660c1812fadc8e193f6186e4ca4..fc2e8078388928986a147650d6780fcc5ffc837d 100644 (file)
@@ -14,6 +14,7 @@
 #include <fe/quadrature_lib.h>
 #include <numerics/base.h>
 #include <numerics/assembler.h>
+#include <numerics/vectors.h>
 #include <numerics/error_estimator.h>
 
 #include <map.h>
@@ -451,19 +452,26 @@ void PoissonProblem<dim>::run (ParameterHandler &prm) {
       QGauss3<dim>  q;
   
       cout << "    Calculating L2 error... ";
-      integrate_difference (*solution_function, l2_error_per_cell, q,
-                           fe, L2_norm);
+      VectorTools<dim>::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<dim>::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<dim>::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());
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.