From: kronbichler Date: Tue, 21 Apr 2009 09:27:37 +0000 (+0000) Subject: Update the number of actually nonzero elements. Count only elements larger than a... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea4dd0fb4f53d7b1c4178d7ce0c6e95ac4d0ab1;p=dealii-svn.git Update the number of actually nonzero elements. Count only elements larger than a given threshold. 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 2345adc30e..17b3284f2a 100644 --- a/tests/deal.II/inhomogeneous_constraints.cc +++ b/tests/deal.II/inhomogeneous_constraints.cc @@ -310,7 +310,7 @@ void LaplaceProblem::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::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::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 d85cc69215..ff2340e4a3 100644 --- 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 index 4fb98fd1fa..0000000000 --- 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 index d85cc69215..0000000000 --- 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 c1acbc970d..379fecf3d7 100644 --- a/tests/deal.II/inhomogeneous_constraints_block.cc +++ b/tests/deal.II/inhomogeneous_constraints_block.cc @@ -323,7 +323,7 @@ void AdvectionProblem::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::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::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 b289fdd244..6f4fbbccac 100644 --- 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 ff8f0afdf0..f64e807a11 100644 --- a/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc +++ b/tests/deal.II/inhomogeneous_constraints_nonsymmetric.cc @@ -287,7 +287,7 @@ void AdvectionProblem::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::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::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 d6a10009e4..468b03c532 100644 --- 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