From: Matthias Maier Date: Fri, 28 Aug 2015 03:44:44 +0000 (-0500) Subject: Testsuite: Move matching tests: deal.II -> grid/ X-Git-Tag: v8.4.0-rc2~530^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01a3d141d15900c493a94db99e6587632c9b5f0f;p=dealii.git Testsuite: Move matching tests: deal.II -> grid/ --- diff --git a/tests/deal.II/grid_in_msh_02.cc b/tests/deal.II/grid_in_msh_02.cc deleted file mode 100644 index cfa014f4e3..0000000000 --- a/tests/deal.II/grid_in_msh_02.cc +++ /dev/null @@ -1,73 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2002 - 2014 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. -// -// --------------------------------------------------------------------- - - -// in 1d, we have to read vertex information to set boundary -// indicators -// -// test case by Jan Strebel - - -#include "../tests.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -std::ofstream logfile("output"); - - -void check_file () -{ - Triangulation<1> tria; - GridIn<1> gi; - gi.attach_triangulation (tria); - std::ifstream in (SOURCE_DIR "/../grid/grids/grid_in_msh_02.msh"); - gi.read_msh(in); - - for (Triangulation<1>::active_cell_iterator cell = tria.begin_active(); cell != tria.end(); ++cell) - { - for (unsigned int face = 0; face < 2; ++face) - { - if (cell->at_boundary(face)) - deallog << "vertex " << cell->face_index(face) - << " has boundary indicator " << (int)cell->face(face)->boundary_indicator() - << std::endl; - } - } -} - - -int main () -{ - deallog << std::setprecision (2); - logfile << std::setprecision (2); - deallog.attach(logfile); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - check_file (); -} - diff --git a/tests/deal.II/grid_in_msh_02.output b/tests/deal.II/grid_in_msh_02.output deleted file mode 100644 index 2ebba38d85..0000000000 --- a/tests/deal.II/grid_in_msh_02.output +++ /dev/null @@ -1,3 +0,0 @@ - -DEAL::vertex 0 has boundary indicator 10 -DEAL::vertex 1 has boundary indicator 20 diff --git a/tests/deal.II/grid_generator_01.cc b/tests/grid/grid_generator_09.cc similarity index 100% rename from tests/deal.II/grid_generator_01.cc rename to tests/grid/grid_generator_09.cc diff --git a/tests/deal.II/grid_generator_01.output b/tests/grid/grid_generator_09.output similarity index 100% rename from tests/deal.II/grid_generator_01.output rename to tests/grid/grid_generator_09.output diff --git a/tests/deal.II/grid_hyper_shell.cc b/tests/grid/grid_hyper_shell.cc similarity index 100% rename from tests/deal.II/grid_hyper_shell.cc rename to tests/grid/grid_hyper_shell.cc diff --git a/tests/deal.II/grid_hyper_shell.output b/tests/grid/grid_hyper_shell.output similarity index 100% rename from tests/deal.II/grid_hyper_shell.output rename to tests/grid/grid_hyper_shell.output diff --git a/tests/deal.II/grid_hyper_shell_02.cc b/tests/grid/grid_hyper_shell_02.cc similarity index 100% rename from tests/deal.II/grid_hyper_shell_02.cc rename to tests/grid/grid_hyper_shell_02.cc diff --git a/tests/deal.II/grid_hyper_shell_02.output b/tests/grid/grid_hyper_shell_02.output similarity index 100% rename from tests/deal.II/grid_hyper_shell_02.output rename to tests/grid/grid_hyper_shell_02.output diff --git a/tests/deal.II/grid_hyper_shell_03.cc b/tests/grid/grid_hyper_shell_03.cc similarity index 100% rename from tests/deal.II/grid_hyper_shell_03.cc rename to tests/grid/grid_hyper_shell_03.cc diff --git a/tests/deal.II/grid_hyper_shell_03.output b/tests/grid/grid_hyper_shell_03.output similarity index 100% rename from tests/deal.II/grid_hyper_shell_03.output rename to tests/grid/grid_hyper_shell_03.output diff --git a/tests/deal.II/grid_hyper_shell_04.cc b/tests/grid/grid_hyper_shell_04.cc similarity index 100% rename from tests/deal.II/grid_hyper_shell_04.cc rename to tests/grid/grid_hyper_shell_04.cc diff --git a/tests/deal.II/grid_hyper_shell_04.output b/tests/grid/grid_hyper_shell_04.output similarity index 100% rename from tests/deal.II/grid_hyper_shell_04.output rename to tests/grid/grid_hyper_shell_04.output diff --git a/tests/deal.II/grid_hyper_shell_05.cc b/tests/grid/grid_hyper_shell_05.cc similarity index 100% rename from tests/deal.II/grid_hyper_shell_05.cc rename to tests/grid/grid_hyper_shell_05.cc diff --git a/tests/deal.II/grid_hyper_shell_05.output b/tests/grid/grid_hyper_shell_05.output similarity index 100% rename from tests/deal.II/grid_hyper_shell_05.output rename to tests/grid/grid_hyper_shell_05.output diff --git a/tests/deal.II/grid_hyper_shell_06.cc b/tests/grid/grid_hyper_shell_06.cc similarity index 100% rename from tests/deal.II/grid_hyper_shell_06.cc rename to tests/grid/grid_hyper_shell_06.cc diff --git a/tests/deal.II/grid_hyper_shell_06.output b/tests/grid/grid_hyper_shell_06.output similarity index 100% rename from tests/deal.II/grid_hyper_shell_06.output rename to tests/grid/grid_hyper_shell_06.output diff --git a/tests/deal.II/grid_in.cc b/tests/grid/grid_in.cc similarity index 100% rename from tests/deal.II/grid_in.cc rename to tests/grid/grid_in.cc diff --git a/tests/deal.II/grid_in.output b/tests/grid/grid_in.output similarity index 100% rename from tests/deal.II/grid_in.output rename to tests/grid/grid_in.output diff --git a/tests/deal.II/grid_in/2d.inp b/tests/grid/grid_in/2d.inp similarity index 100% rename from tests/deal.II/grid_in/2d.inp rename to tests/grid/grid_in/2d.inp diff --git a/tests/deal.II/grid_in/2d.nc b/tests/grid/grid_in/2d.nc similarity index 100% rename from tests/deal.II/grid_in/2d.nc rename to tests/grid/grid_in/2d.nc diff --git a/tests/deal.II/grid_in/2d.xda b/tests/grid/grid_in/2d.xda similarity index 100% rename from tests/deal.II/grid_in/2d.xda rename to tests/grid/grid_in/2d.xda diff --git a/tests/deal.II/grid_in_02.cc b/tests/grid/grid_in_02.cc similarity index 100% rename from tests/deal.II/grid_in_02.cc rename to tests/grid/grid_in_02.cc diff --git a/tests/deal.II/grid_in_02.output b/tests/grid/grid_in_02.output similarity index 100% rename from tests/deal.II/grid_in_02.output rename to tests/grid/grid_in_02.output diff --git a/tests/deal.II/grid_in_02/2d.xda b/tests/grid/grid_in_02/2d.xda similarity index 100% rename from tests/deal.II/grid_in_02/2d.xda rename to tests/grid/grid_in_02/2d.xda diff --git a/tests/deal.II/grid_in_3d.cc b/tests/grid/grid_in_3d.cc similarity index 100% rename from tests/deal.II/grid_in_3d.cc rename to tests/grid/grid_in_3d.cc diff --git a/tests/deal.II/grid_in_3d.output b/tests/grid/grid_in_3d.output similarity index 100% rename from tests/deal.II/grid_in_3d.output rename to tests/grid/grid_in_3d.output diff --git a/tests/deal.II/grid_in_3d/1.in b/tests/grid/grid_in_3d/1.in similarity index 100% rename from tests/deal.II/grid_in_3d/1.in rename to tests/grid/grid_in_3d/1.in diff --git a/tests/deal.II/grid_in_3d/1.nc b/tests/grid/grid_in_3d/1.nc similarity index 100% rename from tests/deal.II/grid_in_3d/1.nc rename to tests/grid/grid_in_3d/1.nc diff --git a/tests/deal.II/grid_in_3d/2.in b/tests/grid/grid_in_3d/2.in similarity index 100% rename from tests/deal.II/grid_in_3d/2.in rename to tests/grid/grid_in_3d/2.in diff --git a/tests/deal.II/grid_in_3d/3.in b/tests/grid/grid_in_3d/3.in similarity index 100% rename from tests/deal.II/grid_in_3d/3.in rename to tests/grid/grid_in_3d/3.in diff --git a/tests/deal.II/grid_in_3d/4.in b/tests/grid/grid_in_3d/4.in similarity index 100% rename from tests/deal.II/grid_in_3d/4.in rename to tests/grid/grid_in_3d/4.in diff --git a/tests/deal.II/grid_in_3d/evil_0.in b/tests/grid/grid_in_3d/evil_0.in similarity index 100% rename from tests/deal.II/grid_in_3d/evil_0.in rename to tests/grid/grid_in_3d/evil_0.in diff --git a/tests/deal.II/grid_in_3d/evil_1.in b/tests/grid/grid_in_3d/evil_1.in similarity index 100% rename from tests/deal.II/grid_in_3d/evil_1.in rename to tests/grid/grid_in_3d/evil_1.in diff --git a/tests/deal.II/grid_in_3d/evil_2.in b/tests/grid/grid_in_3d/evil_2.in similarity index 100% rename from tests/deal.II/grid_in_3d/evil_2.in rename to tests/grid/grid_in_3d/evil_2.in diff --git a/tests/deal.II/grid_in_3d/evil_3.in b/tests/grid/grid_in_3d/evil_3.in similarity index 100% rename from tests/deal.II/grid_in_3d/evil_3.in rename to tests/grid/grid_in_3d/evil_3.in diff --git a/tests/deal.II/grid_in_3d/evil_4.in b/tests/grid/grid_in_3d/evil_4.in similarity index 100% rename from tests/deal.II/grid_in_3d/evil_4.in rename to tests/grid/grid_in_3d/evil_4.in diff --git a/tests/deal.II/grid_in_3d_02.cc b/tests/grid/grid_in_3d_02.cc similarity index 100% rename from tests/deal.II/grid_in_3d_02.cc rename to tests/grid/grid_in_3d_02.cc diff --git a/tests/deal.II/grid_in_3d_02.output b/tests/grid/grid_in_3d_02.output similarity index 100% rename from tests/deal.II/grid_in_3d_02.output rename to tests/grid/grid_in_3d_02.output diff --git a/tests/deal.II/grid_in_3d_02/747.ucd b/tests/grid/grid_in_3d_02/747.ucd similarity index 100% rename from tests/deal.II/grid_in_3d_02/747.ucd rename to tests/grid/grid_in_3d_02/747.ucd diff --git a/tests/grid/grid_in_msh_01.2d.msh b/tests/grid/grid_in_gmsh_01.2d.msh similarity index 100% rename from tests/grid/grid_in_msh_01.2d.msh rename to tests/grid/grid_in_gmsh_01.2d.msh diff --git a/tests/grid/grid_in_msh_01.2da.msh b/tests/grid/grid_in_gmsh_01.2da.msh similarity index 100% rename from tests/grid/grid_in_msh_01.2da.msh rename to tests/grid/grid_in_gmsh_01.2da.msh diff --git a/tests/grid/grid_in_msh_01.3d.msh b/tests/grid/grid_in_gmsh_01.3d.msh similarity index 100% rename from tests/grid/grid_in_msh_01.3d.msh rename to tests/grid/grid_in_gmsh_01.3d.msh diff --git a/tests/grid/grid_in_msh_01.3d_neg.msh b/tests/grid/grid_in_gmsh_01.3d_neg.msh similarity index 100% rename from tests/grid/grid_in_msh_01.3d_neg.msh rename to tests/grid/grid_in_gmsh_01.3d_neg.msh diff --git a/tests/grid/grid_in_msh_01.3da.msh b/tests/grid/grid_in_gmsh_01.3da.msh similarity index 100% rename from tests/grid/grid_in_msh_01.3da.msh rename to tests/grid/grid_in_gmsh_01.3da.msh diff --git a/tests/grid/grid_in_msh_01.cc b/tests/grid/grid_in_gmsh_01.cc similarity index 100% rename from tests/grid/grid_in_msh_01.cc rename to tests/grid/grid_in_gmsh_01.cc diff --git a/tests/grid/grid_in_msh_01.output b/tests/grid/grid_in_gmsh_01.output similarity index 100% rename from tests/grid/grid_in_msh_01.output rename to tests/grid/grid_in_gmsh_01.output diff --git a/tests/grid/grid_in_gmsh_02.cc b/tests/grid/grid_in_gmsh_02.cc new file mode 100644 index 0000000000..b615e5cba3 --- /dev/null +++ b/tests/grid/grid_in_gmsh_02.cc @@ -0,0 +1,93 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2004 - 2014 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 whether we can read in with the gmsh format + +#include "../tests.h" +#include + +#include +#include +#include +#include + +#include +#include + + +template +void gmsh_grid (const char *name) +{ + Triangulation tria; + GridIn grid_in; + grid_in.attach_triangulation (tria); + std::ifstream input_file(name); + grid_in.read_msh(input_file); + + deallog << " " << tria.n_active_cells() << " active cells" << std::endl; + + int hash = 0; + int index = 0; + for (typename Triangulation::active_cell_iterator c=tria.begin_active(); + c!=tria.end(); ++c, ++index) + for (unsigned int i=0; i::vertices_per_cell; ++i) + hash += (index * i * c->vertex_index(i)) % (tria.n_active_cells()+1); + deallog << " hash=" << hash << std::endl; +} + + +int main () +{ + std::ofstream logfile("output"); + deallog.attach(logfile); + deallog.depth_console(0); + deallog.threshold_double(1.e-10); + + try + { + gmsh_grid<2> (SOURCE_DIR "/grids/grid_in_msh_01.2d.msh"); + gmsh_grid<2> (SOURCE_DIR "/grids/grid_in_msh_01.2da.msh"); + gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3d.msh"); + gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3da.msh"); + gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3d_neg.msh"); + } + catch (std::exception &exc) + { + deallog << std::endl << std::endl + << "----------------------------------------------------" + << std::endl; + deallog << "Exception on processing: " << std::endl + << exc.what() << std::endl + << "Aborting!" << std::endl + << "----------------------------------------------------" + << std::endl; + return 1; + } + catch (...) + { + deallog << std::endl << std::endl + << "----------------------------------------------------" + << std::endl; + deallog << "Unknown exception!" << std::endl + << "Aborting!" << std::endl + << "----------------------------------------------------" + << std::endl; + return 1; + }; + + return 0; +} diff --git a/tests/grid/grid_in_gmsh_02.output b/tests/grid/grid_in_gmsh_02.output new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/deal.II/grid_in_msh.cc b/tests/grid/grid_in_msh.cc similarity index 100% rename from tests/deal.II/grid_in_msh.cc rename to tests/grid/grid_in_msh.cc diff --git a/tests/deal.II/grid_in_msh.output b/tests/grid/grid_in_msh.output similarity index 100% rename from tests/deal.II/grid_in_msh.output rename to tests/grid/grid_in_msh.output diff --git a/tests/deal.II/grid_in_msh/mesh.msh b/tests/grid/grid_in_msh/mesh.msh similarity index 100% rename from tests/deal.II/grid_in_msh/mesh.msh rename to tests/grid/grid_in_msh/mesh.msh diff --git a/tests/grid/grid_in_msh_02.cc b/tests/grid/grid_in_msh_02.cc index b615e5cba3..cfa014f4e3 100644 --- a/tests/grid/grid_in_msh_02.cc +++ b/tests/grid/grid_in_msh_02.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2004 - 2014 by the deal.II authors +// Copyright (C) 2002 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -14,80 +14,60 @@ // --------------------------------------------------------------------- +// in 1d, we have to read vertex information to set boundary +// indicators +// +// test case by Jan Strebel -// check whether we can read in with the gmsh format #include "../tests.h" -#include - +#include #include +#include +#include #include #include +#include #include +#include +#include #include -#include +#include +#include +std::ofstream logfile("output"); -template -void gmsh_grid (const char *name) -{ - Triangulation tria; - GridIn grid_in; - grid_in.attach_triangulation (tria); - std::ifstream input_file(name); - grid_in.read_msh(input_file); - deallog << " " << tria.n_active_cells() << " active cells" << std::endl; +void check_file () +{ + Triangulation<1> tria; + GridIn<1> gi; + gi.attach_triangulation (tria); + std::ifstream in (SOURCE_DIR "/../grid/grids/grid_in_msh_02.msh"); + gi.read_msh(in); - int hash = 0; - int index = 0; - for (typename Triangulation::active_cell_iterator c=tria.begin_active(); - c!=tria.end(); ++c, ++index) - for (unsigned int i=0; i::vertices_per_cell; ++i) - hash += (index * i * c->vertex_index(i)) % (tria.n_active_cells()+1); - deallog << " hash=" << hash << std::endl; + for (Triangulation<1>::active_cell_iterator cell = tria.begin_active(); cell != tria.end(); ++cell) + { + for (unsigned int face = 0; face < 2; ++face) + { + if (cell->at_boundary(face)) + deallog << "vertex " << cell->face_index(face) + << " has boundary indicator " << (int)cell->face(face)->boundary_indicator() + << std::endl; + } + } } int main () { - std::ofstream logfile("output"); + deallog << std::setprecision (2); + logfile << std::setprecision (2); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); - try - { - gmsh_grid<2> (SOURCE_DIR "/grids/grid_in_msh_01.2d.msh"); - gmsh_grid<2> (SOURCE_DIR "/grids/grid_in_msh_01.2da.msh"); - gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3d.msh"); - gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3da.msh"); - gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3d_neg.msh"); - } - catch (std::exception &exc) - { - deallog << std::endl << std::endl - << "----------------------------------------------------" - << std::endl; - deallog << "Exception on processing: " << std::endl - << exc.what() << std::endl - << "Aborting!" << std::endl - << "----------------------------------------------------" - << std::endl; - return 1; - } - catch (...) - { - deallog << std::endl << std::endl - << "----------------------------------------------------" - << std::endl; - deallog << "Unknown exception!" << std::endl - << "Aborting!" << std::endl - << "----------------------------------------------------" - << std::endl; - return 1; - }; - - return 0; + check_file (); } + diff --git a/tests/grid/grid_in_msh_02.output b/tests/grid/grid_in_msh_02.output index e69de29bb2..2ebba38d85 100644 --- a/tests/grid/grid_in_msh_02.output +++ b/tests/grid/grid_in_msh_02.output @@ -0,0 +1,3 @@ + +DEAL::vertex 0 has boundary indicator 10 +DEAL::vertex 1 has boundary indicator 20 diff --git a/tests/deal.II/grid_in_msh_02/mesh.msh b/tests/grid/grid_in_msh_02/mesh.msh similarity index 100% rename from tests/deal.II/grid_in_msh_02/mesh.msh rename to tests/grid/grid_in_msh_02/mesh.msh diff --git a/tests/deal.II/grid_in_msh_02_13.cc b/tests/grid/grid_in_msh_02_13.cc similarity index 100% rename from tests/deal.II/grid_in_msh_02_13.cc rename to tests/grid/grid_in_msh_02_13.cc diff --git a/tests/deal.II/grid_in_msh_02_13.output b/tests/grid/grid_in_msh_02_13.output similarity index 100% rename from tests/deal.II/grid_in_msh_02_13.output rename to tests/grid/grid_in_msh_02_13.output diff --git a/tests/deal.II/grid_in_msh_03.cc b/tests/grid/grid_in_msh_03.cc similarity index 100% rename from tests/deal.II/grid_in_msh_03.cc rename to tests/grid/grid_in_msh_03.cc diff --git a/tests/deal.II/grid_in_msh_03.output b/tests/grid/grid_in_msh_03.output similarity index 100% rename from tests/deal.II/grid_in_msh_03.output rename to tests/grid/grid_in_msh_03.output diff --git a/tests/deal.II/grid_in_msh_03/mesh.msh b/tests/grid/grid_in_msh_03/mesh.msh similarity index 100% rename from tests/deal.II/grid_in_msh_03/mesh.msh rename to tests/grid/grid_in_msh_03/mesh.msh diff --git a/tests/deal.II/grid_in_msh_version_1.cc b/tests/grid/grid_in_msh_version_1.cc similarity index 100% rename from tests/deal.II/grid_in_msh_version_1.cc rename to tests/grid/grid_in_msh_version_1.cc diff --git a/tests/deal.II/grid_in_msh_version_1.output b/tests/grid/grid_in_msh_version_1.output similarity index 100% rename from tests/deal.II/grid_in_msh_version_1.output rename to tests/grid/grid_in_msh_version_1.output diff --git a/tests/deal.II/grid_in_msh_version_1/input_v1.msh b/tests/grid/grid_in_msh_version_1/input_v1.msh similarity index 100% rename from tests/deal.II/grid_in_msh_version_1/input_v1.msh rename to tests/grid/grid_in_msh_version_1/input_v1.msh diff --git a/tests/deal.II/grid_in_msh_version_1/input_v2.msh b/tests/grid/grid_in_msh_version_1/input_v2.msh similarity index 100% rename from tests/deal.II/grid_in_msh_version_1/input_v2.msh rename to tests/grid/grid_in_msh_version_1/input_v2.msh diff --git a/tests/deal.II/grid_in_msh_version_2.cc b/tests/grid/grid_in_msh_version_2.cc similarity index 100% rename from tests/deal.II/grid_in_msh_version_2.cc rename to tests/grid/grid_in_msh_version_2.cc diff --git a/tests/deal.II/grid_in_msh_version_2.output b/tests/grid/grid_in_msh_version_2.output similarity index 100% rename from tests/deal.II/grid_in_msh_version_2.output rename to tests/grid/grid_in_msh_version_2.output diff --git a/tests/deal.II/grid_in_msh_version_2/hole81.msh b/tests/grid/grid_in_msh_version_2/hole81.msh similarity index 100% rename from tests/deal.II/grid_in_msh_version_2/hole81.msh rename to tests/grid/grid_in_msh_version_2/hole81.msh diff --git a/tests/deal.II/grid_in_msh_version_2/hole8170.msh b/tests/grid/grid_in_msh_version_2/hole8170.msh similarity index 100% rename from tests/deal.II/grid_in_msh_version_2/hole8170.msh rename to tests/grid/grid_in_msh_version_2/hole8170.msh diff --git a/tests/deal.II/grid_in_tecplot.cc b/tests/grid/grid_in_tecplot.cc similarity index 100% rename from tests/deal.II/grid_in_tecplot.cc rename to tests/grid/grid_in_tecplot.cc diff --git a/tests/deal.II/grid_in_tecplot.output b/tests/grid/grid_in_tecplot.output similarity index 100% rename from tests/deal.II/grid_in_tecplot.output rename to tests/grid/grid_in_tecplot.output diff --git a/tests/deal.II/grid_in_tecplot/1.dat b/tests/grid/grid_in_tecplot/1.dat similarity index 100% rename from tests/deal.II/grid_in_tecplot/1.dat rename to tests/grid/grid_in_tecplot/1.dat diff --git a/tests/deal.II/grid_in_tecplot/2.dat b/tests/grid/grid_in_tecplot/2.dat similarity index 100% rename from tests/deal.II/grid_in_tecplot/2.dat rename to tests/grid/grid_in_tecplot/2.dat diff --git a/tests/deal.II/grid_in_tecplot/3.dat b/tests/grid/grid_in_tecplot/3.dat similarity index 100% rename from tests/deal.II/grid_in_tecplot/3.dat rename to tests/grid/grid_in_tecplot/3.dat diff --git a/tests/deal.II/grid_in_tecplot/4.dat b/tests/grid/grid_in_tecplot/4.dat similarity index 100% rename from tests/deal.II/grid_in_tecplot/4.dat rename to tests/grid/grid_in_tecplot/4.dat diff --git a/tests/deal.II/grid_in_unv_2d.cc b/tests/grid/grid_in_unv_2d.cc similarity index 100% rename from tests/deal.II/grid_in_unv_2d.cc rename to tests/grid/grid_in_unv_2d.cc diff --git a/tests/deal.II/grid_in_unv_2d.output b/tests/grid/grid_in_unv_2d.output similarity index 100% rename from tests/deal.II/grid_in_unv_2d.output rename to tests/grid/grid_in_unv_2d.output diff --git a/tests/deal.II/grid_in_unv_2d/mesh.msh b/tests/grid/grid_in_unv_2d/mesh.msh similarity index 100% rename from tests/deal.II/grid_in_unv_2d/mesh.msh rename to tests/grid/grid_in_unv_2d/mesh.msh diff --git a/tests/deal.II/grid_in_unv_2d/test1427.unv b/tests/grid/grid_in_unv_2d/test1427.unv similarity index 100% rename from tests/deal.II/grid_in_unv_2d/test1427.unv rename to tests/grid/grid_in_unv_2d/test1427.unv diff --git a/tests/deal.II/grid_in_unv_2d/test46.unv b/tests/grid/grid_in_unv_2d/test46.unv similarity index 100% rename from tests/deal.II/grid_in_unv_2d/test46.unv rename to tests/grid/grid_in_unv_2d/test46.unv diff --git a/tests/deal.II/grid_in_unv_3d.cc b/tests/grid/grid_in_unv_3d.cc similarity index 100% rename from tests/deal.II/grid_in_unv_3d.cc rename to tests/grid/grid_in_unv_3d.cc diff --git a/tests/deal.II/grid_in_unv_3d.output b/tests/grid/grid_in_unv_3d.output similarity index 100% rename from tests/deal.II/grid_in_unv_3d.output rename to tests/grid/grid_in_unv_3d.output diff --git a/tests/deal.II/grid_in_unv_3d/3D.unv b/tests/grid/grid_in_unv_3d/3D.unv similarity index 100% rename from tests/deal.II/grid_in_unv_3d/3D.unv rename to tests/grid/grid_in_unv_3d/3D.unv diff --git a/tests/deal.II/grid_in_unv_3d/mesh.msh b/tests/grid/grid_in_unv_3d/mesh.msh similarity index 100% rename from tests/deal.II/grid_in_unv_3d/mesh.msh rename to tests/grid/grid_in_unv_3d/mesh.msh diff --git a/tests/deal.II/grid_in_vtk_2d.cc b/tests/grid/grid_in_vtk_2d.cc similarity index 100% rename from tests/deal.II/grid_in_vtk_2d.cc rename to tests/grid/grid_in_vtk_2d.cc diff --git a/tests/deal.II/grid_in_vtk_2d.output b/tests/grid/grid_in_vtk_2d.output similarity index 100% rename from tests/deal.II/grid_in_vtk_2d.output rename to tests/grid/grid_in_vtk_2d.output diff --git a/tests/deal.II/grid_in_vtk_2d/mesh b/tests/grid/grid_in_vtk_2d/mesh similarity index 100% rename from tests/deal.II/grid_in_vtk_2d/mesh rename to tests/grid/grid_in_vtk_2d/mesh diff --git a/tests/deal.II/grid_in_vtk_2d/mesh.msh b/tests/grid/grid_in_vtk_2d/mesh.msh similarity index 100% rename from tests/deal.II/grid_in_vtk_2d/mesh.msh rename to tests/grid/grid_in_vtk_2d/mesh.msh diff --git a/tests/deal.II/grid_in_vtk_3d.cc b/tests/grid/grid_in_vtk_3d.cc similarity index 100% rename from tests/deal.II/grid_in_vtk_3d.cc rename to tests/grid/grid_in_vtk_3d.cc diff --git a/tests/deal.II/grid_in_vtk_3d.output b/tests/grid/grid_in_vtk_3d.output similarity index 100% rename from tests/deal.II/grid_in_vtk_3d.output rename to tests/grid/grid_in_vtk_3d.output diff --git a/tests/deal.II/grid_in_vtk_3d/mesh b/tests/grid/grid_in_vtk_3d/mesh similarity index 100% rename from tests/deal.II/grid_in_vtk_3d/mesh rename to tests/grid/grid_in_vtk_3d/mesh diff --git a/tests/deal.II/grid_in_vtk_3d/mesh.msh b/tests/grid/grid_in_vtk_3d/mesh.msh similarity index 100% rename from tests/deal.II/grid_in_vtk_3d/mesh.msh rename to tests/grid/grid_in_vtk_3d/mesh.msh diff --git a/tests/deal.II/grid_in_vtk_3d_02.cc b/tests/grid/grid_in_vtk_3d_02.cc similarity index 100% rename from tests/deal.II/grid_in_vtk_3d_02.cc rename to tests/grid/grid_in_vtk_3d_02.cc diff --git a/tests/deal.II/grid_in_vtk_3d_02.output b/tests/grid/grid_in_vtk_3d_02.output similarity index 100% rename from tests/deal.II/grid_in_vtk_3d_02.output rename to tests/grid/grid_in_vtk_3d_02.output diff --git a/tests/deal.II/grid_in_vtk_3d_02.vtk b/tests/grid/grid_in_vtk_3d_02.vtk similarity index 100% rename from tests/deal.II/grid_in_vtk_3d_02.vtk rename to tests/grid/grid_in_vtk_3d_02.vtk diff --git a/tests/deal.II/grid_in_vtk_3d_03.cc b/tests/grid/grid_in_vtk_3d_03.cc similarity index 100% rename from tests/deal.II/grid_in_vtk_3d_03.cc rename to tests/grid/grid_in_vtk_3d_03.cc diff --git a/tests/deal.II/grid_in_vtk_3d_03.output b/tests/grid/grid_in_vtk_3d_03.output similarity index 100% rename from tests/deal.II/grid_in_vtk_3d_03.output rename to tests/grid/grid_in_vtk_3d_03.output diff --git a/tests/deal.II/grid_in_vtk_3d_03.vtk b/tests/grid/grid_in_vtk_3d_03.vtk similarity index 100% rename from tests/deal.II/grid_in_vtk_3d_03.vtk rename to tests/grid/grid_in_vtk_3d_03.vtk diff --git a/tests/deal.II/grid_invert.cc b/tests/grid/grid_invert.cc similarity index 100% rename from tests/deal.II/grid_invert.cc rename to tests/grid/grid_invert.cc diff --git a/tests/deal.II/grid_invert.output b/tests/grid/grid_invert.output similarity index 100% rename from tests/deal.II/grid_invert.output rename to tests/grid/grid_invert.output diff --git a/tests/deal.II/grid_out.cc b/tests/grid/grid_out.cc similarity index 100% rename from tests/deal.II/grid_out.cc rename to tests/grid/grid_out.cc diff --git a/tests/deal.II/grid_out.output b/tests/grid/grid_out.output similarity index 100% rename from tests/deal.II/grid_out.output rename to tests/grid/grid_out.output diff --git a/tests/deal.II/grid_out_02.cc b/tests/grid/grid_out_02.cc similarity index 100% rename from tests/deal.II/grid_out_02.cc rename to tests/grid/grid_out_02.cc diff --git a/tests/deal.II/grid_out_02.output b/tests/grid/grid_out_02.output similarity index 100% rename from tests/deal.II/grid_out_02.output rename to tests/grid/grid_out_02.output diff --git a/tests/deal.II/grid_out_03.cc b/tests/grid/grid_out_03.cc similarity index 100% rename from tests/deal.II/grid_out_03.cc rename to tests/grid/grid_out_03.cc diff --git a/tests/deal.II/grid_out_03.output b/tests/grid/grid_out_03.output similarity index 100% rename from tests/deal.II/grid_out_03.output rename to tests/grid/grid_out_03.output diff --git a/tests/deal.II/grid_out_04.cc b/tests/grid/grid_out_04.cc similarity index 100% rename from tests/deal.II/grid_out_04.cc rename to tests/grid/grid_out_04.cc diff --git a/tests/deal.II/grid_out_04.output b/tests/grid/grid_out_04.output similarity index 100% rename from tests/deal.II/grid_out_04.output rename to tests/grid/grid_out_04.output diff --git a/tests/deal.II/grid_out_05.cc b/tests/grid/grid_out_05.cc similarity index 100% rename from tests/deal.II/grid_out_05.cc rename to tests/grid/grid_out_05.cc diff --git a/tests/deal.II/grid_out_05.output b/tests/grid/grid_out_05.output similarity index 100% rename from tests/deal.II/grid_out_05.output rename to tests/grid/grid_out_05.output diff --git a/tests/deal.II/grid_out_07.cc b/tests/grid/grid_out_07.cc similarity index 100% rename from tests/deal.II/grid_out_07.cc rename to tests/grid/grid_out_07.cc diff --git a/tests/deal.II/grid_out_07.with_zlib=on.output b/tests/grid/grid_out_07.with_zlib=on.output similarity index 100% rename from tests/deal.II/grid_out_07.with_zlib=on.output rename to tests/grid/grid_out_07.with_zlib=on.output diff --git a/tests/deal.II/grid_out_08.cc b/tests/grid/grid_out_08.cc similarity index 100% rename from tests/deal.II/grid_out_08.cc rename to tests/grid/grid_out_08.cc diff --git a/tests/deal.II/grid_out_08.with_zlib=on.output b/tests/grid/grid_out_08.with_zlib=on.output similarity index 100% rename from tests/deal.II/grid_out_08.with_zlib=on.output rename to tests/grid/grid_out_08.with_zlib=on.output diff --git a/tests/deal.II/grid_out_09.cc b/tests/grid/grid_out_09.cc similarity index 100% rename from tests/deal.II/grid_out_09.cc rename to tests/grid/grid_out_09.cc diff --git a/tests/deal.II/grid_out_09.output b/tests/grid/grid_out_09.output similarity index 100% rename from tests/deal.II/grid_out_09.output rename to tests/grid/grid_out_09.output diff --git a/tests/deal.II/grid_output_input.cc b/tests/grid/grid_output_input.cc similarity index 100% rename from tests/deal.II/grid_output_input.cc rename to tests/grid/grid_output_input.cc diff --git a/tests/deal.II/grid_output_input.output b/tests/grid/grid_output_input.output similarity index 100% rename from tests/deal.II/grid_output_input.output rename to tests/grid/grid_output_input.output diff --git a/tests/deal.II/grid_parallelepiped.cc b/tests/grid/grid_parallelepiped.cc similarity index 100% rename from tests/deal.II/grid_parallelepiped.cc rename to tests/grid/grid_parallelepiped.cc diff --git a/tests/deal.II/grid_parallelepiped.output b/tests/grid/grid_parallelepiped.output similarity index 100% rename from tests/deal.II/grid_parallelepiped.output rename to tests/grid/grid_parallelepiped.output diff --git a/tests/deal.II/grid_parallelepiped_01.cc b/tests/grid/grid_parallelepiped_01.cc similarity index 100% rename from tests/deal.II/grid_parallelepiped_01.cc rename to tests/grid/grid_parallelepiped_01.cc diff --git a/tests/deal.II/grid_parallelepiped_01.output b/tests/grid/grid_parallelepiped_01.output similarity index 100% rename from tests/deal.II/grid_parallelepiped_01.output rename to tests/grid/grid_parallelepiped_01.output diff --git a/tests/deal.II/grid_parallelepiped_02.cc b/tests/grid/grid_parallelepiped_02.cc similarity index 100% rename from tests/deal.II/grid_parallelepiped_02.cc rename to tests/grid/grid_parallelepiped_02.cc diff --git a/tests/deal.II/grid_parallelepiped_02.output b/tests/grid/grid_parallelepiped_02.output similarity index 100% rename from tests/deal.II/grid_parallelepiped_02.output rename to tests/grid/grid_parallelepiped_02.output diff --git a/tests/deal.II/grid_parallelepiped_03.cc b/tests/grid/grid_parallelepiped_03.cc similarity index 100% rename from tests/deal.II/grid_parallelepiped_03.cc rename to tests/grid/grid_parallelepiped_03.cc diff --git a/tests/deal.II/grid_parallelepiped_03.output b/tests/grid/grid_parallelepiped_03.output similarity index 100% rename from tests/deal.II/grid_parallelepiped_03.output rename to tests/grid/grid_parallelepiped_03.output diff --git a/tests/deal.II/grid_test.cc b/tests/grid/grid_test.cc similarity index 100% rename from tests/deal.II/grid_test.cc rename to tests/grid/grid_test.cc diff --git a/tests/deal.II/grid_test.output b/tests/grid/grid_test.output similarity index 100% rename from tests/deal.II/grid_test.output rename to tests/grid/grid_test.output diff --git a/tests/deal.II/grid_tools.cc b/tests/grid/grid_tools.cc similarity index 100% rename from tests/deal.II/grid_tools.cc rename to tests/grid/grid_tools.cc diff --git a/tests/deal.II/grid_tools.output b/tests/grid/grid_tools.output similarity index 100% rename from tests/deal.II/grid_tools.output rename to tests/grid/grid_tools.output diff --git a/tests/deal.II/grid_tools_02.cc b/tests/grid/grid_tools_02.cc similarity index 100% rename from tests/deal.II/grid_tools_02.cc rename to tests/grid/grid_tools_02.cc diff --git a/tests/deal.II/grid_tools_02.output b/tests/grid/grid_tools_02.output similarity index 100% rename from tests/deal.II/grid_tools_02.output rename to tests/grid/grid_tools_02.output diff --git a/tests/deal.II/grid_tools_03.cc b/tests/grid/grid_tools_03.cc similarity index 100% rename from tests/deal.II/grid_tools_03.cc rename to tests/grid/grid_tools_03.cc diff --git a/tests/deal.II/grid_tools_03.output b/tests/grid/grid_tools_03.output similarity index 100% rename from tests/deal.II/grid_tools_03.output rename to tests/grid/grid_tools_03.output diff --git a/tests/deal.II/grid_tools_04.cc b/tests/grid/grid_tools_04.cc similarity index 100% rename from tests/deal.II/grid_tools_04.cc rename to tests/grid/grid_tools_04.cc diff --git a/tests/deal.II/grid_tools_04.output b/tests/grid/grid_tools_04.output similarity index 100% rename from tests/deal.II/grid_tools_04.output rename to tests/grid/grid_tools_04.output diff --git a/tests/deal.II/grid_tools_05.cc b/tests/grid/grid_tools_05.cc similarity index 100% rename from tests/deal.II/grid_tools_05.cc rename to tests/grid/grid_tools_05.cc diff --git a/tests/deal.II/grid_tools_05.output b/tests/grid/grid_tools_05.output similarity index 100% rename from tests/deal.II/grid_tools_05.output rename to tests/grid/grid_tools_05.output diff --git a/tests/deal.II/grid_tools_06.cc b/tests/grid/grid_tools_06.cc similarity index 100% rename from tests/deal.II/grid_tools_06.cc rename to tests/grid/grid_tools_06.cc diff --git a/tests/deal.II/grid_tools_06.output b/tests/grid/grid_tools_06.output similarity index 100% rename from tests/deal.II/grid_tools_06.output rename to tests/grid/grid_tools_06.output diff --git a/tests/deal.II/grid_tools_halo_layer_01.cc b/tests/grid/grid_tools_halo_layer_01.cc similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_01.cc rename to tests/grid/grid_tools_halo_layer_01.cc diff --git a/tests/deal.II/grid_tools_halo_layer_01.output b/tests/grid/grid_tools_halo_layer_01.output similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_01.output rename to tests/grid/grid_tools_halo_layer_01.output diff --git a/tests/deal.II/grid_tools_halo_layer_02.cc b/tests/grid/grid_tools_halo_layer_02.cc similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_02.cc rename to tests/grid/grid_tools_halo_layer_02.cc diff --git a/tests/deal.II/grid_tools_halo_layer_02.output b/tests/grid/grid_tools_halo_layer_02.output similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_02.output rename to tests/grid/grid_tools_halo_layer_02.output diff --git a/tests/deal.II/grid_tools_halo_layer_03.cc b/tests/grid/grid_tools_halo_layer_03.cc similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_03.cc rename to tests/grid/grid_tools_halo_layer_03.cc diff --git a/tests/deal.II/grid_tools_halo_layer_03.output b/tests/grid/grid_tools_halo_layer_03.output similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_03.output rename to tests/grid/grid_tools_halo_layer_03.output diff --git a/tests/deal.II/grid_tools_halo_layer_04.cc b/tests/grid/grid_tools_halo_layer_04.cc similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_04.cc rename to tests/grid/grid_tools_halo_layer_04.cc diff --git a/tests/deal.II/grid_tools_halo_layer_04.output b/tests/grid/grid_tools_halo_layer_04.output similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_04.output rename to tests/grid/grid_tools_halo_layer_04.output diff --git a/tests/deal.II/grid_tools_halo_layer_05.cc b/tests/grid/grid_tools_halo_layer_05.cc similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_05.cc rename to tests/grid/grid_tools_halo_layer_05.cc diff --git a/tests/deal.II/grid_tools_halo_layer_05.output b/tests/grid/grid_tools_halo_layer_05.output similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_05.output rename to tests/grid/grid_tools_halo_layer_05.output diff --git a/tests/deal.II/grid_tools_halo_layer_ghost_cells.cc b/tests/grid/grid_tools_halo_layer_ghost_cells.cc similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_ghost_cells.cc rename to tests/grid/grid_tools_halo_layer_ghost_cells.cc diff --git a/tests/deal.II/grid_tools_halo_layer_ghost_cells.mpirun=2.output b/tests/grid/grid_tools_halo_layer_ghost_cells.mpirun=2.output similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_ghost_cells.mpirun=2.output rename to tests/grid/grid_tools_halo_layer_ghost_cells.mpirun=2.output diff --git a/tests/deal.II/grid_tools_halo_layer_ghost_cells.mpirun=3.output b/tests/grid/grid_tools_halo_layer_ghost_cells.mpirun=3.output similarity index 100% rename from tests/deal.II/grid_tools_halo_layer_ghost_cells.mpirun=3.output rename to tests/grid/grid_tools_halo_layer_ghost_cells.mpirun=3.output diff --git a/tests/deal.II/grid_tools_transform_01.cc b/tests/grid/grid_tools_transform_01.cc similarity index 100% rename from tests/deal.II/grid_tools_transform_01.cc rename to tests/grid/grid_tools_transform_01.cc diff --git a/tests/deal.II/grid_tools_transform_01.output b/tests/grid/grid_tools_transform_01.output similarity index 100% rename from tests/deal.II/grid_tools_transform_01.output rename to tests/grid/grid_tools_transform_01.output diff --git a/tests/deal.II/grid_transform.cc b/tests/grid/grid_transform.cc similarity index 100% rename from tests/deal.II/grid_transform.cc rename to tests/grid/grid_transform.cc diff --git a/tests/deal.II/grid_transform.output b/tests/grid/grid_transform.output similarity index 100% rename from tests/deal.II/grid_transform.output rename to tests/grid/grid_transform.output diff --git a/tests/deal.II/grid_transform_02.cc b/tests/grid/grid_transform_02.cc similarity index 100% rename from tests/deal.II/grid_transform_02.cc rename to tests/grid/grid_transform_02.cc diff --git a/tests/deal.II/grid_transform_02.output b/tests/grid/grid_transform_02.output similarity index 100% rename from tests/deal.II/grid_transform_02.output rename to tests/grid/grid_transform_02.output diff --git a/tests/deal.II/grid_transform_3d.cc b/tests/grid/grid_transform_3d.cc similarity index 100% rename from tests/deal.II/grid_transform_3d.cc rename to tests/grid/grid_transform_3d.cc diff --git a/tests/deal.II/grid_transform_3d.output b/tests/grid/grid_transform_3d.output similarity index 100% rename from tests/deal.II/grid_transform_3d.output rename to tests/grid/grid_transform_3d.output diff --git a/tests/deal.II/grid_transform_coefficient.cc b/tests/grid/grid_transform_coefficient.cc similarity index 100% rename from tests/deal.II/grid_transform_coefficient.cc rename to tests/grid/grid_transform_coefficient.cc diff --git a/tests/deal.II/grid_transform_coefficient.output b/tests/grid/grid_transform_coefficient.output similarity index 100% rename from tests/deal.II/grid_transform_coefficient.output rename to tests/grid/grid_transform_coefficient.output