Update the number of actually nonzero elements. Count only elements larger than a...

git-svn-id: https://svn.dealii.org/trunk@18673 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/deal.II/inhomogeneous_constraints.cc b/tests/deal.II/inhomogeneous_constraints.cc
index 2345adc30ec13b60dff3ea4b7c8f52f28c368a08..17b3284f2aa4283f9eac533bfcf55e8308403efd 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints.cc
+++ b/tests/deal.II/inhomogeneous_constraints.cc
@@ -310,7 +310,7 @@ void LaplaceProblem<dim>::assemble_reference ()
                                      reference_rhs);
 
   deallog << "  Reference matrix nonzeros: " << reference_matrix.n_nonzero_elements() 
-         << ", actually: " << reference_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << reference_matrix.n_actually_nonzero_elements (1e-10) 
          << std::endl;
 }
 
@@ -381,7 +381,7 @@ void LaplaceProblem<dim>::assemble_test_1 ()
 
   test_all_constraints.condense (test_matrix, test_rhs);
   deallog << "  Test matrix 1 nonzeros: " << test_matrix.n_nonzero_elements() 
-         << ", actually: " << test_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-10) 
          << std::endl;
 
   test_equality();
@@ -453,7 +453,7 @@ void LaplaceProblem<dim>::assemble_test_2 ()
                                                       test_rhs);
     }
   deallog << "  Test matrix 2 nonzeros: " << test_matrix.n_nonzero_elements() 
-         << ", actually: " << test_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-10) 
          << std::endl;
   test_equality();
 }
@@ -794,7 +794,7 @@ int main ()
   logfile << std::setprecision (2);
   deallog.attach(logfile);
   deallog.depth_console(0);
-  deallog.threshold_double(1.e-12);
+  deallog.threshold_double(1.e-10);
 
   LaplaceProblem<2> laplace_problem;
   laplace_problem.run ();

diff --git a/tests/deal.II/inhomogeneous_constraints/cmp/generic b/tests/deal.II/inhomogeneous_constraints/cmp/generic
index d85cc6921550fc1027819075fc4780940d3d766d..ff2340e4a32cebe791fc5887b460a25ad511902a 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints/cmp/generic
+++ b/tests/deal.II/inhomogeneous_constraints/cmp/generic
@@ -4,11 +4,11 @@ DEAL::
 DEAL::   Number of active cells:       192
 DEAL::   Number of degrees of freedom: 864
 DEAL::   Number of constraints       : 0
-DEAL::  Reference matrix nonzeros: 12672, actually: 8974
-DEAL::  Test matrix 1 nonzeros: 12672, actually: 8974
+DEAL::  Reference matrix nonzeros: 12672, actually: 8480
+DEAL::  Test matrix 1 nonzeros: 12672, actually: 8480
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 12672, actually: 8974
+DEAL::  Test matrix 2 nonzeros: 12672, actually: 8480
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
 DEAL:cg::Starting value 20.
@@ -19,11 +19,11 @@ DEAL::
 DEAL::   Number of active cells:       309
 DEAL::   Number of degrees of freedom: 1575
 DEAL::   Number of constraints       : 187
-DEAL::  Reference matrix nonzeros: 25901, actually: 17333
-DEAL::  Test matrix 1 nonzeros: 25901, actually: 17333
+DEAL::  Reference matrix nonzeros: 25901, actually: 16531
+DEAL::  Test matrix 1 nonzeros: 25901, actually: 16531
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 25901, actually: 17333
+DEAL::  Test matrix 2 nonzeros: 25901, actually: 16531
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
 DEAL:cg::Starting value 22.
@@ -34,11 +34,11 @@ DEAL::
 DEAL::   Number of active cells:       450
 DEAL::   Number of degrees of freedom: 2692
 DEAL::   Number of constraints       : 475
-DEAL::  Reference matrix nonzeros: 51910, actually: 33908
-DEAL::  Test matrix 1 nonzeros: 51910, actually: 33908
+DEAL::  Reference matrix nonzeros: 51910, actually: 32730
+DEAL::  Test matrix 1 nonzeros: 51910, actually: 32730
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 51910, actually: 33908
+DEAL::  Test matrix 2 nonzeros: 51910, actually: 32730
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
 DEAL:cg::Starting value 25.

