From: bangerth Date: Fri, 8 Jun 2007 13:15:41 +0000 (+0000) Subject: Move the rest of the hp stuff into its own directory. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad437a91ee012c04d2bd8eb8ab236a6a927d9ff0;p=dealii-svn.git Move the rest of the hp stuff into its own directory. git-svn-id: https://svn.dealii.org/trunk@14772 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/base/quadrature_test.cc b/tests/base/quadrature_test.cc index 4a4e59f8ac..6035bf98c6 100644 --- a/tests/base/quadrature_test.cc +++ b/tests/base/quadrature_test.cc @@ -90,7 +90,7 @@ check_cells (std::vector*>& quadratures) exact_int=1./std::pow(static_cast(i+1),dim); err = std::fabs(quadrature_int-exact_int); } - while (err<1e-15); + while (err<1e-14); // Uncomment here for testing // deallog << " (Int " << quadrature_int << ',' << exact_int << ")"; deallog << " is exact for polynomials of degree " << i-1 << std::endl; diff --git a/tests/bits/fe_collection_01.cc b/tests/bits/fe_collection_01.cc index 4d1f4d8537..fea33776be 100644 --- a/tests/bits/fe_collection_01.cc +++ b/tests/bits/fe_collection_01.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/deal.II/derivatives.cc b/tests/deal.II/derivatives.cc index 40221a2adf..18c7c3232a 100644 --- a/tests/deal.II/derivatives.cc +++ b/tests/deal.II/derivatives.cc @@ -36,6 +36,7 @@ const bool errors = false; #include #include #include +#include #include #include #include diff --git a/tests/deal.II/sparsity_pattern_05.cc b/tests/deal.II/sparsity_pattern_05.cc new file mode 100644 index 0000000000..c7248150e9 --- /dev/null +++ b/tests/deal.II/sparsity_pattern_05.cc @@ -0,0 +1,200 @@ +//---------------------------- sparsity_pattern_05.cc --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 2000, 2001, 2003, 2004, 2007 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- sparsity_pattern_05.cc --------------------------- + + +// check that generating a sparsity pattern without constraints and later +// calling constraints.condense() on it results in the same pattern as when +// creating the condensed pattern right away + + +#include "../tests.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + + + +bool operator == (const SparsityPattern &sp1, + const SparsityPattern &sp2) +{ + if (sp1.n_nonzero_elements() != sp2.n_nonzero_elements()) + return false; + + for (unsigned int i=0; i +void +check () +{ + Triangulation tr; + if (dim==2) + GridGenerator::hyper_ball(tr, Point(), 1); + else + GridGenerator::hyper_cube(tr, -1,1); + tr.refine_global (1); + tr.begin_active()->set_refine_flag (); + tr.execute_coarsening_and_refinement (); + tr.begin_active(2)->set_refine_flag (); + tr.execute_coarsening_and_refinement (); + if (dim==1) + tr.refine_global(2); + + // create a system element composed + // of one Q1 and one Q2 element + FESystem element(FE_Q(1), 1, + FE_Q(2), 1); + DoFHandler dof(tr); + dof.distribute_dofs(element); + + ConstraintMatrix constraints; + DoFTools::make_hanging_node_constraints (dof, constraints); + constraints.close (); + + +//--------------- Regular sparsity pattern checks ----------------- + + // first way: directly + SparsityPattern sparsity_1 (dof.n_dofs(), dof.n_dofs()); + DoFTools::make_sparsity_pattern (dof, sparsity_1); + constraints.condense (sparsity_1); + sparsity_1.compress (); + + // second way: via direct elimination of + // constraints + SparsityPattern sparsity_2; + CompressedSparsityPattern csp_2 (dof.n_dofs()); + DoFTools::make_sparsity_pattern (dof, csp_2, constraints); + sparsity_2.copy_from (csp_2); + + + // the exact content of sparsity + // patterns is checked in other + // tests, so only make sure that + // sparsity_[12] are equal + deallog << "Check 1:" + << " -- " + << (sparsity_1 == sparsity_2 ? "ok" : "failed") + << std::endl; + + + +//--------------- Block sparsity pattern checks ----------------- + + const unsigned int n = dof.n_dofs(); + const unsigned int n1 = n/3; + const unsigned int n2 = n - n1; + + BlockSparsityPattern sparsity_3(2,2); + sparsity_3.block(0,0).reinit (n1,n1,n); + sparsity_3.block(1,0).reinit (n2,n1,n); + sparsity_3.block(0,1).reinit (n1,n2,n); + sparsity_3.block(1,1).reinit (n2,n2,n); + sparsity_3.collect_sizes (); + + DoFTools::make_sparsity_pattern (dof, sparsity_3); + constraints.condense (sparsity_3); + sparsity_3.compress (); + + BlockSparsityPattern sparsity_4; + CompressedBlockSparsityPattern csp_4(2,2); + csp_4.block(0,0).reinit (n1,n1); + csp_4.block(1,0).reinit (n2,n1); + csp_4.block(0,1).reinit (n1,n2); + csp_4.block(1,1).reinit (n2,n2); + csp_4.collect_sizes (); + + DoFTools::make_sparsity_pattern (dof, csp_4, constraints); + csp_4.compress (); + + sparsity_4.copy_from (csp_4); + + deallog << "Check 2:" + << " -- " + << (sparsity_3 == sparsity_4 ? "ok" : "failed") + << std::endl; +} + + + +int main () +{ + std::ofstream logfile ("sparsity_pattern_05/output"); + logfile.precision (2); + logfile.setf(std::ios::fixed); + deallog.attach(logfile); + deallog.depth_console (0); + + deallog.push ("1d"); + check<1> (); + deallog.pop (); + deallog.push ("2d"); + check<2> (); + deallog.pop (); + deallog.push ("3d"); + check<3> (); + deallog.pop (); +} diff --git a/tests/deal.II/sparsity_pattern_05/cmp/generic b/tests/deal.II/sparsity_pattern_05/cmp/generic new file mode 100644 index 0000000000..73a9c0b38e --- /dev/null +++ b/tests/deal.II/sparsity_pattern_05/cmp/generic @@ -0,0 +1,7 @@ + +DEAL:1d::Check 1: -- ok +DEAL:1d::Check 2: -- ok +DEAL:2d::Check 1: -- ok +DEAL:2d::Check 2: -- ok +DEAL:3d::Check 1: -- ok +DEAL:3d::Check 2: -- ok diff --git a/tests/deal.II/vectors_boundary_rhs_01.cc b/tests/deal.II/vectors_boundary_rhs_01.cc index 2e2fc8d889..db8e0baa42 100644 --- a/tests/deal.II/vectors_boundary_rhs_01.cc +++ b/tests/deal.II/vectors_boundary_rhs_01.cc @@ -30,10 +30,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/deal.II/vectors_boundary_rhs_02.cc b/tests/deal.II/vectors_boundary_rhs_02.cc index e0e8467547..129b57e017 100644 --- a/tests/deal.II/vectors_boundary_rhs_02.cc +++ b/tests/deal.II/vectors_boundary_rhs_02.cc @@ -31,10 +31,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/deal.II/vectors_boundary_rhs_03.cc b/tests/deal.II/vectors_boundary_rhs_03.cc index 008374a062..d7ea83d14f 100644 --- a/tests/deal.II/vectors_boundary_rhs_03.cc +++ b/tests/deal.II/vectors_boundary_rhs_03.cc @@ -31,10 +31,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/deal.II/vectors_point_source_01.cc b/tests/deal.II/vectors_point_source_01.cc index c0c7c84d52..413e1904f2 100644 --- a/tests/deal.II/vectors_point_source_01.cc +++ b/tests/deal.II/vectors_point_source_01.cc @@ -31,10 +31,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/deal.II/vectors_rhs_01.cc b/tests/deal.II/vectors_rhs_01.cc index cc43468f1e..fa85e9b77b 100644 --- a/tests/deal.II/vectors_rhs_01.cc +++ b/tests/deal.II/vectors_rhs_01.cc @@ -30,10 +30,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/deal.II/vectors_rhs_03.cc b/tests/deal.II/vectors_rhs_03.cc index 828487e618..2223d1411a 100644 --- a/tests/deal.II/vectors_rhs_03.cc +++ b/tests/deal.II/vectors_rhs_03.cc @@ -31,10 +31,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc index a28ee8bd5d..c7d4f7a0eb 100644 --- a/tests/fail/hp-step-15.cc +++ b/tests/fail/hp-step-15.cc @@ -41,7 +41,7 @@ std::ofstream logfile("step-15/output"); #include #include #include -#include +#include #include #include #include diff --git a/tests/fail/vectors_boundary_rhs_hp_02.cc b/tests/fail/vectors_boundary_rhs_hp_02.cc index 7775ea2d19..11711387fd 100644 --- a/tests/fail/vectors_boundary_rhs_hp_02.cc +++ b/tests/fail/vectors_boundary_rhs_hp_02.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/fail/vectors_rhs_hp_02.cc b/tests/fail/vectors_rhs_hp_02.cc index 817edec225..b68a7ba490 100644 --- a/tests/fail/vectors_rhs_hp_02.cc +++ b/tests/fail/vectors_rhs_hp_02.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/fe/non_primitive_2.cc b/tests/fe/non_primitive_2.cc index 5b5bcc7033..7c02c4fec4 100644 --- a/tests/fe/non_primitive_2.cc +++ b/tests/fe/non_primitive_2.cc @@ -2,7 +2,7 @@ // non_primitive_2.cc,v 1.5 2003/04/21 07:31:15 guido Exp // Version: // -// Copyright (C) 2001, 2002, 2003, 2005 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2005, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/hp/fe_collection_01.cc b/tests/hp/fe_collection_01.cc index b99e5bfc18..2710e9474b 100644 --- a/tests/hp/fe_collection_01.cc +++ b/tests/hp/fe_collection_01.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_constraints_common.h b/tests/hp/hp_constraints_common.h index 0b1a4a3d92..debaa5b43f 100644 --- a/tests/hp/hp_constraints_common.h +++ b/tests/hp/hp_constraints_common.h @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/hp/hp_hanging_nodes_01.cc b/tests/hp/hp_hanging_nodes_01.cc index 9bd89f44ba..7ea1417e92 100644 --- a/tests/hp/hp_hanging_nodes_01.cc +++ b/tests/hp/hp_hanging_nodes_01.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp.cc b/tests/hp/hp_line_dof_identities_dgp.cc index 8ae946e040..89a8ee8981 100644 --- a/tests/hp/hp_line_dof_identities_dgp.cc +++ b/tests/hp/hp_line_dof_identities_dgp.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp_monomial.cc b/tests/hp/hp_line_dof_identities_dgp_monomial.cc index aa13859b3e..94532f8c96 100644 --- a/tests/hp/hp_line_dof_identities_dgp_monomial.cc +++ b/tests/hp/hp_line_dof_identities_dgp_monomial.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp_monomial_system_01.cc b/tests/hp/hp_line_dof_identities_dgp_monomial_system_01.cc index 8f38a89321..822df1efcf 100644 --- a/tests/hp/hp_line_dof_identities_dgp_monomial_system_01.cc +++ b/tests/hp/hp_line_dof_identities_dgp_monomial_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp_monomial_system_02.cc b/tests/hp/hp_line_dof_identities_dgp_monomial_system_02.cc index 2e4e785429..9eb4dc2a96 100644 --- a/tests/hp/hp_line_dof_identities_dgp_monomial_system_02.cc +++ b/tests/hp/hp_line_dof_identities_dgp_monomial_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp_nonparametric.cc b/tests/hp/hp_line_dof_identities_dgp_nonparametric.cc index 7cf91c6136..dc794b9d44 100644 --- a/tests/hp/hp_line_dof_identities_dgp_nonparametric.cc +++ b/tests/hp/hp_line_dof_identities_dgp_nonparametric.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp_nonparametric_system_01.cc b/tests/hp/hp_line_dof_identities_dgp_nonparametric_system_01.cc index b838c6787a..bb819e4f2b 100644 --- a/tests/hp/hp_line_dof_identities_dgp_nonparametric_system_01.cc +++ b/tests/hp/hp_line_dof_identities_dgp_nonparametric_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp_nonparametric_system_02.cc b/tests/hp/hp_line_dof_identities_dgp_nonparametric_system_02.cc index 7663d07c78..645fd8dd05 100644 --- a/tests/hp/hp_line_dof_identities_dgp_nonparametric_system_02.cc +++ b/tests/hp/hp_line_dof_identities_dgp_nonparametric_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp_system_01.cc b/tests/hp/hp_line_dof_identities_dgp_system_01.cc index e4f4354259..20c9d92175 100644 --- a/tests/hp/hp_line_dof_identities_dgp_system_01.cc +++ b/tests/hp/hp_line_dof_identities_dgp_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgp_system_02.cc b/tests/hp/hp_line_dof_identities_dgp_system_02.cc index 1d72c32ebd..e53e8173aa 100644 --- a/tests/hp/hp_line_dof_identities_dgp_system_02.cc +++ b/tests/hp/hp_line_dof_identities_dgp_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgq.cc b/tests/hp/hp_line_dof_identities_dgq.cc index 2591d5cdd7..70895b382a 100644 --- a/tests/hp/hp_line_dof_identities_dgq.cc +++ b/tests/hp/hp_line_dof_identities_dgq.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgq_system_01.cc b/tests/hp/hp_line_dof_identities_dgq_system_01.cc index 929d37e232..58b75a2e12 100644 --- a/tests/hp/hp_line_dof_identities_dgq_system_01.cc +++ b/tests/hp/hp_line_dof_identities_dgq_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_dgq_system_02.cc b/tests/hp/hp_line_dof_identities_dgq_system_02.cc index 64340a5511..69d497b88d 100644 --- a/tests/hp/hp_line_dof_identities_dgq_system_02.cc +++ b/tests/hp/hp_line_dof_identities_dgq_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_q.cc b/tests/hp/hp_line_dof_identities_q.cc index 19cc8415a9..c89589ccbb 100644 --- a/tests/hp/hp_line_dof_identities_q.cc +++ b/tests/hp/hp_line_dof_identities_q.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_q_system_01.cc b/tests/hp/hp_line_dof_identities_q_system_01.cc index 25d33c55c3..c8a11fbd16 100644 --- a/tests/hp/hp_line_dof_identities_q_system_01.cc +++ b/tests/hp/hp_line_dof_identities_q_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_q_system_02.cc b/tests/hp/hp_line_dof_identities_q_system_02.cc index ebe528ec0f..c5d7e24778 100644 --- a/tests/hp/hp_line_dof_identities_q_system_02.cc +++ b/tests/hp/hp_line_dof_identities_q_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_line_dof_identities_q_system_03.cc b/tests/hp/hp_line_dof_identities_q_system_03.cc index 4de7b88319..6f54e065c0 100644 --- a/tests/hp/hp_line_dof_identities_q_system_03.cc +++ b/tests/hp/hp_line_dof_identities_q_system_03.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include -#include +#include #include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp.cc b/tests/hp/hp_quad_dof_identities_dgp.cc index 4022061bb4..cb0e7d5eb7 100644 --- a/tests/hp/hp_quad_dof_identities_dgp.cc +++ b/tests/hp/hp_quad_dof_identities_dgp.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp_monomial.cc b/tests/hp/hp_quad_dof_identities_dgp_monomial.cc index d2a1866556..062fd39042 100644 --- a/tests/hp/hp_quad_dof_identities_dgp_monomial.cc +++ b/tests/hp/hp_quad_dof_identities_dgp_monomial.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp_monomial_system_01.cc b/tests/hp/hp_quad_dof_identities_dgp_monomial_system_01.cc index e1132730a8..fbdce9ce69 100644 --- a/tests/hp/hp_quad_dof_identities_dgp_monomial_system_01.cc +++ b/tests/hp/hp_quad_dof_identities_dgp_monomial_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp_monomial_system_02.cc b/tests/hp/hp_quad_dof_identities_dgp_monomial_system_02.cc index e680aa150f..850a4028fb 100644 --- a/tests/hp/hp_quad_dof_identities_dgp_monomial_system_02.cc +++ b/tests/hp/hp_quad_dof_identities_dgp_monomial_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp_nonparametric.cc b/tests/hp/hp_quad_dof_identities_dgp_nonparametric.cc index 9864b6ce09..129c5be71c 100644 --- a/tests/hp/hp_quad_dof_identities_dgp_nonparametric.cc +++ b/tests/hp/hp_quad_dof_identities_dgp_nonparametric.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp_nonparametric_system_01.cc b/tests/hp/hp_quad_dof_identities_dgp_nonparametric_system_01.cc index 5b2198b903..734e7b299d 100644 --- a/tests/hp/hp_quad_dof_identities_dgp_nonparametric_system_01.cc +++ b/tests/hp/hp_quad_dof_identities_dgp_nonparametric_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp_nonparametric_system_02.cc b/tests/hp/hp_quad_dof_identities_dgp_nonparametric_system_02.cc index badaecd545..ed057f206e 100644 --- a/tests/hp/hp_quad_dof_identities_dgp_nonparametric_system_02.cc +++ b/tests/hp/hp_quad_dof_identities_dgp_nonparametric_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp_system_01.cc b/tests/hp/hp_quad_dof_identities_dgp_system_01.cc index f1822a5d88..241b65a002 100644 --- a/tests/hp/hp_quad_dof_identities_dgp_system_01.cc +++ b/tests/hp/hp_quad_dof_identities_dgp_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgp_system_02.cc b/tests/hp/hp_quad_dof_identities_dgp_system_02.cc index a1ef550cdb..09c2b4b34a 100644 --- a/tests/hp/hp_quad_dof_identities_dgp_system_02.cc +++ b/tests/hp/hp_quad_dof_identities_dgp_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgq.cc b/tests/hp/hp_quad_dof_identities_dgq.cc index 6a05f1fe0d..6007fa3d79 100644 --- a/tests/hp/hp_quad_dof_identities_dgq.cc +++ b/tests/hp/hp_quad_dof_identities_dgq.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgq_system_01.cc b/tests/hp/hp_quad_dof_identities_dgq_system_01.cc index c5c3dd61c0..13d7689f39 100644 --- a/tests/hp/hp_quad_dof_identities_dgq_system_01.cc +++ b/tests/hp/hp_quad_dof_identities_dgq_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_dgq_system_02.cc b/tests/hp/hp_quad_dof_identities_dgq_system_02.cc index 4da83a866f..d585a734d8 100644 --- a/tests/hp/hp_quad_dof_identities_dgq_system_02.cc +++ b/tests/hp/hp_quad_dof_identities_dgq_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_q.cc b/tests/hp/hp_quad_dof_identities_q.cc index cd2fc095ea..c4f5047852 100644 --- a/tests/hp/hp_quad_dof_identities_q.cc +++ b/tests/hp/hp_quad_dof_identities_q.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_q_system_01.cc b/tests/hp/hp_quad_dof_identities_q_system_01.cc index 82a464d302..d4adf322fc 100644 --- a/tests/hp/hp_quad_dof_identities_q_system_01.cc +++ b/tests/hp/hp_quad_dof_identities_q_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_quad_dof_identities_q_system_02.cc b/tests/hp/hp_quad_dof_identities_q_system_02.cc index 1cb4c55850..5d8994169b 100644 --- a/tests/hp/hp_quad_dof_identities_q_system_02.cc +++ b/tests/hp/hp_quad_dof_identities_q_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp.cc b/tests/hp/hp_vertex_dof_identities_dgp.cc index 0215a93c0b..ae7d6221ba 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp_monomial.cc b/tests/hp/hp_vertex_dof_identities_dgp_monomial.cc index c87c29acd8..28f2ec4fa7 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp_monomial.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp_monomial.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp_monomial_system_01.cc b/tests/hp/hp_vertex_dof_identities_dgp_monomial_system_01.cc index 82ec020c6f..3e271dd8a4 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp_monomial_system_01.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp_monomial_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp_monomial_system_02.cc b/tests/hp/hp_vertex_dof_identities_dgp_monomial_system_02.cc index 94d0bbf0a1..ed8d801fc8 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp_monomial_system_02.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp_monomial_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp_nonparametric.cc b/tests/hp/hp_vertex_dof_identities_dgp_nonparametric.cc index 565c1a2519..77b908b9a2 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp_nonparametric.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp_nonparametric.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp_nonparametric_system_01.cc b/tests/hp/hp_vertex_dof_identities_dgp_nonparametric_system_01.cc index ee37805b92..3839747c44 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp_nonparametric_system_01.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp_nonparametric_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp_nonparametric_system_02.cc b/tests/hp/hp_vertex_dof_identities_dgp_nonparametric_system_02.cc index 38ae73ea77..6d62139bec 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp_nonparametric_system_02.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp_nonparametric_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp_system_01.cc b/tests/hp/hp_vertex_dof_identities_dgp_system_01.cc index 68448dc645..238bb049e0 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp_system_01.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgp_system_02.cc b/tests/hp/hp_vertex_dof_identities_dgp_system_02.cc index 3b13d8dc81..9e1eb67e3d 100644 --- a/tests/hp/hp_vertex_dof_identities_dgp_system_02.cc +++ b/tests/hp/hp_vertex_dof_identities_dgp_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgq.cc b/tests/hp/hp_vertex_dof_identities_dgq.cc index a75bce056b..d970f707af 100644 --- a/tests/hp/hp_vertex_dof_identities_dgq.cc +++ b/tests/hp/hp_vertex_dof_identities_dgq.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgq_system_01.cc b/tests/hp/hp_vertex_dof_identities_dgq_system_01.cc index d314e82baf..1e259881a9 100644 --- a/tests/hp/hp_vertex_dof_identities_dgq_system_01.cc +++ b/tests/hp/hp_vertex_dof_identities_dgq_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_dgq_system_02.cc b/tests/hp/hp_vertex_dof_identities_dgq_system_02.cc index 3e4e96aa66..1e7e8ce41c 100644 --- a/tests/hp/hp_vertex_dof_identities_dgq_system_02.cc +++ b/tests/hp/hp_vertex_dof_identities_dgq_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_q.cc b/tests/hp/hp_vertex_dof_identities_q.cc index 97e01822f8..ff71e13fb4 100644 --- a/tests/hp/hp_vertex_dof_identities_q.cc +++ b/tests/hp/hp_vertex_dof_identities_q.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_q_system_01.cc b/tests/hp/hp_vertex_dof_identities_q_system_01.cc index d8bfe9d29f..e261feb445 100644 --- a/tests/hp/hp_vertex_dof_identities_q_system_01.cc +++ b/tests/hp/hp_vertex_dof_identities_q_system_01.cc @@ -17,7 +17,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/hp_vertex_dof_identities_q_system_02.cc b/tests/hp/hp_vertex_dof_identities_q_system_02.cc index 1e6f935e7a..0e7f62a595 100644 --- a/tests/hp/hp_vertex_dof_identities_q_system_02.cc +++ b/tests/hp/hp_vertex_dof_identities_q_system_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/integrate_difference.cc b/tests/hp/integrate_difference.cc index 9ea2e7059a..6af021d86b 100644 --- a/tests/hp/integrate_difference.cc +++ b/tests/hp/integrate_difference.cc @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/tests/hp/interpolate_dgq_01.cc b/tests/hp/interpolate_dgq_01.cc index 8ec8b0d820..8ed01ce1b3 100644 --- a/tests/hp/interpolate_dgq_01.cc +++ b/tests/hp/interpolate_dgq_01.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/hp/interpolate_dgq_02.cc b/tests/hp/interpolate_dgq_02.cc index d4aef7f6e3..3ced75b7bc 100644 --- a/tests/hp/interpolate_dgq_02.cc +++ b/tests/hp/interpolate_dgq_02.cc @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/hp/interpolate_q_01.cc b/tests/hp/interpolate_q_01.cc index fd48b4dd11..9d0fa99ebb 100644 --- a/tests/hp/interpolate_q_01.cc +++ b/tests/hp/interpolate_q_01.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/hp/interpolate_q_02.cc b/tests/hp/interpolate_q_02.cc index 5cc66aa2eb..1750cb5c2f 100644 --- a/tests/hp/interpolate_q_02.cc +++ b/tests/hp/interpolate_q_02.cc @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/hp/interpolate_q_system_01.cc b/tests/hp/interpolate_q_system_01.cc index 996d4c023c..2758187104 100644 --- a/tests/hp/interpolate_q_system_01.cc +++ b/tests/hp/interpolate_q_system_01.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/hp/interpolate_q_system_02.cc b/tests/hp/interpolate_q_system_02.cc index 5d7e352154..811f3d1a68 100644 --- a/tests/hp/interpolate_q_system_02.cc +++ b/tests/hp/interpolate_q_system_02.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include diff --git a/tests/hp/mapping_collection_01.cc b/tests/hp/mapping_collection_01.cc index d90f10eb7b..e44b91a691 100644 --- a/tests/hp/mapping_collection_01.cc +++ b/tests/hp/mapping_collection_01.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/mapping_collection_02.cc b/tests/hp/mapping_collection_02.cc index 6f8c3dc0de..94aaad1dcb 100644 --- a/tests/hp/mapping_collection_02.cc +++ b/tests/hp/mapping_collection_02.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/mapping_collection_03.cc b/tests/hp/mapping_collection_03.cc index a778e61e23..35d3030370 100644 --- a/tests/hp/mapping_collection_03.cc +++ b/tests/hp/mapping_collection_03.cc @@ -19,7 +19,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/mapping_collection_04.cc b/tests/hp/mapping_collection_04.cc index 61507598d5..7f3423246b 100644 --- a/tests/hp/mapping_collection_04.cc +++ b/tests/hp/mapping_collection_04.cc @@ -18,7 +18,7 @@ #include "../tests.h" #include -#include +#include #include #include diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc index 977ea2b831..10156272bd 100644 --- a/tests/hp/matrices.cc +++ b/tests/hp/matrices.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc index 1292b33b25..4976832d52 100644 --- a/tests/hp/matrices_hp.cc +++ b/tests/hp/matrices_hp.cc @@ -30,10 +30,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/q_collection_01.cc b/tests/hp/q_collection_01.cc index 114821349a..0eca0efaad 100644 --- a/tests/hp/q_collection_01.cc +++ b/tests/hp/q_collection_01.cc @@ -20,7 +20,7 @@ #include "../tests.h" #include #include -#include +#include #include diff --git a/tests/hp/vectors_boundary_rhs_01.cc b/tests/hp/vectors_boundary_rhs_01.cc index 0279039bee..ce6756883a 100644 --- a/tests/hp/vectors_boundary_rhs_01.cc +++ b/tests/hp/vectors_boundary_rhs_01.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_boundary_rhs_02.cc b/tests/hp/vectors_boundary_rhs_02.cc index 4065a92472..39ccc7e787 100644 --- a/tests/hp/vectors_boundary_rhs_02.cc +++ b/tests/hp/vectors_boundary_rhs_02.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_boundary_rhs_03.cc b/tests/hp/vectors_boundary_rhs_03.cc index 6713c3ca07..b3549cff92 100644 --- a/tests/hp/vectors_boundary_rhs_03.cc +++ b/tests/hp/vectors_boundary_rhs_03.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_boundary_rhs_hp_01.cc b/tests/hp/vectors_boundary_rhs_hp_01.cc index 87e716e422..643d29d53c 100644 --- a/tests/hp/vectors_boundary_rhs_hp_01.cc +++ b/tests/hp/vectors_boundary_rhs_hp_01.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_boundary_rhs_hp_03.cc b/tests/hp/vectors_boundary_rhs_hp_03.cc index e5e01b2b00..4831ea70c4 100644 --- a/tests/hp/vectors_boundary_rhs_hp_03.cc +++ b/tests/hp/vectors_boundary_rhs_hp_03.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_point_source_01.cc b/tests/hp/vectors_point_source_01.cc index f779821199..8caaa2aa87 100644 --- a/tests/hp/vectors_point_source_01.cc +++ b/tests/hp/vectors_point_source_01.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_point_source_hp_01.cc b/tests/hp/vectors_point_source_hp_01.cc index e0b0037161..c9e252fcc2 100644 --- a/tests/hp/vectors_point_source_hp_01.cc +++ b/tests/hp/vectors_point_source_hp_01.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_rhs_01.cc b/tests/hp/vectors_rhs_01.cc index 824dfdd7b4..ee959dd2c8 100644 --- a/tests/hp/vectors_rhs_01.cc +++ b/tests/hp/vectors_rhs_01.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_rhs_02.cc b/tests/hp/vectors_rhs_02.cc index b8ca612b31..e482f9c6ea 100644 --- a/tests/hp/vectors_rhs_02.cc +++ b/tests/hp/vectors_rhs_02.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_rhs_03.cc b/tests/hp/vectors_rhs_03.cc index cc0cfe6072..0672d03f37 100644 --- a/tests/hp/vectors_rhs_03.cc +++ b/tests/hp/vectors_rhs_03.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_rhs_hp_01.cc b/tests/hp/vectors_rhs_hp_01.cc index 845b22edb8..1b480191cf 100644 --- a/tests/hp/vectors_rhs_hp_01.cc +++ b/tests/hp/vectors_rhs_hp_01.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/hp/vectors_rhs_hp_03.cc b/tests/hp/vectors_rhs_hp_03.cc index e465f51086..1f9104ccce 100644 --- a/tests/hp/vectors_rhs_hp_03.cc +++ b/tests/hp/vectors_rhs_hp_03.cc @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/tests/petsc/petsc_full_matrix_05.cc b/tests/petsc/petsc_full_matrix_05.cc index 30c69ae739..602905b971 100644 --- a/tests/petsc/petsc_full_matrix_05.cc +++ b/tests/petsc/petsc_full_matrix_05.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2004, 2005 by the deal.II authors +// Copyright (C) 2004, 2005, 2007 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -36,9 +36,24 @@ void test (PETScWrappers::FullMatrix &m) m.compress (); + // prior to and including PETSc 2.3.0, + // n_nonzero_elements returns the actual + // number of nonzeros. after that, PETSc + // returns the *total* number of entries of + // this matrix. check both (in the case + // post 2.3.0, output a dummy number +#if (DEAL_II_PETSC_VERSION_MAJOR == 2) &&\ + ((DEAL_II_PETSC_VERSION_MINOR < 3) \ + || + ((DEAL_II_PETSC_VERSION_MINOR == 3) \ + ((DEAL_II_PETSC_VERSION_SUBMINOR == 3)))) deallog << m.n_nonzero_elements() << std::endl; Assert (m.n_nonzero_elements() == counter, ExcInternalError()); +#else + deallog << counter() << std::endl; + Assert (m.m() * m.m(), ExcInternalError()); +#endif deallog << "OK" << std::endl; }