From: heister Date: Mon, 24 Jun 2013 09:31:20 +0000 (+0000) Subject: update test X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c21b34d423e827e653c8738225b090bb1193514;p=dealii-svn.git update test git-svn-id: https://svn.dealii.org/trunk@29863 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/mpi/mesh_worker_matrix_01.cc b/tests/mpi/mesh_worker_matrix_01.cc index a902cdffc5..a169a8dd83 100644 --- a/tests/mpi/mesh_worker_matrix_01.cc +++ b/tests/mpi/mesh_worker_matrix_01.cc @@ -120,12 +120,11 @@ Local::face(MeshWorker::DoFInfo& info1, MeshWorker::DoFInfo& info template void -test_simple(MGDoFHandler& mgdofs, bool faces) +test_simple(DoFHandler& dofs, bool faces) { TrilinosWrappers::SparsityPattern pattern; TrilinosWrappers::SparseMatrix matrix; - const DoFHandler& dofs = mgdofs; const FiniteElement& fe = dofs.get_fe(); pattern.reinit (dofs.n_dofs(), dofs.n_dofs(), (GeometryInfo::faces_per_cell @@ -157,7 +156,8 @@ test_simple(MGDoFHandler& mgdofs, bool faces) std_cxx1x::bind (&Local::bdry, local, std_cxx1x::_1, std_cxx1x::_2), std_cxx1x::bind (&Local::face, local, std_cxx1x::_1, std_cxx1x::_2, std_cxx1x::_3, std_cxx1x::_4), assembler, true); - + + matrix.compress(); matrix.print(deallog.get_file_stream()); } @@ -166,14 +166,14 @@ template void test(const FiniteElement& fe) { - Triangulation tr; + parallel::distributed::Triangulation tr(MPI_COMM_WORLD, + Triangulation::none/*, + parallel::distributed::Triangulation::construct_multigrid_hierarchy*/); GridGenerator::hyper_cube(tr); tr.refine_global(2); - // tr.begin(1)->set_refine_flag(); - // tr.execute_coarsening_and_refinement(); - // tr.begin(2)->set_refine_flag(); - // tr.execute_coarsening_and_refinement(); -// tr.refine_global(1); + //tr.begin_active()->set_refine_flag(); + //tr.execute_coarsening_and_refinement(); + deallog << "Triangulation levels"; for (unsigned int l=0;l& fe) cell != tr.end(); ++cell, ++cn) cell->set_user_index(cn); - MGDoFHandler dofs(tr); + DoFHandler dofs(tr); dofs.distribute_dofs(fe); dofs.initialize_local_block_info(); - deallog << "DoFHandler " << dofs.n_dofs() << " levels"; - for (unsigned int l=0;l& fe) int main (int argc, char** argv) { Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); - mpi_initlog(__FILE__); + MPILogInitAll i(__FILE__); FE_DGP<2> p0(0); FE_Q<2> q1(1); diff --git a/tests/mpi/mesh_worker_matrix_01/ncpu_1/cmp/generic b/tests/mpi/mesh_worker_matrix_01/ncpu_1/cmp/generic index 84726cdce5..0328ccdfca 100644 --- a/tests/mpi/mesh_worker_matrix_01/ncpu_1/cmp/generic +++ b/tests/mpi/mesh_worker_matrix_01/ncpu_1/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:0::Triangulation levels 0:1 1:4 2:16 +DEAL:0::DoFHandler 16 (0,0) 10.0000 (0,1) 0.00000 (0,2) 0.00000 @@ -65,7 +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 +DEAL:0::now with jump terms (0,0) 14.0000 (0,1) -1.00000 (0,2) -1.00000 @@ -130,8 +130,8 @@ DEAL::now with jump terms (15,13) -1.00000 (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:0::Triangulation levels 0:1 1:4 2:16 +DEAL:0::DoFHandler 25 (0,0) 10.0000 (0,1) 10.0000 (0,2) 10.0000 @@ -457,7 +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 +DEAL:0::now with jump terms (0,0) 14.0000 (0,1) 13.0000 (0,2) 13.0000 @@ -783,8 +783,8 @@ DEAL::now with jump terms (24,22) 13.0000 (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:0::Triangulation levels 0:1 1:4 2:16 +DEAL:0::DoFHandler 41 (0,0) 10.0000 (0,1) 10.0000 (0,2) 10.0000 @@ -1494,7 +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 +DEAL:0::now with jump terms (0,0) 14.0000 (0,1) 13.0000 (0,2) 13.0000