From f73cd12470b21c52e881923f319f4c1abc6fa119 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Wed, 27 Jan 2016 18:47:11 +0100 Subject: [PATCH] Test beauty --- source/distributed/tria.cc | 5 ----- tests/mpi/distribute_mg_dofs_periodicity_01.cc | 4 ---- tests/mpi/distribute_mg_dofs_periodicity_02.cc | 16 +++++++--------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index f025a84549..3eda543257 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -3177,11 +3177,6 @@ namespace parallel periodic.orientation[2] == false, ExcNotImplemented()); - // TODO: might need to fix the case with corners where several PBC - // meet (in most cases it will get fixed eventually because we visit - // corner dofs more than once, and each time we pass around we connect - // two more vertices; in the worst case of 3 periodicity connects in - // 3D, we are safe after three levels) for (unsigned int v=0; v::vertices_per_cell; ++v) { const unsigned int vi0 = topological_vertex_numbering[periodic.cell[0]->face(periodic.face_idx[0])->vertex_index(v)]; diff --git a/tests/mpi/distribute_mg_dofs_periodicity_01.cc b/tests/mpi/distribute_mg_dofs_periodicity_01.cc index be6e5d328f..57839bb50e 100644 --- a/tests/mpi/distribute_mg_dofs_periodicity_01.cc +++ b/tests/mpi/distribute_mg_dofs_periodicity_01.cc @@ -38,10 +38,6 @@ #include #include -// This is C++: -#include -#include - template diff --git a/tests/mpi/distribute_mg_dofs_periodicity_02.cc b/tests/mpi/distribute_mg_dofs_periodicity_02.cc index 043d732085..4cfbf1ce96 100644 --- a/tests/mpi/distribute_mg_dofs_periodicity_02.cc +++ b/tests/mpi/distribute_mg_dofs_periodicity_02.cc @@ -17,7 +17,8 @@ // conditions. we used to forget to enforce the 2:1 level balance over // periodic boundaries in artificial cells, which lead to the case where the // coarser MG level did not provide the correct ghost layer. This test -// explicitly looks into the ghost layer on an adaptive case for processor 0 +// explicitly lists all cells on all processors (processor 1 used to miss a +// few cells in the implementation before January 2016). #include "../tests.h" @@ -34,10 +35,6 @@ #include -// This is C++: -#include -#include - template @@ -49,7 +46,8 @@ void test() tria(MPI_COMM_WORLD, dealii::Triangulation::limit_level_difference_at_vertices, parallel::distributed::Triangulation::construct_multigrid_hierarchy); GridGenerator::subdivided_hyper_cube (tria, 3); - // set periodic boundary conditions in x and z directions + + // set periodic boundary conditions in all directions for (typename Triangulation::cell_iterator cell=tria.begin(); cell != tria.end(); ++cell) for (unsigned int f=0; f::faces_per_cell; ++f) @@ -60,9 +58,8 @@ void test() GridTools::collect_periodic_faces(tria, 0+10, 1+10, 0, periodic_faces); GridTools::collect_periodic_faces(tria, 2+10, 3+10, 1, periodic_faces); tria.add_periodicity(periodic_faces); - //tria.refine_global(3); - // adaptively refine into the corner on proc 0 + // adaptively refine into the lower left corner for (unsigned int i=0; i<2; ++i) { for (typename Triangulation::active_cell_iterator cell = tria.begin_active(); @@ -75,7 +72,8 @@ void test() for (typename Triangulation::cell_iterator cell=tria.begin(); cell != tria.end(); ++cell) deallog << cell->id().to_string() << " " << cell->level_subdomain_id() << std::endl; - if (1) + + if (0) { std::ofstream grid_output (("out"+Utilities::to_string(myid)+".svg").c_str()); GridOut grid_out; -- 2.39.5