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 4a4e59f8ac7e7dd5ab5fbd1cfe700f04087e05bb..6035bf98c67298f85003f6638ef188a1c8d6251c 100644 (file)
--- a/tests/base/quadrature_test.cc
+++ b/tests/base/quadrature_test.cc
@@ -90,7 +90,7 @@ check_cells (std::vector<Quadrature<dim>*>& quadratures)
          exact_int=1./std::pow(static_cast<double>(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 4d1f4d853728554b6210ff3d6a76b3cd6eab3341..fea33776bee8bd246e282c28cd087d290c9b91d7 100644 (file)
--- a/tests/bits/fe_collection_01.cc
+++ b/tests/bits/fe_collection_01.cc
@@ -21,7 +21,7 @@
 #include <grid/grid_generator.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_handler.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 
 #include <fstream>

diff --git a/tests/deal.II/derivatives.cc b/tests/deal.II/derivatives.cc
index 40221a2adf032e1d2baa35970d621508003f92cc..18c7c3232af72d1d5ea00d2b3b5e4407252b51af 100644 (file)
--- a/tests/deal.II/derivatives.cc
+++ b/tests/deal.II/derivatives.cc
@@ -36,6 +36,7 @@ const bool errors = false;
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
+#include <dofs/dof_constraints.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>

diff --git a/tests/deal.II/sparsity_pattern_05.cc b/tests/deal.II/sparsity_pattern_05.cc
new file mode 100644 (file)
index 0000000..c724815
--- /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 <base/logstream.h>
+#include <lac/sparsity_pattern.h>
+#include <lac/block_sparsity_pattern.h>
+#include <lac/compressed_sparsity_pattern.h>
+#include <grid/tria.h>
+#include <grid/tria_iterator.h>
+#include <grid/tria_accessor.h>
+#include <grid/grid_generator.h>
+#include <dofs/dof_handler.h>
+#include <dofs/dof_tools.h>
+#include <dofs/dof_constraints.h>
+#include <fe/fe_q.h>
+#include <fe/fe_system.h>
+
+#include <fstream>
+
+
+
+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<sp1.n_nonzero_elements(); ++i)
+    if (sp1.get_column_numbers()[i] !=
+       sp2.get_column_numbers()[i])
+      {
+       Assert (false, ExcInternalError());
+       return false;
+      }
+
+  for (unsigned int i=0; i<sp1.n_rows(); ++i)
+    if (sp1.get_rowstart_indices()[i] !=
+       sp2.get_rowstart_indices()[i])
+      {
+       Assert (false, ExcInternalError());
+       return false;
+      }
+  
+  return true;
+}
+
+
+
+bool operator == (const BlockSparsityPattern &sp1,
+                 const BlockSparsityPattern &sp2)
+{
+  if (sp1.n_block_rows() != sp2.n_block_rows())
+    return false;
+  
+  if (sp1.n_block_cols() != sp2.n_block_cols())
+    return false;
+  
+  for (unsigned int i=0; i<sp1.n_block_rows(); ++i)
+    for (unsigned int j=0; j<sp1.n_block_cols(); ++j)
+      if (!(sp1.block(i,j) == sp2.block(i,j)))
+       {
+         Assert (false, ExcInternalError());
+         return false;
+       }
+  
+  return true;
+}
+
+
+
+
+template <int dim>
+void
+check ()
+{
+  Triangulation<dim> tr;  
+  if (dim==2)
+    GridGenerator::hyper_ball(tr, Point<dim>(), 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<dim> element(FE_Q<dim>(1), 1,
+                       FE_Q<dim>(2), 1);
+  DoFHandler<dim> 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 (file)
index 0000000..73a9c0b
--- /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 2e2fc8d8899dcacb2d24b07ad6f83d3b3c5fe826..db8e0baa4241b5917a4a8bcdb1da0ba41993be1f 100644 (file)
--- a/tests/deal.II/vectors_boundary_rhs_01.cc
+++ b/tests/deal.II/vectors_boundary_rhs_01.cc
@@ -30,10 +30,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/deal.II/vectors_boundary_rhs_02.cc b/tests/deal.II/vectors_boundary_rhs_02.cc
index e0e84675476df48841a97391cd81b085962fbdc5..129b57e0173c9336c5a3ab7a1c6681dbde39fda4 100644 (file)
--- a/tests/deal.II/vectors_boundary_rhs_02.cc
+++ b/tests/deal.II/vectors_boundary_rhs_02.cc
@@ -31,10 +31,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/deal.II/vectors_boundary_rhs_03.cc b/tests/deal.II/vectors_boundary_rhs_03.cc
index 008374a0623d8c2f9ca0ebd98ab21364a9b8abd5..d7ea83d14faf3c7e42cfc7ad1cc19e5b3379dade 100644 (file)
--- a/tests/deal.II/vectors_boundary_rhs_03.cc
+++ b/tests/deal.II/vectors_boundary_rhs_03.cc
@@ -31,10 +31,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/deal.II/vectors_point_source_01.cc b/tests/deal.II/vectors_point_source_01.cc
index c0c7c84d52760a1b24a8ac1d97f6c52e4b3866ce..413e1904f2709f18c908c78f5c71d3dd64870097 100644 (file)
--- a/tests/deal.II/vectors_point_source_01.cc
+++ b/tests/deal.II/vectors_point_source_01.cc
@@ -31,10 +31,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/deal.II/vectors_rhs_01.cc b/tests/deal.II/vectors_rhs_01.cc
index cc43468f1e5c59b1640bb27b6e8465261b98802d..fa85e9b77b5746502c241e88f812aea6aeadd02f 100644 (file)
--- a/tests/deal.II/vectors_rhs_01.cc
+++ b/tests/deal.II/vectors_rhs_01.cc
@@ -30,10 +30,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/deal.II/vectors_rhs_03.cc b/tests/deal.II/vectors_rhs_03.cc
index 828487e618bc4784e5858e1bc7316571fff30027..2223d1411ac65e63d24c9469f16b1f576b990d5d 100644 (file)
--- a/tests/deal.II/vectors_rhs_03.cc
+++ b/tests/deal.II/vectors_rhs_03.cc
@@ -31,10 +31,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc
index a28ee8bd5d42c1a18a5731978a0fbaa0885ddb22..c7d4f7a0eb9d6198a3f0c78ba6bcedfe7de52fbd 100644 (file)
--- 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 <dofs/dof_tools.h>
 #include <fe/fe_q.h>
 #include <hp/fe_values.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 #include <numerics/vectors.h>
 #include <numerics/matrices.h>
 #include <numerics/data_out.h>

diff --git a/tests/fail/vectors_boundary_rhs_hp_02.cc b/tests/fail/vectors_boundary_rhs_hp_02.cc
index 7775ea2d19006870763cc6faea13b341abf0827f..11711387fd5c2dfbf14f7b386462e7147ab71f2e 100644 (file)
--- a/tests/fail/vectors_boundary_rhs_hp_02.cc
+++ b/tests/fail/vectors_boundary_rhs_hp_02.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/fail/vectors_rhs_hp_02.cc b/tests/fail/vectors_rhs_hp_02.cc
index 817edec225b64fc26f8c5c49547d4bef9ad1fcf2..b68a7ba4908089adb396d84fd3a06ec82f665381 100644 (file)
--- a/tests/fail/vectors_rhs_hp_02.cc
+++ b/tests/fail/vectors_rhs_hp_02.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/fe/non_primitive_2.cc b/tests/fe/non_primitive_2.cc
index 5b5bcc7033cf811ef60d2a3e20f4f54993d30480..7c02c4fec45b04894bca24c2ec26f5dc3ae3156e 100644 (file)
--- 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 <dofs/dof_handler.h>
 #include <dofs/dof_accessor.h>
 #include <dofs/dof_tools.h>
+#include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_nedelec.h>
 #include <fe/fe_system.h>

diff --git a/tests/hp/fe_collection_01.cc b/tests/hp/fe_collection_01.cc
index b99e5bfc187d9326cd11231ab616555458ccd1bb..2710e9474b0d3d5e6381af6e9d351b521813812d 100644 (file)
--- a/tests/hp/fe_collection_01.cc
+++ b/tests/hp/fe_collection_01.cc
@@ -19,7 +19,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 
 #include <fstream>

diff --git a/tests/hp/hp_constraints_common.h b/tests/hp/hp_constraints_common.h
index 0b1a4a3d92ca5933eb6335991336c1fc92fb4d67..debaa5b43f32174802bddcaae06868e6444ff266 100644 (file)
--- a/tests/hp/hp_constraints_common.h
+++ b/tests/hp/hp_constraints_common.h
@@ -42,7 +42,7 @@
 #include <fe/fe_q_hierarchical.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 
 #include <fstream>
 #include <vector>

diff --git a/tests/hp/hp_hanging_nodes_01.cc b/tests/hp/hp_hanging_nodes_01.cc
index 9bd89f44ba368d24aa3067732c59c3334d18f1ed..7ea1417e92efb92a7484340be377baded7449527 100644 (file)
--- a/tests/hp/hp_hanging_nodes_01.cc
+++ b/tests/hp/hp_hanging_nodes_01.cc
@@ -26,7 +26,7 @@
 #include <dofs/dof_constraints.h>
 
 #include <fe/fe_values.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <base/quadrature_lib.h>
 
 #include <base/function.h>

diff --git a/tests/hp/hp_line_dof_identities_dgp.cc b/tests/hp/hp_line_dof_identities_dgp.cc
index 8ae946e04066d11346f7a0710e56f5a029d5ac47..89a8ee89816586fb4b054bca956a50f666e2d6e8 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 
 #include <fstream>

diff --git a/tests/hp/hp_line_dof_identities_dgp_monomial.cc b/tests/hp/hp_line_dof_identities_dgp_monomial.cc
index aa13859b3eb21d3aeb0e00caae3aa85f8fe0c98d..94532f8c968b60c752d341081a518158b0eaa97e 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 
 #include <fstream>

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 8f38a89321917d81a08d1a81f02d198ab751a792..822df1efcf2a8c29c07555d87601c3d9fdbb4a84 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 #include <fe/fe_system.h>
 

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 2e4e7854296e943761e99d0760efb09033f060a5..9eb4dc2a963a38b2360cdd346b24d02f122c7ba5 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_line_dof_identities_dgp_nonparametric.cc b/tests/hp/hp_line_dof_identities_dgp_nonparametric.cc
index 7cf91c6136442d79ac04b950ae33768310a3c7db..dc794b9d4495e7182f310de881f8207adfb40bd4 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 
 #include <fstream>

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 b838c6787aa7f584f284d709de133b2856e28a28..bb819e4f2b33dbcd76629706a866d3462dab7849 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 #include <fe/fe_system.h>
 

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 7663d07c78642a7780860c48be797fa5754f2f02..645fd8dd0599fc8226d84da24a95ea50f59e2c7f 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 #include <fe/fe_system.h>
 

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 e4f4354259a7ad793313fa6630df275bbac721e7..20c9d92175865588cea9595f1cc6a2978749346d 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 #include <fe/fe_system.h>
 

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 1d72c32ebdb8b81623aa871b0d39cfc8e6681c6a..e53e8173aa3183ef7cae92bbb7be7fe8541f7693 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_line_dof_identities_dgq.cc b/tests/hp/hp_line_dof_identities_dgq.cc
index 2591d5cdd7a89fb6d6bbd3e33832e5a2d6187a51..70895b382a338889fb95ca14c79ab1b66213bd8c 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 
 #include <fstream>

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 929d37e232c0494b1e62706abf8227255804af78..58b75a2e1262723164e035d4e1baeb56395c55a1 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>
 

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 64340a551169eee711619fa9ac50d076427f715c..69d497b88d23568959fef644433204bd27b7b576 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_line_dof_identities_q.cc b/tests/hp/hp_line_dof_identities_q.cc
index 19cc8415a94218104e68fce682895879e16caa8c..c89589ccbbdda832e5cdf4b9fa27fd979a4c4d09 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 
 #include <fstream>

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 25d33c55c3e83fec7905eec91868c14d89bf8287..c8a11fbd16a45cd8fe3b5f83347f73f2b7f41f55 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 

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 ebe528ec0f7c6c54dd33f6410138de092fc4b09a..c5d7e24778120a9d34eafddb73f8eed01a948640 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 

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 4de7b88319217e432ffc52e58dfeb50b832d52a7..6f54e065c007d4c27eb5a474f639a41fab10ae36 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>

diff --git a/tests/hp/hp_quad_dof_identities_dgp.cc b/tests/hp/hp_quad_dof_identities_dgp.cc
index 4022061bb49b341b7371153a15157931f61dfaed..cb0e7d5eb7dcf6039657c7bf319700f06e9b01b9 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 
 #include <fstream>

diff --git a/tests/hp/hp_quad_dof_identities_dgp_monomial.cc b/tests/hp/hp_quad_dof_identities_dgp_monomial.cc
index d2a18665560030848195c9ac98430afec8e6204a..062fd3904258cfc37a1ed168028c7a00518fcb9b 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 
 #include <fstream>

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 e1132730a834f43aba88728d8f9b465c84db5daa..fbdce9ce69364f9c088a182ae7c4cfa53d99dcfc 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 #include <fe/fe_system.h>
 

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 e680aa150fce2b70c4b65779814c2e06b950700a..850a4028fbef8679bb234005c8c4b969aa66afa2 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_quad_dof_identities_dgp_nonparametric.cc b/tests/hp/hp_quad_dof_identities_dgp_nonparametric.cc
index 9864b6ce098e00c18fd3aa34562365574635e9c7..129c5be71c895ac992e7cc7c7769ed5da0d1002d 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 
 #include <fstream>

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 5b2198b903e4eede4cd5c48b07f1aa69ed46f216..734e7b299d3e5b6db2b455a0975838ab7458eae3 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 #include <fe/fe_system.h>
 

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 badaecd545141fd2ac6617b2a2c79b2b79e9b91e..ed057f206e89d704f19f6a9fe01740ce83012a2e 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 #include <fe/fe_system.h>
 

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 f1822a5d882db40f5c15842901f6ead77859e2fe..241b65a0023ab2cdd256a0505377b4e3e6229e2e 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 #include <fe/fe_system.h>
 

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 a1ef550cdb03790c77e909d827b4dc6901732e56..09c2b4b34adefb658da77501f8b41a2391459cf6 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_quad_dof_identities_dgq.cc b/tests/hp/hp_quad_dof_identities_dgq.cc
index 6a05f1fe0d8373970f7d05d9ee4bddd96ddf019a..6007fa3d79e0aac6ec8b5603d7ef32241632cd7f 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 
 #include <fstream>

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 c5c3dd61c065840f5a8364ef0a3d8739da8f7461..13d7689f39836a9cf54854eca0e9212ffbd96f85 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>
 

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 4da83a866ff9157e90b0a86a6b934eaa4ac15800..d585a734d82b20f243f4dbffbb7d98fe8c36b2ce 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_quad_dof_identities_q.cc b/tests/hp/hp_quad_dof_identities_q.cc
index cd2fc095ea08bb35cb8294fd86a959be0f546279..c4f5047852ef3ccb75ddedda793d3b32d3646178 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 
 #include <fstream>

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 82a464d3022bf92c5642925d083c13648fa9fbb8..d4adf322fca182c5707318cbe31461b3f3efd350 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 

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 1cb4c558507187a9eac35c60250febb5b16e8f43..5d8994169b4095829469b6a4234c7a5e19fefdaa 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_vertex_dof_identities_dgp.cc b/tests/hp/hp_vertex_dof_identities_dgp.cc
index 0215a93c0b75d94171a3df9de6c47244c65b6923..ae7d6221ba7d3bfe895c49471b2a5116b6ac694c 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 
 #include <fstream>

diff --git a/tests/hp/hp_vertex_dof_identities_dgp_monomial.cc b/tests/hp/hp_vertex_dof_identities_dgp_monomial.cc
index c87c29acd8960839c374db5c44df090a61431b18..28f2ec4fa73540bfb1c4368a83081a8db5201972 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 
 #include <fstream>

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 82ec020c6fe0dfe03f0a265380d4ce20fc798a77..3e271dd8a43ac7fd3f4b4667aa87708d4ad952da 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 #include <fe/fe_system.h>
 

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 94d0bbf0a1cc12d4638c5b8dfb53080c9755c241..ed8d801fc8e43ad8fa80d7dbce853b0e6a5e07a9 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_monomial.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_vertex_dof_identities_dgp_nonparametric.cc b/tests/hp/hp_vertex_dof_identities_dgp_nonparametric.cc
index 565c1a251962d2096d125c3a597f075154be2d67..77b908b9a2fae56775e536f24bf0645aa538881a 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 
 #include <fstream>

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 ee37805b922eb679f3b6dc8e164c894974a5bb61..3839747c44c6dcdaa680e0cdeac803f670afd54c 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 #include <fe/fe_system.h>
 

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 38ae73ea7771269818787ce1c34df6658baa887b..6d62139bece82940ff8c4d8d68ba8df41cadf082 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp_nonparametric.h>
 #include <fe/fe_system.h>
 

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 68448dc645ef4687b4c144b61cd24ba2942f4ad3..238bb049e069b3302c762274c012d06142788f0c 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 #include <fe/fe_system.h>
 

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 3b13d8dc81bedbbf3905f93a5db1f726d00569af..9e1eb67e3ddb388f7beaa141f9929d3d5ab21134 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgp.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_vertex_dof_identities_dgq.cc b/tests/hp/hp_vertex_dof_identities_dgq.cc
index a75bce056ba6303f834e7caf7b76eaeeb55d2c02..d970f707afab152a4f32e202ade19d80b9f3c6af 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 
 #include <fstream>

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 d314e82baf7c7e7dc6650e994b85811639b4f7bb..1e259881a9a7dbc9f49eda8c8d85f7c6245c72f6 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>
 

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 3e4e96aa66638332408426a0262da93e698253b2..1e7e8ce41c22d3edf68f8243245fd4ed03677ce8 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_dgq.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/hp_vertex_dof_identities_q.cc b/tests/hp/hp_vertex_dof_identities_q.cc
index 97e01822f82eddf52d45066b1acd6bf356001da1..ff71e13fb459fcdb74b1d44b5e4dde9e09f29997 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 
 #include <fstream>

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 d8bfe9d29fc8f93993fbc51be4f72c706e1c5693..e261feb445549570dc85313e31e6e973e70acb67 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 

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 1e6f935e7aa9c7a18e1caf2a6a344ac8d0221abf..0e7f62a59541e1b5d990e2d41e8d7882b9004d8a 100644 (file)
--- 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 <base/logstream.h>
-#include <fe/fe_collection.h>
+#include <hp/fe_collection.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
 

diff --git a/tests/hp/integrate_difference.cc b/tests/hp/integrate_difference.cc
index 9ea2e7059abf03ee7c63b818d1e62a188c124cf9..6af021d86b69bf4b18c111400ddb8386115cf0ad 100644 (file)
--- a/tests/hp/integrate_difference.cc
+++ b/tests/hp/integrate_difference.cc
@@ -28,8 +28,8 @@
 #include <grid/tria_iterator.h>
 #include <hp/dof_handler.h>
 #include <dofs/dof_accessor.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/fe_q.h>
 #include <numerics/vectors.h>
 

diff --git a/tests/hp/interpolate_dgq_01.cc b/tests/hp/interpolate_dgq_01.cc
index 8ec8b0d820fda9339a71dae8ee810bdd8dc36295..8ed01ce1b31a521a19411309c09befe19de20ca5 100644 (file)
--- a/tests/hp/interpolate_dgq_01.cc
+++ b/tests/hp/interpolate_dgq_01.cc
@@ -32,7 +32,7 @@
 #include <dofs/dof_tools.h>
 #include <numerics/vectors.h>
 #include <fe/fe_dgq.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 
 #include <fstream>
 #include <vector>

diff --git a/tests/hp/interpolate_dgq_02.cc b/tests/hp/interpolate_dgq_02.cc
index d4aef7f6e369bee145a8d1491106ae65531e03e9..3ced75b7bc1c9680dd309e392595a670b6f364e6 100644 (file)
--- a/tests/hp/interpolate_dgq_02.cc
+++ b/tests/hp/interpolate_dgq_02.cc
@@ -34,7 +34,7 @@
 #include <dofs/dof_tools.h>
 #include <numerics/vectors.h>
 #include <fe/fe_dgq.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 
 #include <fstream>
 #include <vector>

diff --git a/tests/hp/interpolate_q_01.cc b/tests/hp/interpolate_q_01.cc
index fd48b4dd1176ef1031a875178b6598661c06ea51..9d0fa99ebb93d9e239bb511586490a053b4da0db 100644 (file)
--- a/tests/hp/interpolate_q_01.cc
+++ b/tests/hp/interpolate_q_01.cc
@@ -32,7 +32,7 @@
 #include <dofs/dof_tools.h>
 #include <numerics/vectors.h>
 #include <fe/fe_q.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 
 #include <fstream>
 #include <vector>

diff --git a/tests/hp/interpolate_q_02.cc b/tests/hp/interpolate_q_02.cc
index 5cc66aa2eb85f796edd7711ca2252c455748fa77..1750cb5c2fdfdfafa56cbd283b16381232418d60 100644 (file)
--- a/tests/hp/interpolate_q_02.cc
+++ b/tests/hp/interpolate_q_02.cc
@@ -34,7 +34,7 @@
 #include <dofs/dof_tools.h>
 #include <numerics/vectors.h>
 #include <fe/fe_q.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 
 #include <fstream>
 #include <vector>

diff --git a/tests/hp/interpolate_q_system_01.cc b/tests/hp/interpolate_q_system_01.cc
index 996d4c023c7ba0e2fd15726a3a7ddb7798cd8db5..2758187104a8b4fdb3a833d0587f709d089d1075 100644 (file)
--- a/tests/hp/interpolate_q_system_01.cc
+++ b/tests/hp/interpolate_q_system_01.cc
@@ -33,7 +33,7 @@
 #include <numerics/vectors.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 
 #include <fstream>
 #include <vector>

diff --git a/tests/hp/interpolate_q_system_02.cc b/tests/hp/interpolate_q_system_02.cc
index 5d7e352154c2997d23c4604411999f4991b5ac9d..811f3d1a68e1a897fd52962c91083ef8a447dc4a 100644 (file)
--- a/tests/hp/interpolate_q_system_02.cc
+++ b/tests/hp/interpolate_q_system_02.cc
@@ -35,7 +35,7 @@
 #include <numerics/vectors.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 
 
 #include <fstream>

diff --git a/tests/hp/mapping_collection_01.cc b/tests/hp/mapping_collection_01.cc
index d90f10eb7b3af2d53fbadd4154f2c1431c5562d1..e44b91a691bef578bdaf135def9eba62032280a4 100644 (file)
--- a/tests/hp/mapping_collection_01.cc
+++ b/tests/hp/mapping_collection_01.cc
@@ -19,7 +19,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <fe/mapping_q.h>
 #include <fe/mapping_q1.h>
 

diff --git a/tests/hp/mapping_collection_02.cc b/tests/hp/mapping_collection_02.cc
index 6f8c3dc0de7eb4d1341d9d2b08864a93b5918a07..94aaad1dcb58c6de69032c2f395d9c1a96004e2d 100644 (file)
--- a/tests/hp/mapping_collection_02.cc
+++ b/tests/hp/mapping_collection_02.cc
@@ -18,7 +18,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <fe/mapping_q.h>
 
 #include <fstream>

diff --git a/tests/hp/mapping_collection_03.cc b/tests/hp/mapping_collection_03.cc
index a778e61e23f751b7e913b162e1b4edbd31e036ac..35d3030370f8f2ba8010d498974c75c91566cc0d 100644 (file)
--- a/tests/hp/mapping_collection_03.cc
+++ b/tests/hp/mapping_collection_03.cc
@@ -19,7 +19,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <fe/mapping_q.h>
 
 #include <fstream>

diff --git a/tests/hp/mapping_collection_04.cc b/tests/hp/mapping_collection_04.cc
index 61507598d57a1ac312e8b8d61e5a4153e500d39f..7f3423246be569efcd3563e76a4588f20248f41d 100644 (file)
--- a/tests/hp/mapping_collection_04.cc
+++ b/tests/hp/mapping_collection_04.cc
@@ -18,7 +18,7 @@
 
 #include "../tests.h"
 #include <base/logstream.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <fe/mapping_q.h>
 
 #include <fstream>

diff --git a/tests/hp/matrices.cc b/tests/hp/matrices.cc
index 977ea2b831ab1f7d1408e5c13763f48eedb82bb0..10156272bddd4362f41e6c6a223f3b9a33be993d 100644 (file)
--- a/tests/hp/matrices.cc
+++ b/tests/hp/matrices.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/matrices.h>
 
 #include <fstream>

diff --git a/tests/hp/matrices_hp.cc b/tests/hp/matrices_hp.cc
index 1292b33b255aa7d346237be3157b03be5fcfa07b..4976832d52585040982908701c96c4eb13834a1e 100644 (file)
--- a/tests/hp/matrices_hp.cc
+++ b/tests/hp/matrices_hp.cc
@@ -30,10 +30,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/matrices.h>
 
 #include <fstream>

diff --git a/tests/hp/q_collection_01.cc b/tests/hp/q_collection_01.cc
index 114821349a5d542bfb4c379c2e70ecd4249d8c3c..0eca0efaad0c77a78053c439da62b4991159ba77 100644 (file)
--- a/tests/hp/q_collection_01.cc
+++ b/tests/hp/q_collection_01.cc
@@ -20,7 +20,7 @@
 #include "../tests.h"
 #include <base/logstream.h>
 #include <base/quadrature_lib.h>
-#include <fe/q_collection.h>
+#include <hp/q_collection.h>
 
 #include <fstream>
 

diff --git a/tests/hp/vectors_boundary_rhs_01.cc b/tests/hp/vectors_boundary_rhs_01.cc
index 0279039beeef5440d207e248aa399584a9f272be..ce6756883a1d6ae73a5c8e0ff271fcff48d13d3a 100644 (file)
--- a/tests/hp/vectors_boundary_rhs_01.cc
+++ b/tests/hp/vectors_boundary_rhs_01.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_boundary_rhs_02.cc b/tests/hp/vectors_boundary_rhs_02.cc
index 4065a92472fa1ed974e80d8f286e1e457f07eb14..39ccc7e7871355bde7b4467d363f9cc9404b05b4 100644 (file)
--- a/tests/hp/vectors_boundary_rhs_02.cc
+++ b/tests/hp/vectors_boundary_rhs_02.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_boundary_rhs_03.cc b/tests/hp/vectors_boundary_rhs_03.cc
index 6713c3ca07a076e3f111c7a6be3beae24fd43169..b3549cff9278140693fa6ec89ca814c00fa1bc99 100644 (file)
--- a/tests/hp/vectors_boundary_rhs_03.cc
+++ b/tests/hp/vectors_boundary_rhs_03.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_boundary_rhs_hp_01.cc b/tests/hp/vectors_boundary_rhs_hp_01.cc
index 87e716e422befacf3c235ded7826463fc679ab56..643d29d53c7508e4cc6136e5ec4239239b7741dc 100644 (file)
--- a/tests/hp/vectors_boundary_rhs_hp_01.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_01.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_boundary_rhs_hp_03.cc b/tests/hp/vectors_boundary_rhs_hp_03.cc
index e5e01b2b00b8895671a1aa5dc3a8d740c7fb5745..4831ea70c439fec50c8e793433e922e9fcf22023 100644 (file)
--- a/tests/hp/vectors_boundary_rhs_hp_03.cc
+++ b/tests/hp/vectors_boundary_rhs_hp_03.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_point_source_01.cc b/tests/hp/vectors_point_source_01.cc
index f7798211998f1b5a2c933956705c92756ef19574..8caaa2aa8731caa1f67c21a2ffa3bc9d99ddb04f 100644 (file)
--- a/tests/hp/vectors_point_source_01.cc
+++ b/tests/hp/vectors_point_source_01.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_point_source_hp_01.cc b/tests/hp/vectors_point_source_hp_01.cc
index e0b0037161e2ffad62d8b04c4bac927adf3500b9..c9e252fcc2f294dcc937d8acf345418cf530a877 100644 (file)
--- a/tests/hp/vectors_point_source_hp_01.cc
+++ b/tests/hp/vectors_point_source_hp_01.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_rhs_01.cc b/tests/hp/vectors_rhs_01.cc
index 824dfdd7b4e0061d24fa3b1db73c5ba2c3747d03..ee959dd2c82f84feab45dae5d9a72294a859902e 100644 (file)
--- a/tests/hp/vectors_rhs_01.cc
+++ b/tests/hp/vectors_rhs_01.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_rhs_02.cc b/tests/hp/vectors_rhs_02.cc
index b8ca612b31643c12048e28968efb41a90bd9a6b9..e482f9c6ea919e9a721676d0173214efe1ef7d52 100644 (file)
--- a/tests/hp/vectors_rhs_02.cc
+++ b/tests/hp/vectors_rhs_02.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_raviart_thomas.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_rhs_03.cc b/tests/hp/vectors_rhs_03.cc
index cc0cfe60724cc1afddf619fae4a25642f9a32b53..0672d03f37817051920b315e07c5f99a2cf0d9be 100644 (file)
--- a/tests/hp/vectors_rhs_03.cc
+++ b/tests/hp/vectors_rhs_03.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_rhs_hp_01.cc b/tests/hp/vectors_rhs_hp_01.cc
index 845b22edb86a13d55b3e2e443d088005c6c18048..1b480191cfae61ca28b16d037216f8b1de7da7eb 100644 (file)
--- a/tests/hp/vectors_rhs_hp_01.cc
+++ b/tests/hp/vectors_rhs_hp_01.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/hp/vectors_rhs_hp_03.cc b/tests/hp/vectors_rhs_hp_03.cc
index e465f5108689f039e1219cd3fc198c827ae9ddff..1f9104cccea18ea7a15d363794bb74d1fcb0917c 100644 (file)
--- a/tests/hp/vectors_rhs_hp_03.cc
+++ b/tests/hp/vectors_rhs_hp_03.cc
@@ -32,10 +32,10 @@
 #include <dofs/dof_constraints.h>
 #include <fe/fe_q.h>
 #include <fe/fe_system.h>
-#include <fe/fe_collection.h>
-#include <fe/q_collection.h>
+#include <hp/fe_collection.h>
+#include <hp/q_collection.h>
 #include <fe/mapping_q.h>
-#include <fe/mapping_collection.h>
+#include <hp/mapping_collection.h>
 #include <numerics/vectors.h>
 
 #include <fstream>

diff --git a/tests/petsc/petsc_full_matrix_05.cc b/tests/petsc/petsc_full_matrix_05.cc
index 30c69ae7398f5707fdcf7150c0242581fcf8f359..602905b97104442de30113bf619f3ea8b2731d1e 100644 (file)
--- 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;
 }