From 5153497af7232143a2cf93a950c8670ada5d3e73 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 23 Mar 2015 13:47:43 -0500 Subject: [PATCH] Adjust output of GridOut::write_gnuplot() for 1d triangulations. The GridOut::write_gnuplot() function produced output for 1d meshes embedded in higher dimensional spaces that was invalid in that the lines showing individual cells were connected. While this is not wrong for singly connected 1d meshes, it leads to wrong results if the domain is not singly connected and not every cell is the right neighbor of the previous cell. --- doc/news/changes.h | 10 + source/grid/grid_out.cc | 2 +- tests/deal.II/coarsening_02_1d.output | 766 ++++++++++++++++++++ tests/deal.II/distort_random.output | 8 + tests/deal.II/grid_out.output | 2 + tests/deal.II/grid_parallelepiped.output | 1 + tests/deal.II/grid_parallelepiped_03.output | 3 + tests/deal.II/union_triangulation.output | 4 + tests/grid/grid_generator_01.output | 7 + tests/grid/grid_generator_02.output | 4 + tests/grid/grid_generator_03.output | 4 + 11 files changed, 810 insertions(+), 1 deletion(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 9a6eca68c7..c544c40428 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -395,6 +395,16 @@ inconvenience this causes.

Specific improvements

    +
  1. New: The GridOut::write_gnuplot() function produced output + for 1d meshes embedded in higher dimensional spaces that was + invalid in that the lines showing individual cells were connected. + While this is not wrong for singly connected 1d meshes, it leads to wrong + results if the domain is not singly connected and not every cell is the + right neighbor of the previous cell. +
    + (Wolfgang Bangerth, 2015/03/23) +
    2. +
  2. New: The various file format writers of class GridOut were not instantiated for 1d meshes in 3d space. This is now fixed.
    diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc index a79f3229dc..eb0fd39109 100644 --- a/source/grid/grid_out.cc +++ b/source/grid/grid_out.cc @@ -2963,7 +2963,7 @@ namespace internal << cell->vertex(1) << ' ' << cell->level() << ' ' << static_cast(cell->material_id()) << '\n' - << '\n'; + << "\n\n"; } // make sure everything now gets to diff --git a/tests/deal.II/coarsening_02_1d.output b/tests/deal.II/coarsening_02_1d.output index d992d0f27a..e0773fdd63 100644 --- a/tests/deal.II/coarsening_02_1d.output +++ b/tests/deal.II/coarsening_02_1d.output @@ -2,15 +2,19 @@ 0.00000 2 0 0.250000 2 0 + 0.250000 2 0 0.500000 2 0 + 0.500000 2 0 0.750000 2 0 + 0.750000 2 0 1.00000 2 0 + DEAL:1d::0.125000 2 DEAL:1d::0.125000 0 DEAL:1d:: @@ -21,21 +25,27 @@ DEAL:1d::Iteration 0: cells=6 0.250000 2 0 0.500000 2 0 + 0.500000 2 0 0.750000 2 0 + 0.00000 3 0 0.125000 3 0 + 0.125000 3 0 0.250000 3 0 + 0.750000 3 0 0.875000 3 0 + 0.875000 3 0 1.00000 3 0 + DEAL:1d::0.375000 2 DEAL:1d::0.375000 0 DEAL:1d:: @@ -49,33 +59,43 @@ DEAL:1d::Iteration 1: cells=10 0.00000 3 0 0.125000 3 0 + 0.875000 3 0 1.00000 3 0 + 0.250000 3 0 0.375000 3 0 + 0.375000 3 0 0.500000 3 0 + 0.500000 3 0 0.625000 3 0 + 0.625000 3 0 0.750000 3 0 + 0.125000 4 0 0.187500 4 0 + 0.187500 4 0 0.250000 4 0 + 0.750000 4 0 0.812500 4 0 + 0.812500 4 0 0.875000 4 0 + DEAL:1d::0.0625000 3 DEAL:1d::0.0625000 0 DEAL:1d:: @@ -89,36 +109,47 @@ DEAL:1d::Iteration 2: cells=11 0.125000 3 0 0.250000 3 0 + 0.750000 3 0 0.875000 3 0 + 0.875000 3 0 1.00000 3 0 + 0.250000 3 0 0.375000 3 0 + 0.500000 3 0 0.625000 3 0 + 0.00000 4 0 0.0625000 4 0 + 0.0625000 4 0 0.125000 4 0 + 0.375000 4 0 0.437500 4 0 + 0.437500 4 0 0.500000 4 0 + 0.625000 4 0 0.687500 4 0 + 0.687500 4 0 0.750000 4 0 + DEAL:1d::0.187500 3 DEAL:1d::0.187500 0 DEAL:1d:: @@ -132,36 +163,47 @@ DEAL:1d::Iteration 3: cells=11 0.750000 2 0 1.00000 2 0 + 0.375000 3 0 0.500000 3 0 + 0.500000 3 0 0.625000 3 0 + 0.625000 3 0 0.750000 3 0 + 0.00000 4 0 0.0625000 4 0 + 0.125000 4 0 0.187500 4 0 + 0.187500 4 0 0.250000 4 0 + 0.250000 4 0 0.312500 4 0 + 0.312500 4 0 0.375000 4 0 + 0.0625000 5 0 0.0937500 5 0 + 0.0937500 5 0 0.125000 5 0 + DEAL:1d::0.875000 2 DEAL:1d::0.875000 0 DEAL:1d:: @@ -178,45 +220,59 @@ DEAL:1d::Iteration 4: cells=14 0.750000 3 0 0.875000 3 0 + 0.875000 3 0 1.00000 3 0 + 0.500000 3 0 0.625000 3 0 + 0.625000 3 0 0.750000 3 0 + 0.00000 4 0 0.0625000 4 0 + 0.0625000 4 0 0.125000 4 0 + 0.125000 4 0 0.187500 4 0 + 0.187500 4 0 0.250000 4 0 + 0.375000 4 0 0.437500 4 0 + 0.437500 4 0 0.500000 4 0 + 0.250000 5 0 0.281250 5 0 + 0.281250 5 0 0.312500 5 0 + 0.312500 5 0 0.343750 5 0 + 0.343750 5 0 0.375000 5 0 + DEAL:1d::0.812500 3 DEAL:1d::0.812500 0 DEAL:1d:: @@ -233,60 +289,79 @@ DEAL:1d::Iteration 5: cells=19 0.875000 3 0 1.00000 3 0 + 0.500000 3 0 0.625000 3 0 + 0.625000 3 0 0.750000 3 0 + 0.00000 4 0 0.0625000 4 0 + 0.0625000 4 0 0.125000 4 0 + 0.187500 4 0 0.250000 4 0 + 0.437500 4 0 0.500000 4 0 + 0.750000 4 0 0.812500 4 0 + 0.812500 4 0 0.875000 4 0 + 0.250000 5 0 0.281250 5 0 + 0.312500 5 0 0.343750 5 0 + 0.125000 5 0 0.156250 5 0 + 0.156250 5 0 0.187500 5 0 + 0.375000 5 0 0.406250 5 0 + 0.406250 5 0 0.437500 5 0 + 0.281250 6 0 0.296875 6 0 + 0.296875 6 0 0.312500 6 0 + 0.343750 6 0 0.359375 6 0 + 0.359375 6 0 0.375000 6 0 + DEAL:1d::0.937500 3 DEAL:1d::0.937500 0 DEAL:1d:: @@ -306,69 +381,91 @@ DEAL:1d::Iteration 6: cells=22 0.00000 3 0 0.125000 3 0 + 0.500000 3 0 0.625000 3 0 + 0.875000 4 0 0.937500 4 0 + 0.937500 4 0 1.00000 4 0 + 0.125000 4 0 0.187500 4 0 + 0.437500 4 0 0.500000 4 0 + 0.812500 4 0 0.875000 4 0 + 0.625000 4 0 0.687500 4 0 + 0.687500 4 0 0.750000 4 0 + 0.250000 5 0 0.281250 5 0 + 0.281250 5 0 0.312500 5 0 + 0.187500 5 0 0.218750 5 0 + 0.218750 5 0 0.250000 5 0 + 0.375000 5 0 0.406250 5 0 + 0.406250 5 0 0.437500 5 0 + 0.750000 5 0 0.781250 5 0 + 0.781250 5 0 0.812500 5 0 + 0.312500 6 0 0.328125 6 0 + 0.328125 6 0 0.343750 6 0 + 0.359375 6 0 0.375000 6 0 + 0.343750 7 0 0.351562 7 0 + 0.351562 7 0 0.359375 7 0 + DEAL:1d::0.0625000 3 DEAL:1d::0.0625000 0 DEAL:1d:: @@ -388,90 +485,119 @@ DEAL:1d::Iteration 7: cells=29 0.875000 3 0 1.00000 3 0 + 0.00000 4 0 0.0625000 4 0 + 0.0625000 4 0 0.125000 4 0 + 0.750000 4 0 0.812500 4 0 + 0.812500 4 0 0.875000 4 0 + 0.625000 4 0 0.687500 4 0 + 0.500000 4 0 0.562500 4 0 + 0.562500 4 0 0.625000 4 0 + 0.250000 5 0 0.281250 5 0 + 0.281250 5 0 0.312500 5 0 + 0.218750 5 0 0.250000 5 0 + 0.406250 5 0 0.437500 5 0 + 0.125000 5 0 0.156250 5 0 + 0.156250 5 0 0.187500 5 0 + 0.437500 5 0 0.468750 5 0 + 0.468750 5 0 0.500000 5 0 + 0.687500 5 0 0.718750 5 0 + 0.718750 5 0 0.750000 5 0 + 0.312500 6 0 0.328125 6 0 + 0.328125 6 0 0.343750 6 0 + 0.187500 6 0 0.203125 6 0 + 0.203125 6 0 0.218750 6 0 + 0.375000 6 0 0.390625 6 0 + 0.390625 6 0 0.406250 6 0 + 0.343750 7 0 0.351562 7 0 + 0.359375 7 0 0.367188 7 0 + 0.367188 7 0 0.375000 7 0 + 0.351562 8 0 0.355469 8 0 + 0.355469 8 0 0.359375 8 0 + DEAL:1d::0.937500 3 DEAL:1d::0.937500 0 DEAL:1d:: @@ -497,96 +623,127 @@ DEAL:1d::Iteration 8: cells=31 0.125000 4 0 0.187500 4 0 + 0.437500 4 0 0.500000 4 0 + 0.812500 4 0 0.875000 4 0 + 0.500000 4 0 0.562500 4 0 + 0.562500 4 0 0.625000 4 0 + 0.875000 4 0 0.937500 4 0 + 0.937500 4 0 1.00000 4 0 + 0.250000 5 0 0.281250 5 0 + 0.281250 5 0 0.312500 5 0 + 0.187500 5 0 0.218750 5 0 + 0.375000 5 0 0.406250 5 0 + 0.406250 5 0 0.437500 5 0 + 0.00000 5 0 0.0312500 5 0 + 0.0312500 5 0 0.0625000 5 0 + 0.0625000 5 0 0.0937500 5 0 + 0.0937500 5 0 0.125000 5 0 + 0.750000 5 0 0.781250 5 0 + 0.781250 5 0 0.812500 5 0 + 0.625000 5 0 0.656250 5 0 + 0.656250 5 0 0.687500 5 0 + 0.312500 6 0 0.328125 6 0 + 0.328125 6 0 0.343750 6 0 + 0.359375 6 0 0.375000 6 0 + 0.218750 6 0 0.234375 6 0 + 0.234375 6 0 0.250000 6 0 + 0.687500 6 0 0.703125 6 0 + 0.703125 6 0 0.718750 6 0 + 0.718750 6 0 0.734375 6 0 + 0.734375 6 0 0.750000 6 0 + 0.343750 7 0 0.351562 7 0 + 0.351562 7 0 0.359375 7 0 + DEAL:1d::0.156250 4 DEAL:1d::0.156250 0 DEAL:1d:: @@ -609,105 +766,139 @@ DEAL:1d::Iteration 9: cells=34 0.250000 4 0 0.312500 4 0 + 0.437500 4 0 0.500000 4 0 + 0.812500 4 0 0.875000 4 0 + 0.500000 4 0 0.562500 4 0 + 0.562500 4 0 0.625000 4 0 + 0.937500 4 0 1.00000 4 0 + 0.125000 5 0 0.156250 5 0 + 0.156250 5 0 0.187500 5 0 + 0.312500 5 0 0.343750 5 0 + 0.187500 5 0 0.218750 5 0 + 0.218750 5 0 0.250000 5 0 + 0.406250 5 0 0.437500 5 0 + 0.0625000 5 0 0.0937500 5 0 + 0.0937500 5 0 0.125000 5 0 + 0.750000 5 0 0.781250 5 0 + 0.781250 5 0 0.812500 5 0 + 0.625000 5 0 0.656250 5 0 + 0.656250 5 0 0.687500 5 0 + 0.875000 5 0 0.906250 5 0 + 0.906250 5 0 0.937500 5 0 + 0.375000 6 0 0.390625 6 0 + 0.390625 6 0 0.406250 6 0 + 0.343750 6 0 0.359375 6 0 + 0.00000 6 0 0.0156250 6 0 + 0.0156250 6 0 0.0312500 6 0 + 0.687500 6 0 0.703125 6 0 + 0.703125 6 0 0.718750 6 0 + 0.734375 6 0 0.750000 6 0 + 0.0312500 6 0 0.0468750 6 0 + 0.0468750 6 0 0.0625000 6 0 + 0.359375 7 0 0.367188 7 0 + 0.367188 7 0 0.375000 7 0 + 0.718750 7 0 0.726562 7 0 + 0.726562 7 0 0.734375 7 0 + DEAL:1d::0.281250 4 DEAL:1d::0.281250 0 DEAL:1d:: @@ -736,120 +927,159 @@ DEAL:1d::Iteration 10: cells=39 0.0625000 4 0 0.125000 4 0 + 0.812500 4 0 0.875000 4 0 + 0.625000 4 0 0.687500 4 0 + 0.562500 4 0 0.625000 4 0 + 0.125000 5 0 0.156250 5 0 + 0.156250 5 0 0.187500 5 0 + 0.312500 5 0 0.343750 5 0 + 0.0312500 5 0 0.0625000 5 0 + 0.250000 5 0 0.281250 5 0 + 0.281250 5 0 0.312500 5 0 + 0.687500 5 0 0.718750 5 0 + 0.781250 5 0 0.812500 5 0 + 0.437500 5 0 0.468750 5 0 + 0.468750 5 0 0.500000 5 0 + 0.875000 5 0 0.906250 5 0 + 0.500000 5 0 0.531250 5 0 + 0.531250 5 0 0.562500 5 0 + 0.937500 5 0 0.968750 5 0 + 0.968750 5 0 1.00000 5 0 + 0.375000 6 0 0.390625 6 0 + 0.343750 6 0 0.359375 6 0 + 0.359375 6 0 0.375000 6 0 + 0.0156250 6 0 0.0312500 6 0 + 0.187500 6 0 0.203125 6 0 + 0.203125 6 0 0.218750 6 0 + 0.718750 6 0 0.734375 6 0 + 0.734375 6 0 0.750000 6 0 + 0.218750 6 0 0.234375 6 0 + 0.234375 6 0 0.250000 6 0 + 0.406250 6 0 0.421875 6 0 + 0.421875 6 0 0.437500 6 0 + 0.750000 6 0 0.765625 6 0 + 0.765625 6 0 0.781250 6 0 + 0.906250 6 0 0.921875 6 0 + 0.921875 6 0 0.937500 6 0 + 0.390625 7 0 0.398438 7 0 + 0.398438 7 0 0.406250 7 0 + 0.00000 7 0 0.00781250 7 0 + 0.00781250 7 0 0.0156250 7 0 + DEAL:1d::0.0937500 4 DEAL:1d::0.0937500 0 DEAL:1d:: @@ -878,126 +1108,167 @@ DEAL:1d::Iteration 11: cells=41 0.250000 4 0 0.312500 4 0 + 0.625000 4 0 0.687500 4 0 + 0.562500 4 0 0.625000 4 0 + 0.125000 5 0 0.156250 5 0 + 0.312500 5 0 0.343750 5 0 + 0.343750 5 0 0.375000 5 0 + 0.187500 5 0 0.218750 5 0 + 0.218750 5 0 0.250000 5 0 + 0.406250 5 0 0.437500 5 0 + 0.0312500 5 0 0.0625000 5 0 + 0.0625000 5 0 0.0937500 5 0 + 0.0937500 5 0 0.125000 5 0 + 0.687500 5 0 0.718750 5 0 + 0.781250 5 0 0.812500 5 0 + 0.437500 5 0 0.468750 5 0 + 0.468750 5 0 0.500000 5 0 + 0.906250 5 0 0.937500 5 0 + 0.531250 5 0 0.562500 5 0 + 0.968750 5 0 1.00000 5 0 + 0.812500 5 0 0.843750 5 0 + 0.843750 5 0 0.875000 5 0 + 0.375000 6 0 0.390625 6 0 + 0.390625 6 0 0.406250 6 0 + 0.156250 6 0 0.171875 6 0 + 0.171875 6 0 0.187500 6 0 + 0.0156250 6 0 0.0312500 6 0 + 0.875000 6 0 0.890625 6 0 + 0.890625 6 0 0.906250 6 0 + 0.718750 6 0 0.734375 6 0 + 0.500000 6 0 0.515625 6 0 + 0.515625 6 0 0.531250 6 0 + 0.937500 6 0 0.953125 6 0 + 0.953125 6 0 0.968750 6 0 + 0.765625 6 0 0.781250 6 0 + 0.734375 7 0 0.742188 7 0 + 0.742188 7 0 0.750000 7 0 + 0.00781250 7 0 0.0156250 7 0 + 0.750000 7 0 0.757812 7 0 + 0.757812 7 0 0.765625 7 0 + 0.00000 8 0 0.00390625 8 0 + 0.00390625 8 0 0.00781250 8 0 + DEAL:1d::0.281250 4 DEAL:1d::0.281250 0 DEAL:1d:: @@ -1029,153 +1300,203 @@ DEAL:1d::Iteration 12: cells=50 0.187500 4 0 0.250000 4 0 + 0.125000 5 0 0.156250 5 0 + 0.156250 5 0 0.187500 5 0 + 0.312500 5 0 0.343750 5 0 + 0.343750 5 0 0.375000 5 0 + 0.250000 5 0 0.281250 5 0 + 0.281250 5 0 0.312500 5 0 + 0.0937500 5 0 0.125000 5 0 + 0.687500 5 0 0.718750 5 0 + 0.437500 5 0 0.468750 5 0 + 0.875000 5 0 0.906250 5 0 + 0.906250 5 0 0.937500 5 0 + 0.937500 5 0 0.968750 5 0 + 0.968750 5 0 1.00000 5 0 + 0.812500 5 0 0.843750 5 0 + 0.843750 5 0 0.875000 5 0 + 0.625000 5 0 0.656250 5 0 + 0.656250 5 0 0.687500 5 0 + 0.562500 5 0 0.593750 5 0 + 0.593750 5 0 0.625000 5 0 + 0.375000 6 0 0.390625 6 0 + 0.406250 6 0 0.421875 6 0 + 0.421875 6 0 0.437500 6 0 + 0.0312500 6 0 0.0468750 6 0 + 0.0468750 6 0 0.0625000 6 0 + 0.718750 6 0 0.734375 6 0 + 0.734375 6 0 0.750000 6 0 + 0.500000 6 0 0.515625 6 0 + 0.0625000 6 0 0.0781250 6 0 + 0.0781250 6 0 0.0937500 6 0 + 0.750000 6 0 0.765625 6 0 + 0.781250 6 0 0.796875 6 0 + 0.796875 6 0 0.812500 6 0 + 0.468750 6 0 0.484375 6 0 + 0.484375 6 0 0.500000 6 0 + 0.531250 6 0 0.546875 6 0 + 0.546875 6 0 0.562500 6 0 + 0.390625 7 0 0.398438 7 0 + 0.398438 7 0 0.406250 7 0 + 0.0156250 7 0 0.0234375 7 0 + 0.0234375 7 0 0.0312500 7 0 + 0.515625 7 0 0.523438 7 0 + 0.523438 7 0 0.531250 7 0 + 0.765625 7 0 0.773438 7 0 + 0.773438 7 0 0.781250 7 0 + 0.00000 8 0 0.00390625 8 0 + 0.00781250 8 0 0.0117188 8 0 + 0.0117188 8 0 0.0156250 8 0 + 0.00390625 9 0 0.00585938 9 0 + 0.00585938 9 0 0.00781250 9 0 + DEAL:1d::0.218750 4 DEAL:1d::0.218750 0 DEAL:1d:: @@ -1216,171 +1537,227 @@ DEAL:1d::Iteration 13: cells=56 0.812500 4 0 0.875000 4 0 + 0.875000 4 0 0.937500 4 0 + 0.125000 5 0 0.156250 5 0 + 0.156250 5 0 0.187500 5 0 + 0.312500 5 0 0.343750 5 0 + 0.343750 5 0 0.375000 5 0 + 0.281250 5 0 0.312500 5 0 + 0.406250 5 0 0.437500 5 0 + 0.781250 5 0 0.812500 5 0 + 0.437500 5 0 0.468750 5 0 + 0.187500 5 0 0.218750 5 0 + 0.218750 5 0 0.250000 5 0 + 0.937500 5 0 0.968750 5 0 + 0.625000 5 0 0.656250 5 0 + 0.656250 5 0 0.687500 5 0 + 0.593750 5 0 0.625000 5 0 + 0.375000 6 0 0.390625 6 0 + 0.390625 6 0 0.406250 6 0 + 0.250000 6 0 0.265625 6 0 + 0.265625 6 0 0.281250 6 0 + 0.0312500 6 0 0.0468750 6 0 + 0.734375 6 0 0.750000 6 0 + 0.515625 6 0 0.531250 6 0 + 0.0625000 6 0 0.0781250 6 0 + 0.750000 6 0 0.765625 6 0 + 0.765625 6 0 0.781250 6 0 + 0.0937500 6 0 0.109375 6 0 + 0.109375 6 0 0.125000 6 0 + 0.468750 6 0 0.484375 6 0 + 0.531250 6 0 0.546875 6 0 + 0.687500 6 0 0.703125 6 0 + 0.703125 6 0 0.718750 6 0 + 0.968750 6 0 0.984375 6 0 + 0.984375 6 0 1.00000 6 0 + 0.562500 6 0 0.578125 6 0 + 0.578125 6 0 0.593750 6 0 + 0.0468750 7 0 0.0546875 7 0 + 0.0546875 7 0 0.0625000 7 0 + 0.0156250 7 0 0.0234375 7 0 + 0.0234375 7 0 0.0312500 7 0 + 0.718750 7 0 0.726562 7 0 + 0.726562 7 0 0.734375 7 0 + 0.500000 7 0 0.507812 7 0 + 0.507812 7 0 0.515625 7 0 + 0.0781250 7 0 0.0859375 7 0 + 0.0859375 7 0 0.0937500 7 0 + 0.484375 7 0 0.492188 7 0 + 0.492188 7 0 0.500000 7 0 + 0.546875 7 0 0.554688 7 0 + 0.554688 7 0 0.562500 7 0 + 0.00390625 8 0 0.00781250 8 0 + 0.0117188 8 0 0.0156250 8 0 + 0.00000 9 0 0.00195312 9 0 + 0.00195312 9 0 0.00390625 9 0 + 0.00781250 9 0 0.00976562 9 0 + 0.00976562 9 0 0.0117188 9 0 + DEAL:1d::0.843750 4 DEAL:1d::0.843750 0 DEAL:1d:: @@ -1424,189 +1801,251 @@ DEAL:1d::Iteration 14: cells=62 0.125000 4 0 0.187500 4 0 + 0.812500 5 0 0.843750 5 0 + 0.843750 5 0 0.875000 5 0 + 0.312500 5 0 0.343750 5 0 + 0.343750 5 0 0.375000 5 0 + 0.281250 5 0 0.312500 5 0 + 0.0937500 5 0 0.125000 5 0 + 0.781250 5 0 0.812500 5 0 + 0.187500 5 0 0.218750 5 0 + 0.968750 5 0 1.00000 5 0 + 0.875000 5 0 0.906250 5 0 + 0.906250 5 0 0.937500 5 0 + 0.625000 5 0 0.656250 5 0 + 0.562500 5 0 0.593750 5 0 + 0.593750 5 0 0.625000 5 0 + 0.375000 6 0 0.390625 6 0 + 0.265625 6 0 0.281250 6 0 + 0.0312500 6 0 0.0468750 6 0 + 0.0468750 6 0 0.0625000 6 0 + 0.718750 6 0 0.734375 6 0 + 0.734375 6 0 0.750000 6 0 + 0.515625 6 0 0.531250 6 0 + 0.0781250 6 0 0.0937500 6 0 + 0.765625 6 0 0.781250 6 0 + 0.406250 6 0 0.421875 6 0 + 0.421875 6 0 0.437500 6 0 + 0.531250 6 0 0.546875 6 0 + 0.546875 6 0 0.562500 6 0 + 0.703125 6 0 0.718750 6 0 + 0.437500 6 0 0.453125 6 0 + 0.453125 6 0 0.468750 6 0 + 0.218750 6 0 0.234375 6 0 + 0.234375 6 0 0.250000 6 0 + 0.937500 6 0 0.953125 6 0 + 0.953125 6 0 0.968750 6 0 + 0.656250 6 0 0.671875 6 0 + 0.671875 6 0 0.687500 6 0 + 0.390625 7 0 0.398438 7 0 + 0.398438 7 0 0.406250 7 0 + 0.0234375 7 0 0.0312500 7 0 + 0.250000 7 0 0.257812 7 0 + 0.257812 7 0 0.265625 7 0 + 0.507812 7 0 0.515625 7 0 + 0.0625000 7 0 0.0703125 7 0 + 0.0703125 7 0 0.0781250 7 0 + 0.484375 7 0 0.492188 7 0 + 0.492188 7 0 0.500000 7 0 + 0.750000 7 0 0.757812 7 0 + 0.757812 7 0 0.765625 7 0 + 0.468750 7 0 0.476562 7 0 + 0.476562 7 0 0.484375 7 0 + 0.687500 7 0 0.695312 7 0 + 0.695312 7 0 0.703125 7 0 + 0.00000 8 0 0.00390625 8 0 + 0.00390625 8 0 0.00781250 8 0 + 0.00781250 8 0 0.0117188 8 0 + 0.0156250 8 0 0.0195312 8 0 + 0.0195312 8 0 0.0234375 8 0 + 0.500000 8 0 0.503906 8 0 + 0.503906 8 0 0.507812 8 0 + 0.0117188 9 0 0.0136719 9 0 + 0.0136719 9 0 0.0156250 9 0 + DEAL:1d::0.156250 4 DEAL:1d::0.156250 0 DEAL:1d:: @@ -1641,201 +2080,267 @@ DEAL:1d::Iteration 15: cells=66 0.812500 5 0 0.843750 5 0 + 0.843750 5 0 0.875000 5 0 + 0.312500 5 0 0.343750 5 0 + 0.343750 5 0 0.375000 5 0 + 0.406250 5 0 0.437500 5 0 + 0.0937500 5 0 0.125000 5 0 + 0.781250 5 0 0.812500 5 0 + 0.187500 5 0 0.218750 5 0 + 0.625000 5 0 0.656250 5 0 + 0.656250 5 0 0.687500 5 0 + 0.562500 5 0 0.593750 5 0 + 0.593750 5 0 0.625000 5 0 + 0.125000 5 0 0.156250 5 0 + 0.156250 5 0 0.187500 5 0 + 0.375000 6 0 0.390625 6 0 + 0.390625 6 0 0.406250 6 0 + 0.250000 6 0 0.265625 6 0 + 0.0312500 6 0 0.0468750 6 0 + 0.734375 6 0 0.750000 6 0 + 0.0625000 6 0 0.0781250 6 0 + 0.0781250 6 0 0.0937500 6 0 + 0.750000 6 0 0.765625 6 0 + 0.765625 6 0 0.781250 6 0 + 0.281250 6 0 0.296875 6 0 + 0.296875 6 0 0.312500 6 0 + 0.531250 6 0 0.546875 6 0 + 0.546875 6 0 0.562500 6 0 + 0.687500 6 0 0.703125 6 0 + 0.703125 6 0 0.718750 6 0 + 0.437500 6 0 0.453125 6 0 + 0.453125 6 0 0.468750 6 0 + 0.218750 6 0 0.234375 6 0 + 0.953125 6 0 0.968750 6 0 + 0.968750 6 0 0.984375 6 0 + 0.984375 6 0 1.00000 6 0 + 0.875000 6 0 0.890625 6 0 + 0.890625 6 0 0.906250 6 0 + 0.906250 6 0 0.921875 6 0 + 0.921875 6 0 0.937500 6 0 + 0.265625 7 0 0.273438 7 0 + 0.273438 7 0 0.281250 7 0 + 0.00000 7 0 0.00781250 7 0 + 0.0156250 7 0 0.0234375 7 0 + 0.0234375 7 0 0.0312500 7 0 + 0.0468750 7 0 0.0546875 7 0 + 0.0546875 7 0 0.0625000 7 0 + 0.718750 7 0 0.726562 7 0 + 0.726562 7 0 0.734375 7 0 + 0.484375 7 0 0.492188 7 0 + 0.492188 7 0 0.500000 7 0 + 0.515625 7 0 0.523438 7 0 + 0.523438 7 0 0.531250 7 0 + 0.468750 7 0 0.476562 7 0 + 0.234375 7 0 0.242188 7 0 + 0.242188 7 0 0.250000 7 0 + 0.937500 7 0 0.945312 7 0 + 0.945312 7 0 0.953125 7 0 + 0.507812 8 0 0.511719 8 0 + 0.511719 8 0 0.515625 8 0 + 0.00781250 8 0 0.0117188 8 0 + 0.0117188 8 0 0.0156250 8 0 + 0.476562 8 0 0.480469 8 0 + 0.480469 8 0 0.484375 8 0 + 0.500000 8 0 0.503906 8 0 + 0.503906 9 0 0.505859 9 0 + 0.505859 9 0 0.507812 9 0 + DEAL:1d::0.828125 5 DEAL:1d::0.828125 0 DEAL:1d:: @@ -1882,234 +2387,311 @@ DEAL:1d::Iteration 16: cells=77 0.843750 5 0 0.875000 5 0 + 0.312500 5 0 0.343750 5 0 + 0.343750 5 0 0.375000 5 0 + 0.375000 5 0 0.406250 5 0 + 0.406250 5 0 0.437500 5 0 + 0.0625000 5 0 0.0937500 5 0 + 0.687500 5 0 0.718750 5 0 + 0.750000 5 0 0.781250 5 0 + 0.781250 5 0 0.812500 5 0 + 0.968750 5 0 1.00000 5 0 + 0.875000 5 0 0.906250 5 0 + 0.906250 5 0 0.937500 5 0 + 0.656250 5 0 0.687500 5 0 + 0.562500 5 0 0.593750 5 0 + 0.593750 5 0 0.625000 5 0 + 0.125000 5 0 0.156250 5 0 + 0.156250 5 0 0.187500 5 0 + 0.812500 6 0 0.828125 6 0 + 0.828125 6 0 0.843750 6 0 + 0.0312500 6 0 0.0468750 6 0 + 0.0468750 6 0 0.0625000 6 0 + 0.718750 6 0 0.734375 6 0 + 0.734375 6 0 0.750000 6 0 + 0.0937500 6 0 0.109375 6 0 + 0.109375 6 0 0.125000 6 0 + 0.187500 6 0 0.203125 6 0 + 0.203125 6 0 0.218750 6 0 + 0.296875 6 0 0.312500 6 0 + 0.546875 6 0 0.562500 6 0 + 0.625000 6 0 0.640625 6 0 + 0.640625 6 0 0.656250 6 0 + 0.437500 6 0 0.453125 6 0 + 0.937500 6 0 0.953125 6 0 + 0.953125 6 0 0.968750 6 0 + 0.265625 7 0 0.273438 7 0 + 0.0234375 7 0 0.0312500 7 0 + 0.250000 7 0 0.257812 7 0 + 0.257812 7 0 0.265625 7 0 + 0.281250 7 0 0.289062 7 0 + 0.289062 7 0 0.296875 7 0 + 0.468750 7 0 0.476562 7 0 + 0.242188 7 0 0.250000 7 0 + 0.531250 7 0 0.539062 7 0 + 0.539062 7 0 0.546875 7 0 + 0.453125 7 0 0.460938 7 0 + 0.460938 7 0 0.468750 7 0 + 0.218750 7 0 0.226562 7 0 + 0.226562 7 0 0.234375 7 0 + 0.507812 8 0 0.511719 8 0 + 0.476562 8 0 0.480469 8 0 + 0.503906 8 0 0.507812 8 0 + 0.273438 8 0 0.277344 8 0 + 0.277344 8 0 0.281250 8 0 + 0.00000 8 0 0.00390625 8 0 + 0.00390625 8 0 0.00781250 8 0 + 0.0156250 8 0 0.0195312 8 0 + 0.0195312 8 0 0.0234375 8 0 + 0.484375 8 0 0.488281 8 0 + 0.488281 8 0 0.492188 8 0 + 0.492188 8 0 0.496094 8 0 + 0.496094 8 0 0.500000 8 0 + 0.515625 8 0 0.519531 8 0 + 0.519531 8 0 0.523438 8 0 + 0.523438 8 0 0.527344 8 0 + 0.527344 8 0 0.531250 8 0 + 0.234375 8 0 0.238281 8 0 + 0.238281 8 0 0.242188 8 0 + 0.511719 9 0 0.513672 9 0 + 0.513672 9 0 0.515625 9 0 + 0.00781250 9 0 0.00976562 9 0 + 0.00976562 9 0 0.0117188 9 0 + 0.0117188 9 0 0.0136719 9 0 + 0.0136719 9 0 0.0156250 9 0 + 0.480469 9 0 0.482422 9 0 + 0.482422 9 0 0.484375 9 0 + 0.500000 9 0 0.501953 9 0 + 0.501953 9 0 0.503906 9 0 + DEAL:1d::0.859375 5 DEAL:1d::0.859375 0 DEAL:1d:: @@ -2159,261 +2741,347 @@ DEAL:1d::Iteration 17: cells=86 0.750000 4 0 0.812500 4 0 + 0.812500 5 0 0.843750 5 0 + 0.343750 5 0 0.375000 5 0 + 0.375000 5 0 0.406250 5 0 + 0.406250 5 0 0.437500 5 0 + 0.0625000 5 0 0.0937500 5 0 + 0.687500 5 0 0.718750 5 0 + 0.718750 5 0 0.750000 5 0 + 0.968750 5 0 1.00000 5 0 + 0.625000 5 0 0.656250 5 0 + 0.656250 5 0 0.687500 5 0 + 0.593750 5 0 0.625000 5 0 + 0.843750 6 0 0.859375 6 0 + 0.859375 6 0 0.875000 6 0 + 0.0312500 6 0 0.0468750 6 0 + 0.0468750 6 0 0.0625000 6 0 + 0.312500 6 0 0.328125 6 0 + 0.328125 6 0 0.343750 6 0 + 0.0937500 6 0 0.109375 6 0 + 0.296875 6 0 0.312500 6 0 + 0.875000 6 0 0.890625 6 0 + 0.890625 6 0 0.906250 6 0 + 0.437500 6 0 0.453125 6 0 + 0.453125 6 0 0.468750 6 0 + 0.218750 6 0 0.234375 6 0 + 0.953125 6 0 0.968750 6 0 + 0.906250 6 0 0.921875 6 0 + 0.921875 6 0 0.937500 6 0 + 0.562500 6 0 0.578125 6 0 + 0.578125 6 0 0.593750 6 0 + 0.125000 6 0 0.140625 6 0 + 0.140625 6 0 0.156250 6 0 + 0.156250 6 0 0.171875 6 0 + 0.171875 6 0 0.187500 6 0 + 0.00000 7 0 0.00781250 7 0 + 0.0234375 7 0 0.0312500 7 0 + 0.250000 7 0 0.257812 7 0 + 0.257812 7 0 0.265625 7 0 + 0.289062 7 0 0.296875 7 0 + 0.515625 7 0 0.523438 7 0 + 0.468750 7 0 0.476562 7 0 + 0.234375 7 0 0.242188 7 0 + 0.539062 7 0 0.546875 7 0 + 0.109375 7 0 0.117188 7 0 + 0.117188 7 0 0.125000 7 0 + 0.187500 7 0 0.195312 7 0 + 0.195312 7 0 0.203125 7 0 + 0.203125 7 0 0.210938 7 0 + 0.210938 7 0 0.218750 7 0 + 0.546875 7 0 0.554688 7 0 + 0.554688 7 0 0.562500 7 0 + 0.937500 7 0 0.945312 7 0 + 0.945312 7 0 0.953125 7 0 + 0.507812 8 0 0.511719 8 0 + 0.511719 8 0 0.515625 8 0 + 0.00781250 8 0 0.0117188 8 0 + 0.0117188 8 0 0.0156250 8 0 + 0.476562 8 0 0.480469 8 0 + 0.480469 8 0 0.484375 8 0 + 0.277344 8 0 0.281250 8 0 + 0.265625 8 0 0.269531 8 0 + 0.269531 8 0 0.273438 8 0 + 0.0195312 8 0 0.0234375 8 0 + 0.484375 8 0 0.488281 8 0 + 0.488281 8 0 0.492188 8 0 + 0.496094 8 0 0.500000 8 0 + 0.281250 8 0 0.285156 8 0 + 0.285156 8 0 0.289062 8 0 + 0.523438 8 0 0.527344 8 0 + 0.242188 8 0 0.246094 8 0 + 0.246094 8 0 0.250000 8 0 + 0.531250 8 0 0.535156 8 0 + 0.535156 8 0 0.539062 8 0 + 0.503906 9 0 0.505859 9 0 + 0.505859 9 0 0.507812 9 0 + 0.273438 9 0 0.275391 9 0 + 0.275391 9 0 0.277344 9 0 + 0.0156250 9 0 0.0175781 9 0 + 0.0175781 9 0 0.0195312 9 0 + 0.492188 9 0 0.494141 9 0 + 0.494141 9 0 0.496094 9 0 + 0.500000 9 0 0.501953 9 0 + 0.527344 9 0 0.529297 9 0 + 0.529297 9 0 0.531250 9 0 + 0.501953 10 0 0.502930 10 0 + 0.502930 10 0 0.503906 10 0 + DEAL:1d::0.781250 4 DEAL:1d::0.781250 0 DEAL:1d:: @@ -2466,297 +3134,395 @@ DEAL:1d::Iteration 18: cells=98 0.625000 4 0 0.687500 4 0 + 0.687500 4 0 0.750000 4 0 + 0.812500 5 0 0.843750 5 0 + 0.343750 5 0 0.375000 5 0 + 0.375000 5 0 0.406250 5 0 + 0.406250 5 0 0.437500 5 0 + 0.750000 5 0 0.781250 5 0 + 0.781250 5 0 0.812500 5 0 + 0.562500 5 0 0.593750 5 0 + 0.593750 5 0 0.625000 5 0 + 0.156250 5 0 0.187500 5 0 + 0.843750 6 0 0.859375 6 0 + 0.859375 6 0 0.875000 6 0 + 0.0312500 6 0 0.0468750 6 0 + 0.0468750 6 0 0.0625000 6 0 + 0.312500 6 0 0.328125 6 0 + 0.328125 6 0 0.343750 6 0 + 0.187500 6 0 0.203125 6 0 + 0.546875 6 0 0.562500 6 0 + 0.890625 6 0 0.906250 6 0 + 0.437500 6 0 0.453125 6 0 + 0.453125 6 0 0.468750 6 0 + 0.906250 6 0 0.921875 6 0 + 0.0625000 6 0 0.0781250 6 0 + 0.0781250 6 0 0.0937500 6 0 + 0.140625 6 0 0.156250 6 0 + 0.968750 6 0 0.984375 6 0 + 0.984375 6 0 1.00000 6 0 + 0.00000 7 0 0.00781250 7 0 + 0.0234375 7 0 0.0312500 7 0 + 0.250000 7 0 0.257812 7 0 + 0.507812 7 0 0.515625 7 0 + 0.289062 7 0 0.296875 7 0 + 0.515625 7 0 0.523438 7 0 + 0.468750 7 0 0.476562 7 0 + 0.242188 7 0 0.250000 7 0 + 0.539062 7 0 0.546875 7 0 + 0.0937500 7 0 0.101562 7 0 + 0.101562 7 0 0.109375 7 0 + 0.203125 7 0 0.210938 7 0 + 0.296875 7 0 0.304688 7 0 + 0.304688 7 0 0.312500 7 0 + 0.945312 7 0 0.953125 7 0 + 0.875000 7 0 0.882812 7 0 + 0.882812 7 0 0.890625 7 0 + 0.218750 7 0 0.226562 7 0 + 0.226562 7 0 0.234375 7 0 + 0.953125 7 0 0.960938 7 0 + 0.960938 7 0 0.968750 7 0 + 0.921875 7 0 0.929688 7 0 + 0.929688 7 0 0.937500 7 0 + 0.125000 7 0 0.132812 7 0 + 0.132812 7 0 0.140625 7 0 + 0.257812 8 0 0.261719 8 0 + 0.261719 8 0 0.265625 8 0 + 0.00781250 8 0 0.0117188 8 0 + 0.476562 8 0 0.480469 8 0 + 0.480469 8 0 0.484375 8 0 + 0.503906 8 0 0.507812 8 0 + 0.265625 8 0 0.269531 8 0 + 0.269531 8 0 0.273438 8 0 + 0.0195312 8 0 0.0234375 8 0 + 0.488281 8 0 0.492188 8 0 + 0.492188 8 0 0.496094 8 0 + 0.281250 8 0 0.285156 8 0 + 0.285156 8 0 0.289062 8 0 + 0.523438 8 0 0.527344 8 0 + 0.527344 8 0 0.531250 8 0 + 0.234375 8 0 0.238281 8 0 + 0.238281 8 0 0.242188 8 0 + 0.535156 8 0 0.539062 8 0 + 0.109375 8 0 0.113281 8 0 + 0.113281 8 0 0.117188 8 0 + 0.117188 8 0 0.121094 8 0 + 0.121094 8 0 0.125000 8 0 + 0.210938 8 0 0.214844 8 0 + 0.214844 8 0 0.218750 8 0 + 0.937500 8 0 0.941406 8 0 + 0.941406 8 0 0.945312 8 0 + 0.0117188 9 0 0.0136719 9 0 + 0.0136719 9 0 0.0156250 9 0 + 0.273438 9 0 0.275391 9 0 + 0.0175781 9 0 0.0195312 9 0 + 0.277344 9 0 0.279297 9 0 + 0.279297 9 0 0.281250 9 0 + 0.501953 9 0 0.503906 9 0 + 0.484375 9 0 0.486328 9 0 + 0.486328 9 0 0.488281 9 0 + 0.496094 9 0 0.498047 9 0 + 0.498047 9 0 0.500000 9 0 + 0.531250 9 0 0.533203 9 0 + 0.533203 9 0 0.535156 9 0 + 0.275391 10 0 0.276367 10 0 + 0.276367 10 0 0.277344 10 0 + 0.0156250 10 0 0.0166016 10 0 + 0.0166016 10 0 0.0175781 10 0 + 0.500000 10 0 0.500977 10 0 + 0.500977 10 0 0.501953 10 0 + DEAL:1d::0.656250 4 DEAL:1d::0.656250 0 DEAL:1d:: diff --git a/tests/deal.II/distort_random.output b/tests/deal.II/distort_random.output index c453424d6a..08244c985d 100644 --- a/tests/deal.II/distort_random.output +++ b/tests/deal.II/distort_random.output @@ -3,28 +3,36 @@ DEAL::dim=1, keep_boundary=1 0.000 2 0 0.2250 2 0 + 0.2250 2 0 0.5250 2 0 + 0.5250 2 0 0.7750 2 0 + 0.7750 2 0 1.000 2 0 + DEAL::dim=1, keep_boundary=0 0.02500 2 0 0.2250 2 0 + 0.2250 2 0 0.4750 2 0 + 0.4750 2 0 0.7750 2 0 + 0.7750 2 0 1.025 2 0 + DEAL::dim=2, keep_boundary=1 0.000 0.000 2 0 0.2500 0.000 2 0 diff --git a/tests/deal.II/grid_out.output b/tests/deal.II/grid_out.output index faf6278995..8846d25ad8 100644 --- a/tests/deal.II/grid_out.output +++ b/tests/deal.II/grid_out.output @@ -2,9 +2,11 @@ 0.0 1 0 0.50 1 0 + 0.50 1 0 1.0 1 0 + # This file was generated by the deal.II library. diff --git a/tests/deal.II/grid_parallelepiped.output b/tests/deal.II/grid_parallelepiped.output index 8034c6edc4..f0422e944d 100644 --- a/tests/deal.II/grid_parallelepiped.output +++ b/tests/deal.II/grid_parallelepiped.output @@ -1,6 +1,7 @@ 0 0 0 0.5 0 0 + 0 0 0 0 0 0.5 0 0 0.5 0.5 0 0 diff --git a/tests/deal.II/grid_parallelepiped_03.output b/tests/deal.II/grid_parallelepiped_03.output index 90e331be52..c83641ec48 100644 --- a/tests/deal.II/grid_parallelepiped_03.output +++ b/tests/deal.II/grid_parallelepiped_03.output @@ -1,12 +1,15 @@ 0 0 0 0.166667 0 0 + 0.166667 0 0 0.333333 0 0 + 0.333333 0 0 0.5 0 0 + 0 0 0 0 0.05 0.1 0 0 0.15 0.15 0 0 diff --git a/tests/deal.II/union_triangulation.output b/tests/deal.II/union_triangulation.output index ff08b4dcdd..95383f20c1 100644 --- a/tests/deal.II/union_triangulation.output +++ b/tests/deal.II/union_triangulation.output @@ -2,15 +2,19 @@ 0.0 2 0 0.25 2 0 + 0.25 2 0 0.50 2 0 + 0.50 2 0 0.75 2 0 + 0.75 2 0 1.0 2 0 + DEAL:: Total number of cells = 7 DEAL:: Total number of active cells = 4 0.0 0.50 1 0 diff --git a/tests/grid/grid_generator_01.output b/tests/grid/grid_generator_01.output index f2180c1a57..c418ecc5bf 100644 --- a/tests/grid/grid_generator_01.output +++ b/tests/grid/grid_generator_01.output @@ -3,27 +3,34 @@ DEAL:1d::hyper_cube 3.00000 0 0 7.00000 0 0 + DEAL:1d::subdivided_hyper_cube 1.00000 0 0 3.00000 0 0 + 3.00000 0 0 5.00000 0 0 + 5.00000 0 0 7.00000 0 0 + DEAL:1d::hyper_rectangle 2.00000 0 0 3.00000 0 0 + DEAL:1d::subdivided_hyper_rectangle 2.00000 0 1 2.50000 0 1 + 2.50000 0 1 3.00000 0 1 + DEAL:2d::hyper_cube #FIG 3.2 Landscape diff --git a/tests/grid/grid_generator_02.output b/tests/grid/grid_generator_02.output index a5407eaec7..1627b7dc94 100644 --- a/tests/grid/grid_generator_02.output +++ b/tests/grid/grid_generator_02.output @@ -3,16 +3,20 @@ DEAL:1d::subdivided_hyper_rectangle 2.00000 0 1 2.50000 0 1 + 2.50000 0 1 3.00000 0 1 + DEAL:1d::subdivided_hyper_rectangle 2.00000 0 1 2.25000 0 1 + 2.25000 0 1 3.00000 0 1 + DEAL:2d::subdivided_hyper_rectangle 2.00000 -1.00000 0 1 2.50000 -1.00000 0 1 diff --git a/tests/grid/grid_generator_03.output b/tests/grid/grid_generator_03.output index 809e836407..cbfe75891e 100644 --- a/tests/grid/grid_generator_03.output +++ b/tests/grid/grid_generator_03.output @@ -3,16 +3,20 @@ DEAL:1d::subdivided_hyper_rectangle 2.00000 0 1 2.50000 0 1 + 2.50000 0 1 3.00000 0 1 + DEAL:1d::subdivided_hyper_rectangle 2.00000 0 1 2.25000 0 1 + 2.25000 0 1 3.00000 0 1 + DEAL:2d::subdivided_hyper_rectangle 2.00000 -1.00000 0 1 2.50000 -1.00000 0 1 -- 2.39.5