diff --git a/tests/deal.II/inhomogeneous_constraints/cmp/x86_64-unknown-linux-gnu+gcc4.2 b/tests/deal.II/inhomogeneous_constraints/cmp/x86_64-unknown-linux-gnu+gcc4.2
deleted file mode 100644 (file)
index 4fb98fd..0000000
--- a/tests/deal.II/inhomogeneous_constraints/cmp/x86_64-unknown-linux-gnu+gcc4.2
+++ /dev/null
@@ -1,46 +0,0 @@
-
-DEAL::
-DEAL::
-DEAL::   Number of active cells:       192
-DEAL::   Number of degrees of freedom: 864
-DEAL::   Number of constraints       : 0
-DEAL::  Reference matrix nonzeros: 12672, actually: 8974
-DEAL::  Test matrix 1 nonzeros: 12672, actually: 8974
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 12672, actually: 8974
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL:cg::Starting value 20.
-DEAL:cg::Convergence step 25 value 2.5e-07
-DEAL::Distribute error: 0
-DEAL::
-DEAL::
-DEAL::   Number of active cells:       309
-DEAL::   Number of degrees of freedom: 1575
-DEAL::   Number of constraints       : 187
-DEAL::  Reference matrix nonzeros: 25901, actually: 17333
-DEAL::  Test matrix 1 nonzeros: 25901, actually: 17333
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 25901, actually: 17333
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL:cg::Starting value 22.
-DEAL:cg::Convergence step 42 value 3.2e-07
-DEAL::Distribute error: 0
-DEAL::
-DEAL::
-DEAL::   Number of active cells:       450
-DEAL::   Number of degrees of freedom: 2692
-DEAL::   Number of constraints       : 475
-DEAL::  Reference matrix nonzeros: 51910, actually: 33906
-DEAL::  Test matrix 1 nonzeros: 51910, actually: 33906
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 51910, actually: 33906
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL:cg::Starting value 25.
-DEAL:cg::Convergence step 61 value 3.8e-07
-DEAL::Distribute error: 0

diff --git a/tests/deal.II/inhomogeneous_constraints/cmp/x86_64-unknown-linux-gnu+gcc4.3 b/tests/deal.II/inhomogeneous_constraints/cmp/x86_64-unknown-linux-gnu+gcc4.3
deleted file mode 100644 (file)
index d85cc69..0000000
--- a/tests/deal.II/inhomogeneous_constraints/cmp/x86_64-unknown-linux-gnu+gcc4.3
+++ /dev/null
@@ -1,46 +0,0 @@
-
-DEAL::
-DEAL::
-DEAL::   Number of active cells:       192
-DEAL::   Number of degrees of freedom: 864
-DEAL::   Number of constraints       : 0
-DEAL::  Reference matrix nonzeros: 12672, actually: 8974
-DEAL::  Test matrix 1 nonzeros: 12672, actually: 8974
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 12672, actually: 8974
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL:cg::Starting value 20.
-DEAL:cg::Convergence step 25 value 2.5e-07
-DEAL::Distribute error: 0
-DEAL::
-DEAL::
-DEAL::   Number of active cells:       309
-DEAL::   Number of degrees of freedom: 1575
-DEAL::   Number of constraints       : 187
-DEAL::  Reference matrix nonzeros: 25901, actually: 17333
-DEAL::  Test matrix 1 nonzeros: 25901, actually: 17333
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 25901, actually: 17333
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL:cg::Starting value 22.
-DEAL:cg::Convergence step 42 value 3.2e-07
-DEAL::Distribute error: 0
-DEAL::
-DEAL::
-DEAL::   Number of active cells:       450
-DEAL::   Number of degrees of freedom: 2692
-DEAL::   Number of constraints       : 475
-DEAL::  Reference matrix nonzeros: 51910, actually: 33908
-DEAL::  Test matrix 1 nonzeros: 51910, actually: 33908
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 51910, actually: 33908
-DEAL::  Matrix difference norm: 0
-DEAL::  RHS difference norm: 0
-DEAL:cg::Starting value 25.
-DEAL:cg::Convergence step 61 value 3.8e-07
-DEAL::Distribute error: 0

diff --git a/tests/deal.II/inhomogeneous_constraints_block.cc b/tests/deal.II/inhomogeneous_constraints_block.cc
index c1acbc970d770d9e2377a5da99743dd6d47d737f..379fecf3d7eee2b6a47c27453a622ee51158efbf 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints_block.cc
+++ b/tests/deal.II/inhomogeneous_constraints_block.cc
@@ -323,7 +323,7 @@ void AdvectionProblem<dim>::assemble_reference ()
                                      reference_rhs);
 
   deallog << "  Reference matrix nonzeros: " << reference_matrix.n_nonzero_elements() 
-         << ", actually: " << reference_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << reference_matrix.n_actually_nonzero_elements (1e-10) 
          << std::endl;
 }
 
@@ -398,7 +398,7 @@ void AdvectionProblem<dim>::assemble_test_1 ()
 
   test_all_constraints.condense (test_matrix, test_rhs);
   deallog << "  Test matrix 1 nonzeros: " << test_matrix.n_nonzero_elements() 
-         << ", actually: " << test_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-10) 
          << std::endl;
 
   test_equality();
@@ -473,7 +473,7 @@ void AdvectionProblem<dim>::assemble_test_2 ()
                                                       test_rhs);
     }
   deallog << "  Test matrix 2 nonzeros: " << test_matrix.n_nonzero_elements() 
-         << ", actually: " << test_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-10) 
          << std::endl;
   test_equality();
 }
@@ -521,7 +521,7 @@ int main ()
   logfile << std::setprecision (2);
   deallog.attach(logfile);
   deallog.depth_console(0);
