From 7dee544d94d954a6af36cd555f0bd9da96c0e08b Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Fri, 18 May 2018 14:29:49 -0700 Subject: [PATCH] Ignore artificial cells, update test --- source/grid/grid_tools.cc | 11 ++++++----- ...with_trilinos=true.with_p4est=true.mpirun=3.output | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 025e8b63b6..478e2aaa45 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -4546,12 +4546,13 @@ next_cell: std::map > result; for (const auto &cell : container.active_cell_iterators()) { - const auto vs = mapping.get_vertices(cell); - for (unsigned int i=0; ivertex_index(i)]=vs[i]; + if (!cell->is_artificial()) + { + const auto vs = mapping.get_vertices(cell); + for (unsigned int i=0; ivertex_index(i)]=vs[i]; + } } - Assert(result.size() == container.n_used_vertices(), - ExcInternalError()); return result; } diff --git a/tests/mappings/mapping_q_eulerian_11.with_trilinos=true.with_p4est=true.mpirun=3.output b/tests/mappings/mapping_q_eulerian_11.with_trilinos=true.with_p4est=true.mpirun=3.output index 93955ed157..7224706172 100644 --- a/tests/mappings/mapping_q_eulerian_11.with_trilinos=true.with_p4est=true.mpirun=3.output +++ b/tests/mappings/mapping_q_eulerian_11.with_trilinos=true.with_p4est=true.mpirun=3.output @@ -1,15 +1,15 @@ DEAL:0::dim=2 DEAL:0::numproc=3 -DEAL:0::-0.500000 -0.500000 1.00000 -1.00000 -1.00000 1.00000 1.00000 1.00000 0.00000 -1.00000 -0.500000 0.00000 1.00000 0.00000 0.00000 1.00000 0.00000 0.00000 -0.375000 -0.750000 0.500000 -1.00000 -0.500000 -0.250000 -1.00000 0.500000 1.00000 -0.500000 1.00000 0.500000 -0.500000 1.00000 0.500000 1.00000 0.00000 -0.500000 0.00000 0.500000 -0.375000 0.00000 0.500000 0.00000 -0.375000 -0.375000 0.500000 -0.500000 -0.500000 0.500000 0.500000 0.500000 +DEAL:0::-0.500000 -0.500000 0.00000 -1.00000 -0.500000 0.00000 0.00000 0.00000 -0.375000 -0.750000 0.625000 -1.25000 -0.500000 -0.250000 -0.500000 0.250000 0.00000 -0.500000 0.00000 0.500000 -0.375000 0.00000 0.625000 0.00000 -0.375000 -0.375000 0.625000 -0.625000 -0.375000 0.375000 0.625000 0.625000 DEAL:0::Ok. DEAL:1::dim=2 -DEAL:1::-1.00000 -1.00000 1.50000 -1.50000 -0.500000 0.500000 1.00000 1.00000 0.00000 -1.00000 -0.500000 0.00000 1.50000 0.00000 0.00000 1.00000 0.00000 0.00000 -0.375000 -0.750000 0.625000 -1.25000 -0.500000 -0.250000 -0.500000 0.250000 1.50000 -0.750000 1.00000 0.500000 -0.375000 0.750000 0.500000 1.00000 0.00000 -0.500000 0.00000 0.500000 -0.375000 0.00000 0.625000 0.00000 -0.375000 -0.375000 0.625000 -0.625000 -0.375000 0.375000 0.500000 0.500000 +DEAL:1::1.50000 -1.50000 -0.500000 0.500000 0.00000 -1.00000 -0.500000 0.00000 1.50000 0.00000 0.00000 1.00000 0.00000 0.00000 -0.375000 -0.750000 0.625000 -1.25000 -0.500000 -0.250000 -0.500000 0.250000 1.50000 -0.750000 1.50000 0.750000 -0.375000 0.750000 0.625000 1.25000 0.00000 -0.500000 0.00000 0.500000 -0.375000 0.00000 0.625000 0.00000 -0.375000 -0.375000 0.625000 -0.625000 -0.375000 0.375000 0.625000 0.625000 DEAL:1::Ok. DEAL:2::dim=2 -DEAL:2::-1.00000 -1.00000 1.00000 -1.00000 -1.00000 1.00000 1.50000 1.50000 0.00000 -1.00000 -1.00000 0.00000 1.50000 0.00000 0.00000 1.00000 0.00000 0.00000 -0.500000 -1.00000 0.500000 -1.00000 -1.00000 -0.500000 -1.00000 0.500000 1.50000 -0.750000 1.50000 0.750000 -0.375000 0.750000 0.625000 1.25000 0.00000 -0.500000 0.00000 0.500000 -0.375000 0.00000 0.625000 0.00000 -0.375000 -0.375000 0.625000 -0.625000 -0.375000 0.375000 0.625000 0.625000 +DEAL:2::1.50000 1.50000 1.50000 0.00000 0.00000 1.00000 0.00000 0.00000 1.50000 -0.750000 1.50000 0.750000 -0.375000 0.750000 0.625000 1.25000 0.00000 -0.500000 0.00000 0.500000 -0.375000 0.00000 0.625000 0.00000 -0.375000 -0.375000 0.625000 -0.625000 -0.375000 0.375000 0.625000 0.625000 DEAL:2::Ok. -- 2.39.5