From 3f645b2721110c8e93ba4cff69993df031908681 Mon Sep 17 00:00:00 2001 From: kanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d> Date: Mon, 24 Jun 2013 09:46:18 +0000 Subject: [PATCH] remove multigrid git-svn-id: https://svn.dealii.org/trunk@29865 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/integrators/mesh_worker_matrix_01.cc | 11 ++++------- tests/integrators/mesh_worker_matrix_01/cmp/generic | 9 ++++++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/integrators/mesh_worker_matrix_01.cc b/tests/integrators/mesh_worker_matrix_01.cc index d0a3c4219a..2a0d9b1b77 100644 --- a/tests/integrators/mesh_worker_matrix_01.cc +++ b/tests/integrators/mesh_worker_matrix_01.cc @@ -117,12 +117,11 @@ Local<dim>::face(MeshWorker::DoFInfo<dim>& info1, MeshWorker::DoFInfo<dim>& info template <int dim> void -test_simple(MGDoFHandler<dim>& mgdofs, bool faces) +test_simple(DoFHandler<dim>& dofs, bool faces) { SparsityPattern pattern; SparseMatrix<double> matrix; - const DoFHandler<dim>& dofs = mgdofs; const FiniteElement<dim>& fe = dofs.get_fe(); pattern.reinit (dofs.n_dofs(), dofs.n_dofs(), (GeometryInfo<dim>::faces_per_cell @@ -182,15 +181,13 @@ test(const FiniteElement<dim>& fe) cell != tr.end(); ++cell, ++cn) cell->set_user_index(cn); - MGDoFHandler<dim> dofs(tr); + DoFHandler<dim> dofs(tr); dofs.distribute_dofs(fe); dofs.initialize_local_block_info(); - deallog << "DoFHandler " << dofs.n_dofs() << " levels"; - for (unsigned int l=0;l<tr.n_levels();++l) - deallog << ' ' << l << ':' << dofs.n_dofs(l); - deallog << std::endl; + deallog << "DoFHandler " << dofs.n_dofs() << std::endl; test_simple(dofs, false); + deallog << "now with jump terms" << std::endl; test_simple(dofs, true); } diff --git a/tests/integrators/mesh_worker_matrix_01/cmp/generic b/tests/integrators/mesh_worker_matrix_01/cmp/generic index 81b7a6001b..089305d733 100644 --- a/tests/integrators/mesh_worker_matrix_01/cmp/generic +++ b/tests/integrators/mesh_worker_matrix_01/cmp/generic @@ -1,6 +1,6 @@ DEAL::Triangulation levels 0:1 1:4 2:16 -DEAL::DoFHandler 16 levels 0:1 1:4 2:16 +DEAL::DoFHandler 16 (0,0) 10.0000 (0,1) 0.00000 (0,2) 0.00000 @@ -65,6 +65,7 @@ DEAL::DoFHandler 16 levels 0:1 1:4 2:16 (15,13) 0.00000 (15,14) 0.00000 (15,15) 10.0000 +DEAL::now with jump terms (0,0) 14.0000 (0,1) -1.00000 (0,2) -1.00000 @@ -130,7 +131,7 @@ DEAL::DoFHandler 16 levels 0:1 1:4 2:16 (15,14) -1.00000 (15,15) 14.0000 DEAL::Triangulation levels 0:1 1:4 2:16 -DEAL::DoFHandler 25 levels 0:4 1:9 2:25 +DEAL::DoFHandler 25 (0,0) 10.0000 (0,1) 10.0000 (0,2) 10.0000 @@ -456,6 +457,7 @@ DEAL::DoFHandler 25 levels 0:4 1:9 2:25 (24,22) 10.0000 (24,23) 10.0000 (24,24) 10.0000 +DEAL::now with jump terms (0,0) 14.0000 (0,1) 13.0000 (0,2) 13.0000 @@ -782,7 +784,7 @@ DEAL::DoFHandler 25 levels 0:4 1:9 2:25 (24,23) 13.0000 (24,24) 14.0000 DEAL::Triangulation levels 0:1 1:4 2:16 -DEAL::DoFHandler 41 levels 0:5 1:13 2:41 +DEAL::DoFHandler 41 (0,0) 10.0000 (0,1) 10.0000 (0,2) 10.0000 @@ -1492,6 +1494,7 @@ DEAL::DoFHandler 41 levels 0:5 1:13 2:41 (40,38) 0.00000 (40,39) 0.00000 (40,40) 10.0000 +DEAL::now with jump terms (0,0) 14.0000 (0,1) 13.0000 (0,2) 13.0000 -- 2.39.5