-  deallog.threshold_double(1.e-12);
+  deallog.threshold_double(1.e-10);
 
   {
     AdvectionProblem<2> advection_problem;

diff --git a/tests/deal.II/inhomogeneous_constraints_block/cmp/generic b/tests/deal.II/inhomogeneous_constraints_block/cmp/generic
index b289fdd244f71099d89503fcba681e7929baaead..6f4fbbccac38a36a0c46f4d8866203e00725e4ff 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints_block/cmp/generic
+++ b/tests/deal.II/inhomogeneous_constraints_block/cmp/generic
@@ -4,11 +4,11 @@ DEAL::
 DEAL::  Number of active cells:       22
 DEAL::  Number of degrees of freedom: 228
 DEAL::  Number of constraints       : 18
-DEAL::  Reference matrix nonzeros: 6700, actually: 1402
-DEAL::  Test matrix 1 nonzeros: 6700, actually: 1402
+DEAL::  Reference matrix nonzeros: 6700, actually: 1254
+DEAL::  Test matrix 1 nonzeros: 6700, actually: 1254
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 6700, actually: 1396
+DEAL::  Test matrix 2 nonzeros: 6700, actually: 1254
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
 DEAL::
@@ -16,10 +16,10 @@ DEAL::
 DEAL::  Number of active cells:       78
 DEAL::  Number of degrees of freedom: 1856
 DEAL::  Number of constraints       : 174
-DEAL::  Reference matrix nonzeros: 189772, actually: 28840
-DEAL::  Test matrix 1 nonzeros: 189772, actually: 28840
+DEAL::  Reference matrix nonzeros: 189772, actually: 24098
+DEAL::  Test matrix 1 nonzeros: 189772, actually: 24194
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 189772, actually: 28832
+DEAL::  Test matrix 2 nonzeros: 189772, actually: 24108
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0

diff --git a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
index ff8f0afdf0522e105fdd0f4cd55484827d34baf0..f64e807a1120ca58d7c8b976ec652fe04265290e 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
+++ b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc
@@ -287,7 +287,7 @@ void AdvectionProblem<dim>::assemble_reference ()
                                      reference_rhs);
 
   deallog << "  Reference matrix nonzeros: " << reference_matrix.n_nonzero_elements() 
-         << ", actually: " << reference_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << reference_matrix.n_actually_nonzero_elements (1e-12) 
          << std::endl;
 }
 
@@ -357,7 +357,7 @@ void AdvectionProblem<dim>::assemble_test_1 ()
 
   test_all_constraints.condense (test_matrix, test_rhs);
   deallog << "  Test matrix 1 nonzeros: " << test_matrix.n_nonzero_elements() 
-         << ", actually: " << test_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-12) 
          << std::endl;
 
   test_equality();
@@ -427,7 +427,7 @@ void AdvectionProblem<dim>::assemble_test_2 ()
                                                       test_rhs);
     }
   deallog << "  Test matrix 2 nonzeros: " << test_matrix.n_nonzero_elements() 
-         << ", actually: " << test_matrix.n_actually_nonzero_elements () 
+         << ", actually: " << test_matrix.n_actually_nonzero_elements (1e-12) 
          << std::endl;
   test_equality();
 }

diff --git a/tests/deal.II/inhomogeneous_constraints_nonsymmetric/cmp/generic b/tests/deal.II/inhomogeneous_constraints_nonsymmetric/cmp/generic
index d6a10009e42e3a40c9eea3dcb47707b2b90b0190..468b03c5320ba82954d1db533396525aac5c5697 100644 (file)
--- a/tests/deal.II/inhomogeneous_constraints_nonsymmetric/cmp/generic
+++ b/tests/deal.II/inhomogeneous_constraints_nonsymmetric/cmp/generic
@@ -4,11 +4,11 @@ DEAL::
 DEAL::  Number of active cells:       22
 DEAL::  Number of degrees of freedom: 114
 DEAL::  Number of constraints       : 9
-DEAL::  Reference matrix nonzeros: 1618, actually: 701
-DEAL::  Test matrix 1 nonzeros: 1618, actually: 701
+DEAL::  Reference matrix nonzeros: 1618, actually: 627
+DEAL::  Test matrix 1 nonzeros: 1618, actually: 627
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 1618, actually: 698
+DEAL::  Test matrix 2 nonzeros: 1618, actually: 627
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
 DEAL::
@@ -16,10 +16,10 @@ DEAL::
 DEAL::  Number of active cells:       78
 DEAL::  Number of degrees of freedom: 928
 DEAL::  Number of constraints       : 87
-DEAL::  Reference matrix nonzeros: 46980, actually: 14420
-DEAL::  Test matrix 1 nonzeros: 46980, actually: 14420
+DEAL::  Reference matrix nonzeros: 46980, actually: 12049
+DEAL::  Test matrix 1 nonzeros: 46980, actually: 12097
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0
-DEAL::  Test matrix 2 nonzeros: 46980, actually: 14416
+DEAL::  Test matrix 2 nonzeros: 46980, actually: 12054
 DEAL::  Matrix difference norm: 0
 DEAL::  RHS difference norm: 0