From c175a4c57fc204aec9edb3656c16b5b70d2f05e9 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Sat, 2 Dec 2017 21:00:50 +0100 Subject: [PATCH] Remove some tests for distorted cells that now no longer are distorted. Keep the distorted_cells_06 test in to ensure that we really do not regress on this case. --- tests/bits/distorted_cells_03.cc | 130 ---------- tests/bits/distorted_cells_03.debug.output | 225 ------------------ tests/bits/distorted_cells_06.cc | 3 +- tests/bits/distorted_cells_06.debug.output | 150 ++++++------ tests/bits/distorted_mapped_cells_02.cc | 79 ------ .../distorted_mapped_cells_02.debug.output | 3 - 6 files changed, 76 insertions(+), 514 deletions(-) delete mode 100644 tests/bits/distorted_cells_03.cc delete mode 100644 tests/bits/distorted_cells_03.debug.output delete mode 100644 tests/bits/distorted_mapped_cells_02.cc delete mode 100644 tests/bits/distorted_mapped_cells_02.debug.output diff --git a/tests/bits/distorted_cells_03.cc b/tests/bits/distorted_cells_03.cc deleted file mode 100644 index 038adebd06..0000000000 --- a/tests/bits/distorted_cells_03.cc +++ /dev/null @@ -1,130 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2003 - 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// check that indeed Triangulation::execute_coarsening_and_refinement -// throws an exception if a distorted child cell is created -// -// the 2d case is as described in the example in the Glossary on -// distorted cells resulting from refinement - -#include "../tests.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - -template -class MyBoundary : public Boundary -{ - virtual Point - get_new_point_on_line (const typename Triangulation::line_iterator &line) const - { - deallog << "Finding point between " - << line->vertex(0) << " and " - << line->vertex(1) << std::endl; - - // in 2d, find a point that - // lies on the opposite side - // of the quad. in 3d, choose - // the midpoint of the edge - if (dim == 2) - return Point(0,0.75); - else - return (line->vertex(0) + line->vertex(1)) / 2; - } - - virtual Point - get_new_point_on_quad (const typename Triangulation::quad_iterator &quad) const - { - deallog << "Finding point between " - << quad->vertex(0) << " and " - << quad->vertex(1) << " and " - << quad->vertex(2) << " and " - << quad->vertex(3) << std::endl; - - return Point(0,0,.75); - } -}; - - - -template -void check () -{ - MyBoundary my_boundary; - - // create a single square/cube - Triangulation coarse_grid (Triangulation::none, true); - GridGenerator::hyper_cube (coarse_grid, -1, 1); - - // set bottom face to use MyBoundary - for (unsigned int f=0; f::faces_per_cell; ++f) - if (coarse_grid.begin_active()->face(f)->center()[dim-1] == -1) - coarse_grid.begin_active()->face(f)->set_boundary_id (1); - coarse_grid.set_boundary (1, my_boundary); - - // now try to refine this one - // cell. we should get an exception - bool flag = false; - try - { - coarse_grid.begin_active()->set_refine_flag (); - coarse_grid.execute_coarsening_and_refinement (); - } - catch (typename Triangulation::DistortedCellList &dcv) - { - flag = true; - - deallog << dcv.distorted_cells.size() << " distorted cells" - << std::endl; - Assert (dcv.distorted_cells.front() == coarse_grid.begin(0), - ExcInternalError()); - - // ignore the exception, i.e. do not - // even attempt to fix up the problem - // (but see the _04 testcase for this) - } - - Assert (flag == true, ExcInternalError()); - Assert (coarse_grid.n_levels() == 2, ExcInternalError()); - Assert (coarse_grid.n_active_cells() == 1< (); - check<3> (); -} - - - diff --git a/tests/bits/distorted_cells_03.debug.output b/tests/bits/distorted_cells_03.debug.output deleted file mode 100644 index 3564f85332..0000000000 --- a/tests/bits/distorted_cells_03.debug.output +++ /dev/null @@ -1,225 +0,0 @@ - -DEAL::Finding point between -1.00000 -1.00000 and 1.00000 -1.00000 -DEAL::1 distorted cells --1.00000 -1.00000 1 0 -0.00000 0.750000 1 0 -0.00000 0.218750 1 0 --1.00000 0.00000 1 0 --1.00000 -1.00000 1 0 - - -0.00000 0.750000 1 0 -1.00000 -1.00000 1 0 -1.00000 0.00000 1 0 -0.00000 0.218750 1 0 -0.00000 0.750000 1 0 - - --1.00000 0.00000 1 0 -0.00000 0.218750 1 0 -0.00000 1.00000 1 0 --1.00000 1.00000 1 0 --1.00000 0.00000 1 0 - - -0.00000 0.218750 1 0 -1.00000 0.00000 1 0 -1.00000 1.00000 1 0 -0.00000 1.00000 1 0 -0.00000 0.218750 1 0 - - -DEAL::Finding point between -1.00000 -1.00000 -1.00000 and 1.00000 -1.00000 -1.00000 and -1.00000 1.00000 -1.00000 and 1.00000 1.00000 -1.00000 -DEAL::1 distorted cells --1.00000 -1.00000 -1.00000 1 0 -0.00000 -1.00000 -1.00000 1 0 -0.00000 -1.00000 0.00000 1 0 --1.00000 -1.00000 0.00000 1 0 --1.00000 -1.00000 -1.00000 1 0 - --1.00000 0.00000 -1.00000 1 0 -0.00000 0.00000 0.750000 1 0 -0.00000 0.00000 0.145833 1 0 --1.00000 0.00000 0.00000 1 0 --1.00000 0.00000 -1.00000 1 0 - --1.00000 -1.00000 -1.00000 1 0 --1.00000 0.00000 -1.00000 1 0 - -0.00000 -1.00000 -1.00000 1 0 -0.00000 0.00000 0.750000 1 0 - -0.00000 -1.00000 0.00000 1 0 -0.00000 0.00000 0.145833 1 0 - --1.00000 -1.00000 0.00000 1 0 --1.00000 0.00000 0.00000 1 0 - -0.00000 -1.00000 -1.00000 1 0 -1.00000 -1.00000 -1.00000 1 0 -1.00000 -1.00000 0.00000 1 0 -0.00000 -1.00000 0.00000 1 0 -0.00000 -1.00000 -1.00000 1 0 - -0.00000 0.00000 0.750000 1 0 -1.00000 0.00000 -1.00000 1 0 -1.00000 0.00000 0.00000 1 0 -0.00000 0.00000 0.145833 1 0 -0.00000 0.00000 0.750000 1 0 - -0.00000 -1.00000 -1.00000 1 0 -0.00000 0.00000 0.750000 1 0 - -1.00000 -1.00000 -1.00000 1 0 -1.00000 0.00000 -1.00000 1 0 - -1.00000 -1.00000 0.00000 1 0 -1.00000 0.00000 0.00000 1 0 - -0.00000 -1.00000 0.00000 1 0 -0.00000 0.00000 0.145833 1 0 - --1.00000 0.00000 -1.00000 1 0 -0.00000 0.00000 0.750000 1 0 -0.00000 0.00000 0.145833 1 0 --1.00000 0.00000 0.00000 1 0 --1.00000 0.00000 -1.00000 1 0 - --1.00000 1.00000 -1.00000 1 0 -0.00000 1.00000 -1.00000 1 0 -0.00000 1.00000 0.00000 1 0 --1.00000 1.00000 0.00000 1 0 --1.00000 1.00000 -1.00000 1 0 - --1.00000 0.00000 -1.00000 1 0 --1.00000 1.00000 -1.00000 1 0 - -0.00000 0.00000 0.750000 1 0 -0.00000 1.00000 -1.00000 1 0 - -0.00000 0.00000 0.145833 1 0 -0.00000 1.00000 0.00000 1 0 - --1.00000 0.00000 0.00000 1 0 --1.00000 1.00000 0.00000 1 0 - -0.00000 0.00000 0.750000 1 0 -1.00000 0.00000 -1.00000 1 0 -1.00000 0.00000 0.00000 1 0 -0.00000 0.00000 0.145833 1 0 -0.00000 0.00000 0.750000 1 0 - -0.00000 1.00000 -1.00000 1 0 -1.00000 1.00000 -1.00000 1 0 -1.00000 1.00000 0.00000 1 0 -0.00000 1.00000 0.00000 1 0 -0.00000 1.00000 -1.00000 1 0 - -0.00000 0.00000 0.750000 1 0 -0.00000 1.00000 -1.00000 1 0 - -1.00000 0.00000 -1.00000 1 0 -1.00000 1.00000 -1.00000 1 0 - -1.00000 0.00000 0.00000 1 0 -1.00000 1.00000 0.00000 1 0 - -0.00000 0.00000 0.145833 1 0 -0.00000 1.00000 0.00000 1 0 - --1.00000 -1.00000 0.00000 1 0 -0.00000 -1.00000 0.00000 1 0 -0.00000 -1.00000 1.00000 1 0 --1.00000 -1.00000 1.00000 1 0 --1.00000 -1.00000 0.00000 1 0 - --1.00000 0.00000 0.00000 1 0 -0.00000 0.00000 0.145833 1 0 -0.00000 0.00000 1.00000 1 0 --1.00000 0.00000 1.00000 1 0 --1.00000 0.00000 0.00000 1 0 - --1.00000 -1.00000 0.00000 1 0 --1.00000 0.00000 0.00000 1 0 - -0.00000 -1.00000 0.00000 1 0 -0.00000 0.00000 0.145833 1 0 - -0.00000 -1.00000 1.00000 1 0 -0.00000 0.00000 1.00000 1 0 - --1.00000 -1.00000 1.00000 1 0 --1.00000 0.00000 1.00000 1 0 - -0.00000 -1.00000 0.00000 1 0 -1.00000 -1.00000 0.00000 1 0 -1.00000 -1.00000 1.00000 1 0 -0.00000 -1.00000 1.00000 1 0 -0.00000 -1.00000 0.00000 1 0 - -0.00000 0.00000 0.145833 1 0 -1.00000 0.00000 0.00000 1 0 -1.00000 0.00000 1.00000 1 0 -0.00000 0.00000 1.00000 1 0 -0.00000 0.00000 0.145833 1 0 - -0.00000 -1.00000 0.00000 1 0 -0.00000 0.00000 0.145833 1 0 - -1.00000 -1.00000 0.00000 1 0 -1.00000 0.00000 0.00000 1 0 - -1.00000 -1.00000 1.00000 1 0 -1.00000 0.00000 1.00000 1 0 - -0.00000 -1.00000 1.00000 1 0 -0.00000 0.00000 1.00000 1 0 - --1.00000 0.00000 0.00000 1 0 -0.00000 0.00000 0.145833 1 0 -0.00000 0.00000 1.00000 1 0 --1.00000 0.00000 1.00000 1 0 --1.00000 0.00000 0.00000 1 0 - --1.00000 1.00000 0.00000 1 0 -0.00000 1.00000 0.00000 1 0 -0.00000 1.00000 1.00000 1 0 --1.00000 1.00000 1.00000 1 0 --1.00000 1.00000 0.00000 1 0 - --1.00000 0.00000 0.00000 1 0 --1.00000 1.00000 0.00000 1 0 - -0.00000 0.00000 0.145833 1 0 -0.00000 1.00000 0.00000 1 0 - -0.00000 0.00000 1.00000 1 0 -0.00000 1.00000 1.00000 1 0 - --1.00000 0.00000 1.00000 1 0 --1.00000 1.00000 1.00000 1 0 - -0.00000 0.00000 0.145833 1 0 -1.00000 0.00000 0.00000 1 0 -1.00000 0.00000 1.00000 1 0 -0.00000 0.00000 1.00000 1 0 -0.00000 0.00000 0.145833 1 0 - -0.00000 1.00000 0.00000 1 0 -1.00000 1.00000 0.00000 1 0 -1.00000 1.00000 1.00000 1 0 -0.00000 1.00000 1.00000 1 0 -0.00000 1.00000 0.00000 1 0 - -0.00000 0.00000 0.145833 1 0 -0.00000 1.00000 0.00000 1 0 - -1.00000 0.00000 0.00000 1 0 -1.00000 1.00000 0.00000 1 0 - -1.00000 0.00000 1.00000 1 0 -1.00000 1.00000 1.00000 1 0 - -0.00000 0.00000 1.00000 1 0 -0.00000 1.00000 1.00000 1 0 - diff --git a/tests/bits/distorted_cells_06.cc b/tests/bits/distorted_cells_06.cc index e2acf93d44..bc3e493c26 100644 --- a/tests/bits/distorted_cells_06.cc +++ b/tests/bits/distorted_cells_06.cc @@ -80,7 +80,8 @@ void check () coarse_grid.set_boundary (99, my_boundary); // now try to refine this one - // cell. we should get an exception + // cell. we should not get an exception, but keep it to make sure the + // program still runs try { coarse_grid.refine_global(1); diff --git a/tests/bits/distorted_cells_06.debug.output b/tests/bits/distorted_cells_06.debug.output index 6ecd23c926..99ce7cd7eb 100644 --- a/tests/bits/distorted_cells_06.debug.output +++ b/tests/bits/distorted_cells_06.debug.output @@ -1,7 +1,5 @@ DEAL::Finding point between 0.00000 0.00000 0.00000 and 0.00000 1.00000 0.00000 -DEAL::Found 2 distorted cells -DEAL::Found 0 cells that are still distorted -1.00000 0.00000 0.00000 1 6 -0.500000 0.00000 0.00000 1 6 -0.500000 0.00000 0.500000 1 6 @@ -9,8 +7,8 @@ DEAL::Found 0 cells that are still distorted -1.00000 0.00000 0.00000 1 6 -1.00000 0.500000 0.00000 1 6 --0.500000 0.500000 0.112500 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.450000 1 6 +-0.500000 0.500000 0.725000 1 6 -1.00000 0.500000 0.500000 1 6 -1.00000 0.500000 0.00000 1 6 @@ -18,10 +16,10 @@ DEAL::Found 0 cells that are still distorted -1.00000 0.500000 0.00000 1 6 -0.500000 0.00000 0.00000 1 6 --0.500000 0.500000 0.112500 1 6 +-0.500000 0.500000 0.450000 1 6 -0.500000 0.00000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -1.00000 0.00000 0.500000 1 6 -1.00000 0.500000 0.500000 1 6 @@ -32,27 +30,27 @@ DEAL::Found 0 cells that are still distorted -0.500000 0.00000 0.500000 1 6 -0.500000 0.00000 0.00000 1 6 --0.500000 0.500000 0.112500 1 6 +-0.500000 0.500000 0.450000 1 6 0.00000 0.500000 0.900000 1 6 -0.00000 0.500000 0.919184 1 6 --0.510867 0.500000 0.533292 1 6 --0.500000 0.500000 0.112500 1 6 +0.00000 0.500000 0.950000 1 6 +-0.500000 0.500000 0.725000 1 6 +-0.500000 0.500000 0.450000 1 6 -0.500000 0.00000 0.00000 1 6 --0.500000 0.500000 0.112500 1 6 +-0.500000 0.500000 0.450000 1 6 0.00000 0.00000 0.00000 1 6 0.00000 0.500000 0.900000 1 6 0.00000 0.00000 0.500000 1 6 -0.00000 0.500000 0.919184 1 6 +0.00000 0.500000 0.950000 1 6 -0.500000 0.00000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -1.00000 0.500000 0.00000 1 6 --0.500000 0.500000 0.112500 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.450000 1 6 +-0.500000 0.500000 0.725000 1 6 -1.00000 0.500000 0.500000 1 6 -1.00000 0.500000 0.00000 1 6 @@ -65,20 +63,20 @@ DEAL::Found 0 cells that are still distorted -1.00000 0.500000 0.00000 1 6 -1.00000 1.00000 0.00000 1 6 --0.500000 0.500000 0.112500 1 6 +-0.500000 0.500000 0.450000 1 6 -0.500000 1.00000 0.00000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 1.00000 0.500000 1 6 -1.00000 0.500000 0.500000 1 6 -1.00000 1.00000 0.500000 1 6 --0.500000 0.500000 0.112500 1 6 +-0.500000 0.500000 0.450000 1 6 0.00000 0.500000 0.900000 1 6 -0.00000 0.500000 0.919184 1 6 --0.510867 0.500000 0.533292 1 6 --0.500000 0.500000 0.112500 1 6 +0.00000 0.500000 0.950000 1 6 +-0.500000 0.500000 0.725000 1 6 +-0.500000 0.500000 0.450000 1 6 -0.500000 1.00000 0.00000 1 6 0.00000 1.00000 0.00000 1 6 @@ -86,16 +84,16 @@ DEAL::Found 0 cells that are still distorted -0.500000 1.00000 0.500000 1 6 -0.500000 1.00000 0.00000 1 6 --0.500000 0.500000 0.112500 1 6 +-0.500000 0.500000 0.450000 1 6 -0.500000 1.00000 0.00000 1 6 0.00000 0.500000 0.900000 1 6 0.00000 1.00000 0.00000 1 6 -0.00000 0.500000 0.919184 1 6 +0.00000 0.500000 0.950000 1 6 0.00000 1.00000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 1.00000 0.500000 1 6 -1.00000 0.00000 0.500000 1 6 @@ -105,7 +103,7 @@ DEAL::Found 0 cells that are still distorted -1.00000 0.00000 0.500000 1 6 -1.00000 0.500000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 0.500000 1.00000 1 6 -1.00000 0.500000 1.00000 1 6 -1.00000 0.500000 0.500000 1 6 @@ -114,7 +112,7 @@ DEAL::Found 0 cells that are still distorted -1.00000 0.500000 0.500000 1 6 -0.500000 0.00000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 0.00000 1.00000 1 6 -0.500000 0.500000 1.00000 1 6 @@ -128,17 +126,17 @@ DEAL::Found 0 cells that are still distorted -0.500000 0.00000 1.00000 1 6 -0.500000 0.00000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 -0.00000 0.500000 0.919184 1 6 +-0.500000 0.500000 0.725000 1 6 +0.00000 0.500000 0.950000 1 6 0.00000 0.500000 1.00000 1 6 -0.500000 0.500000 1.00000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 0.00000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 0.00000 0.00000 0.500000 1 6 -0.00000 0.500000 0.919184 1 6 +0.00000 0.500000 0.950000 1 6 0.00000 0.00000 1.00000 1 6 0.00000 0.500000 1.00000 1 6 @@ -147,7 +145,7 @@ DEAL::Found 0 cells that are still distorted -0.500000 0.500000 1.00000 1 6 -1.00000 0.500000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 0.500000 1.00000 1 6 -1.00000 0.500000 1.00000 1 6 -1.00000 0.500000 0.500000 1 6 @@ -161,7 +159,7 @@ DEAL::Found 0 cells that are still distorted -1.00000 0.500000 0.500000 1 6 -1.00000 1.00000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 1.00000 0.500000 1 6 -0.500000 0.500000 1.00000 1 6 @@ -170,11 +168,11 @@ DEAL::Found 0 cells that are still distorted -1.00000 0.500000 1.00000 1 6 -1.00000 1.00000 1.00000 1 6 --0.510867 0.500000 0.533292 1 6 -0.00000 0.500000 0.919184 1 6 +-0.500000 0.500000 0.725000 1 6 +0.00000 0.500000 0.950000 1 6 0.00000 0.500000 1.00000 1 6 -0.500000 0.500000 1.00000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 1.00000 0.500000 1 6 0.00000 1.00000 0.500000 1 6 @@ -182,10 +180,10 @@ DEAL::Found 0 cells that are still distorted -0.500000 1.00000 1.00000 1 6 -0.500000 1.00000 0.500000 1 6 --0.510867 0.500000 0.533292 1 6 +-0.500000 0.500000 0.725000 1 6 -0.500000 1.00000 0.500000 1 6 -0.00000 0.500000 0.919184 1 6 +0.00000 0.500000 0.950000 1 6 0.00000 1.00000 0.500000 1 6 0.00000 0.500000 1.00000 1 6 @@ -201,22 +199,22 @@ DEAL::Found 0 cells that are still distorted 0.00000 0.00000 0.00000 1 7 0.00000 0.500000 0.900000 1 7 -0.500000 0.500000 0.112500 1 7 -0.516302 0.500000 0.536649 1 7 -0.00000 0.500000 0.919184 1 7 +0.500000 0.500000 0.450000 1 7 +0.500000 0.500000 0.725000 1 7 +0.00000 0.500000 0.950000 1 7 0.00000 0.500000 0.900000 1 7 0.00000 0.00000 0.00000 1 7 0.00000 0.500000 0.900000 1 7 0.500000 0.00000 0.00000 1 7 -0.500000 0.500000 0.112500 1 7 +0.500000 0.500000 0.450000 1 7 0.500000 0.00000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.00000 0.00000 0.500000 1 7 -0.00000 0.500000 0.919184 1 7 +0.00000 0.500000 0.950000 1 7 0.500000 0.00000 0.00000 1 7 1.00000 0.00000 0.00000 1 7 @@ -224,14 +222,14 @@ DEAL::Found 0 cells that are still distorted 0.500000 0.00000 0.500000 1 7 0.500000 0.00000 0.00000 1 7 -0.500000 0.500000 0.112500 1 7 +0.500000 0.500000 0.450000 1 7 1.00000 0.500000 0.00000 1 7 1.00000 0.500000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 -0.500000 0.500000 0.112500 1 7 +0.500000 0.500000 0.725000 1 7 +0.500000 0.500000 0.450000 1 7 0.500000 0.00000 0.00000 1 7 -0.500000 0.500000 0.112500 1 7 +0.500000 0.500000 0.450000 1 7 1.00000 0.00000 0.00000 1 7 1.00000 0.500000 0.00000 1 7 @@ -240,12 +238,12 @@ DEAL::Found 0 cells that are still distorted 1.00000 0.500000 0.500000 1 7 0.500000 0.00000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.00000 0.500000 0.900000 1 7 -0.500000 0.500000 0.112500 1 7 -0.516302 0.500000 0.536649 1 7 -0.00000 0.500000 0.919184 1 7 +0.500000 0.500000 0.450000 1 7 +0.500000 0.500000 0.725000 1 7 +0.00000 0.500000 0.950000 1 7 0.00000 0.500000 0.900000 1 7 0.00000 1.00000 0.00000 1 7 @@ -257,20 +255,20 @@ DEAL::Found 0 cells that are still distorted 0.00000 0.500000 0.900000 1 7 0.00000 1.00000 0.00000 1 7 -0.500000 0.500000 0.112500 1 7 +0.500000 0.500000 0.450000 1 7 0.500000 1.00000 0.00000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 1.00000 0.500000 1 7 -0.00000 0.500000 0.919184 1 7 +0.00000 0.500000 0.950000 1 7 0.00000 1.00000 0.500000 1 7 -0.500000 0.500000 0.112500 1 7 +0.500000 0.500000 0.450000 1 7 1.00000 0.500000 0.00000 1 7 1.00000 0.500000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 -0.500000 0.500000 0.112500 1 7 +0.500000 0.500000 0.725000 1 7 +0.500000 0.500000 0.450000 1 7 0.500000 1.00000 0.00000 1 7 1.00000 1.00000 0.00000 1 7 @@ -278,7 +276,7 @@ DEAL::Found 0 cells that are still distorted 0.500000 1.00000 0.500000 1 7 0.500000 1.00000 0.00000 1 7 -0.500000 0.500000 0.112500 1 7 +0.500000 0.500000 0.450000 1 7 0.500000 1.00000 0.00000 1 7 1.00000 0.500000 0.00000 1 7 @@ -287,7 +285,7 @@ DEAL::Found 0 cells that are still distorted 1.00000 0.500000 0.500000 1 7 1.00000 1.00000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 1.00000 0.500000 1 7 0.00000 0.00000 0.500000 1 7 @@ -296,17 +294,17 @@ DEAL::Found 0 cells that are still distorted 0.00000 0.00000 1.00000 1 7 0.00000 0.00000 0.500000 1 7 -0.00000 0.500000 0.919184 1 7 -0.516302 0.500000 0.536649 1 7 +0.00000 0.500000 0.950000 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 0.500000 1.00000 1 7 0.00000 0.500000 1.00000 1 7 -0.00000 0.500000 0.919184 1 7 +0.00000 0.500000 0.950000 1 7 0.00000 0.00000 0.500000 1 7 -0.00000 0.500000 0.919184 1 7 +0.00000 0.500000 0.950000 1 7 0.500000 0.00000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 0.00000 1.00000 1 7 0.500000 0.500000 1.00000 1 7 @@ -320,14 +318,14 @@ DEAL::Found 0 cells that are still distorted 0.500000 0.00000 1.00000 1 7 0.500000 0.00000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 1.00000 0.500000 0.500000 1 7 1.00000 0.500000 1.00000 1 7 0.500000 0.500000 1.00000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 0.00000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 1.00000 0.00000 0.500000 1 7 1.00000 0.500000 0.500000 1 7 @@ -338,11 +336,11 @@ DEAL::Found 0 cells that are still distorted 0.500000 0.00000 1.00000 1 7 0.500000 0.500000 1.00000 1 7 -0.00000 0.500000 0.919184 1 7 -0.516302 0.500000 0.536649 1 7 +0.00000 0.500000 0.950000 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 0.500000 1.00000 1 7 0.00000 0.500000 1.00000 1 7 -0.00000 0.500000 0.919184 1 7 +0.00000 0.500000 0.950000 1 7 0.00000 1.00000 0.500000 1 7 0.500000 1.00000 0.500000 1 7 @@ -350,10 +348,10 @@ DEAL::Found 0 cells that are still distorted 0.00000 1.00000 1.00000 1 7 0.00000 1.00000 0.500000 1 7 -0.00000 0.500000 0.919184 1 7 +0.00000 0.500000 0.950000 1 7 0.00000 1.00000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 1.00000 0.500000 1 7 0.500000 0.500000 1.00000 1 7 @@ -362,11 +360,11 @@ DEAL::Found 0 cells that are still distorted 0.00000 0.500000 1.00000 1 7 0.00000 1.00000 1.00000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 1.00000 0.500000 0.500000 1 7 1.00000 0.500000 1.00000 1 7 0.500000 0.500000 1.00000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 1.00000 0.500000 1 7 1.00000 1.00000 0.500000 1 7 @@ -374,7 +372,7 @@ DEAL::Found 0 cells that are still distorted 0.500000 1.00000 1.00000 1 7 0.500000 1.00000 0.500000 1 7 -0.516302 0.500000 0.536649 1 7 +0.500000 0.500000 0.725000 1 7 0.500000 1.00000 0.500000 1 7 1.00000 0.500000 0.500000 1 7 diff --git a/tests/bits/distorted_mapped_cells_02.cc b/tests/bits/distorted_mapped_cells_02.cc deleted file mode 100644 index c699e91a17..0000000000 --- a/tests/bits/distorted_mapped_cells_02.cc +++ /dev/null @@ -1,79 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2013 - 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - -// Test that an assertion is thrown when MappingQ distorts the geometry too -// much on a thin hyper shell - -#include "../tests.h" -#include -#include -#include -#include -#include -#include -#include - - -void test() -{ - const int dim = 2; - Triangulation tria(Triangulation::none,true); - - // shell is so narrow that MappingQ(2) distorts the cell - GridGenerator::quarter_hyper_shell (tria, Point(), 0.95, 1, 1); - static HyperShellBoundary boundary; - tria.set_boundary (0, boundary); - - FE_Nothing dummy; - MappingQ mapping(2); - QGauss quad(2); - FEValues fe_val (mapping, dummy, quad, update_JxW_values); - double integral = 0.; - /*typename*/ Triangulation::active_cell_iterator - cell = tria.begin_active(), endc = tria.end(); - for ( ; cell != endc; ++cell) - { - try - { - fe_val.reinit (cell); - for (unsigned int q=0; q::ExcDistortedMappedCell(cell->center(), det, point)) -DEAL::Integral = 0 -- 2.39.5