From 797160069a0cddcc5a147591945c6b5cda68599d Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 3 Sep 2013 22:28:23 +0000 Subject: [PATCH] Convert distributed_grids git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30581 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/CMakeLists.txt | 6 ++++-- tests/distributed_grids/2d_coarse_grid_01.cc | 2 +- .../cmp/generic => 2d_coarse_grid_01.output} | 0 tests/distributed_grids/2d_coarse_grid_02.cc | 2 +- .../cmp/generic => 2d_coarse_grid_02.output} | 0 tests/distributed_grids/2d_coarse_grid_03.cc | 2 +- .../cmp/generic => 2d_coarse_grid_03.output} | 0 tests/distributed_grids/2d_coarse_grid_04.cc | 2 +- .../cmp/generic => 2d_coarse_grid_04.output} | 0 tests/distributed_grids/2d_coarse_grid_x_01.cc | 2 +- .../cmp/generic => 2d_coarse_grid_x_01.output} | 0 tests/distributed_grids/2d_coarsening_01.cc | 2 +- .../cmp/generic => 2d_coarsening_01.output} | 0 tests/distributed_grids/2d_coarsening_02.cc | 2 +- .../cmp/generic => 2d_coarsening_02.output} | 0 tests/distributed_grids/2d_coarsening_03.cc | 2 +- .../cmp/generic => 2d_coarsening_03.output} | 0 tests/distributed_grids/2d_coarsening_05.cc | 2 +- .../cmp/generic => 2d_coarsening_05.output} | 0 tests/distributed_grids/2d_dofhandler_01.cc | 2 +- .../cmp/generic => 2d_dofhandler_01.output} | 0 tests/distributed_grids/2d_refinement_01.cc | 2 +- .../cmp/generic => 2d_refinement_01.output} | 0 tests/distributed_grids/2d_refinement_02.cc | 2 +- .../cmp/generic => 2d_refinement_02.output} | 0 tests/distributed_grids/2d_refinement_03.cc | 2 +- .../cmp/generic => 2d_refinement_03.output} | 0 tests/distributed_grids/2d_refinement_04.cc | 2 +- .../cmp/generic => 2d_refinement_04.output} | 0 tests/distributed_grids/2d_refinement_05.cc | 2 +- .../cmp/generic => 2d_refinement_05.output} | 0 tests/distributed_grids/2d_refinement_06.cc | 2 +- .../cmp/generic => 2d_refinement_06.output} | 0 tests/distributed_grids/2d_refinement_07.cc | 2 +- .../cmp/generic => 2d_refinement_07.output} | 0 tests/distributed_grids/3d_coarse_grid_01.cc | 2 +- .../cmp/generic => 3d_coarse_grid_01.output} | 0 tests/distributed_grids/3d_coarse_grid_02.cc | 2 +- .../cmp/generic => 3d_coarse_grid_02.output} | 0 tests/distributed_grids/3d_coarse_grid_03.cc | 2 +- .../cmp/generic => 3d_coarse_grid_03.output} | 0 tests/distributed_grids/3d_coarse_grid_04.cc | 2 +- .../cmp/generic => 3d_coarse_grid_04.output} | 0 tests/distributed_grids/3d_coarse_grid_05.cc | 2 +- .../cmp/generic => 3d_coarse_grid_05.output} | 0 tests/distributed_grids/3d_coarse_grid_06.cc | 2 +- .../cmp/generic => 3d_coarse_grid_06.output} | 0 tests/distributed_grids/3d_coarse_grid_x_01.cc | 2 +- .../cmp/generic => 3d_coarse_grid_x_01.output} | 0 tests/distributed_grids/3d_coarsening_01.cc | 2 +- .../cmp/generic => 3d_coarsening_01.output} | 0 tests/distributed_grids/3d_coarsening_02.cc | 2 +- .../cmp/generic => 3d_coarsening_02.output} | 0 tests/distributed_grids/3d_coarsening_03.cc | 2 +- .../cmp/generic => 3d_coarsening_03.output} | 0 tests/distributed_grids/3d_coarsening_04.cc | 2 +- .../cmp/generic => 3d_coarsening_04.output} | 0 tests/distributed_grids/3d_coarsening_05.cc | 2 +- .../cmp/generic => 3d_coarsening_05.output} | 0 tests/distributed_grids/3d_refinement_01.cc | 2 +- .../cmp/generic => 3d_refinement_01.output} | 0 tests/distributed_grids/3d_refinement_02.cc | 2 +- .../cmp/generic => 3d_refinement_02.output} | 0 tests/distributed_grids/3d_refinement_03.cc | 2 +- .../cmp/generic => 3d_refinement_03.output} | 0 tests/distributed_grids/3d_refinement_04.cc | 2 +- .../cmp/generic => 3d_refinement_04.output} | 0 tests/distributed_grids/3d_refinement_05.cc | 2 +- .../cmp/generic => 3d_refinement_05.output} | 0 tests/distributed_grids/3d_refinement_06.cc | 2 +- .../cmp/generic => 3d_refinement_06.output} | 0 tests/distributed_grids/3d_refinement_07.cc | 2 +- .../cmp/generic => 3d_refinement_07.output} | 0 tests/distributed_grids/3d_refinement_08.cc | 2 +- .../cmp/generic => 3d_refinement_08.output} | 0 tests/distributed_grids/3d_refinement_09.cc | 2 +- .../cmp/generic => 3d_refinement_09.output} | 0 tests/distributed_grids/Makefile | 15 --------------- tests/distributed_grids/anisotropic.cc | 2 +- .../cmp/generic => anisotropic.output} | 0 .../distributed_grids/count_dofs_per_block_01.cc | 2 +- .../generic => count_dofs_per_block_01.output} | 0 .../count_dofs_per_component_01.cc | 2 +- ...generic => count_dofs_per_component_01.output} | 0 .../distributed_grids/dof_handler_number_cache.cc | 2 +- .../generic => dof_handler_number_cache.output} | 0 tests/distributed_grids/solution_transfer_01.cc | 2 +- .../cmp/generic => solution_transfer_01.output} | 0 tests/distributed_grids/solution_transfer_02.cc | 2 +- .../cmp/generic => solution_transfer_02.output} | 0 tests/distributed_grids/solution_transfer_03.cc | 2 +- .../cmp/generic => solution_transfer_03.output} | 0 tests/distributed_grids/solution_transfer_04.cc | 2 +- .../cmp/generic => solution_transfer_04.output} | 0 tests/distributed_grids/subdomain_id_01.cc | 2 +- .../cmp/generic => subdomain_id_01.output} | 0 tests/distributed_grids/tria_settings_01.cc | 2 +- .../cmp/generic => tria_settings_01.output} | 0 tests/distributed_grids/update_number_cache_01.cc | 2 +- .../cmp/generic => update_number_cache_01.output} | 0 100 files changed, 53 insertions(+), 66 deletions(-) rename tests/distributed_grids/{2d_coarse_grid_01/cmp/generic => 2d_coarse_grid_01.output} (100%) rename tests/distributed_grids/{2d_coarse_grid_02/cmp/generic => 2d_coarse_grid_02.output} (100%) rename tests/distributed_grids/{2d_coarse_grid_03/cmp/generic => 2d_coarse_grid_03.output} (100%) rename tests/distributed_grids/{2d_coarse_grid_04/cmp/generic => 2d_coarse_grid_04.output} (100%) rename tests/distributed_grids/{2d_coarse_grid_x_01/cmp/generic => 2d_coarse_grid_x_01.output} (100%) rename tests/distributed_grids/{2d_coarsening_01/cmp/generic => 2d_coarsening_01.output} (100%) rename tests/distributed_grids/{2d_coarsening_02/cmp/generic => 2d_coarsening_02.output} (100%) rename tests/distributed_grids/{2d_coarsening_03/cmp/generic => 2d_coarsening_03.output} (100%) rename tests/distributed_grids/{2d_coarsening_05/cmp/generic => 2d_coarsening_05.output} (100%) rename tests/distributed_grids/{2d_dofhandler_01/cmp/generic => 2d_dofhandler_01.output} (100%) rename tests/distributed_grids/{2d_refinement_01/cmp/generic => 2d_refinement_01.output} (100%) rename tests/distributed_grids/{2d_refinement_02/cmp/generic => 2d_refinement_02.output} (100%) rename tests/distributed_grids/{2d_refinement_03/cmp/generic => 2d_refinement_03.output} (100%) rename tests/distributed_grids/{2d_refinement_04/cmp/generic => 2d_refinement_04.output} (100%) rename tests/distributed_grids/{2d_refinement_05/cmp/generic => 2d_refinement_05.output} (100%) rename tests/distributed_grids/{2d_refinement_06/cmp/generic => 2d_refinement_06.output} (100%) rename tests/distributed_grids/{2d_refinement_07/cmp/generic => 2d_refinement_07.output} (100%) rename tests/distributed_grids/{3d_coarse_grid_01/cmp/generic => 3d_coarse_grid_01.output} (100%) rename tests/distributed_grids/{3d_coarse_grid_02/cmp/generic => 3d_coarse_grid_02.output} (100%) rename tests/distributed_grids/{3d_coarse_grid_03/cmp/generic => 3d_coarse_grid_03.output} (100%) rename tests/distributed_grids/{3d_coarse_grid_04/cmp/generic => 3d_coarse_grid_04.output} (100%) rename tests/distributed_grids/{3d_coarse_grid_05/cmp/generic => 3d_coarse_grid_05.output} (100%) rename tests/distributed_grids/{3d_coarse_grid_06/cmp/generic => 3d_coarse_grid_06.output} (100%) rename tests/distributed_grids/{3d_coarse_grid_x_01/cmp/generic => 3d_coarse_grid_x_01.output} (100%) rename tests/distributed_grids/{3d_coarsening_01/cmp/generic => 3d_coarsening_01.output} (100%) rename tests/distributed_grids/{3d_coarsening_02/cmp/generic => 3d_coarsening_02.output} (100%) rename tests/distributed_grids/{3d_coarsening_03/cmp/generic => 3d_coarsening_03.output} (100%) rename tests/distributed_grids/{3d_coarsening_04/cmp/generic => 3d_coarsening_04.output} (100%) rename tests/distributed_grids/{3d_coarsening_05/cmp/generic => 3d_coarsening_05.output} (100%) rename tests/distributed_grids/{3d_refinement_01/cmp/generic => 3d_refinement_01.output} (100%) rename tests/distributed_grids/{3d_refinement_02/cmp/generic => 3d_refinement_02.output} (100%) rename tests/distributed_grids/{3d_refinement_03/cmp/generic => 3d_refinement_03.output} (100%) rename tests/distributed_grids/{3d_refinement_04/cmp/generic => 3d_refinement_04.output} (100%) rename tests/distributed_grids/{3d_refinement_05/cmp/generic => 3d_refinement_05.output} (100%) rename tests/distributed_grids/{3d_refinement_06/cmp/generic => 3d_refinement_06.output} (100%) rename tests/distributed_grids/{3d_refinement_07/cmp/generic => 3d_refinement_07.output} (100%) rename tests/distributed_grids/{3d_refinement_08/cmp/generic => 3d_refinement_08.output} (100%) rename tests/distributed_grids/{3d_refinement_09/cmp/generic => 3d_refinement_09.output} (100%) delete mode 100644 tests/distributed_grids/Makefile rename tests/distributed_grids/{anisotropic/cmp/generic => anisotropic.output} (100%) rename tests/distributed_grids/{count_dofs_per_block_01/cmp/generic => count_dofs_per_block_01.output} (100%) rename tests/distributed_grids/{count_dofs_per_component_01/cmp/generic => count_dofs_per_component_01.output} (100%) rename tests/distributed_grids/{dof_handler_number_cache/cmp/generic => dof_handler_number_cache.output} (100%) rename tests/distributed_grids/{solution_transfer_01/cmp/generic => solution_transfer_01.output} (100%) rename tests/distributed_grids/{solution_transfer_02/cmp/generic => solution_transfer_02.output} (100%) rename tests/distributed_grids/{solution_transfer_03/cmp/generic => solution_transfer_03.output} (100%) rename tests/distributed_grids/{solution_transfer_04/cmp/generic => solution_transfer_04.output} (100%) rename tests/distributed_grids/{subdomain_id_01/cmp/generic => subdomain_id_01.output} (100%) rename tests/distributed_grids/{tria_settings_01/cmp/generic => tria_settings_01.output} (100%) rename tests/distributed_grids/{update_number_cache_01/cmp/generic => update_number_cache_01.output} (100%) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 40ca010d8c..93fd821660 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -83,11 +83,13 @@ ADD_SUBDIRECTORY(multigrid) ADD_SUBDIRECTORY(serialization) # These three are a little bit special -#all-headers #benchmarks #mesh_converter -#distributed_grids - WITH_P4EST +IF(DEAL_II_WITH_P4EST) + ADD_SUBDIRECTORY(distributed_grids) +ENDIF() + #gla - WITH_MPI, ?? WITH_P4EST ?? #mpi - WITH_MPI #petsc - WITH_PETSC diff --git a/tests/distributed_grids/2d_coarse_grid_01.cc b/tests/distributed_grids/2d_coarse_grid_01.cc index 89afe02e02..b8e3572e31 100644 --- a/tests/distributed_grids/2d_coarse_grid_01.cc +++ b/tests/distributed_grids/2d_coarse_grid_01.cc @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarse_grid_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarse_grid_01/cmp/generic b/tests/distributed_grids/2d_coarse_grid_01.output similarity index 100% rename from tests/distributed_grids/2d_coarse_grid_01/cmp/generic rename to tests/distributed_grids/2d_coarse_grid_01.output diff --git a/tests/distributed_grids/2d_coarse_grid_02.cc b/tests/distributed_grids/2d_coarse_grid_02.cc index 17b2c2f7b2..026d2f8c81 100644 --- a/tests/distributed_grids/2d_coarse_grid_02.cc +++ b/tests/distributed_grids/2d_coarse_grid_02.cc @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarse_grid_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarse_grid_02/cmp/generic b/tests/distributed_grids/2d_coarse_grid_02.output similarity index 100% rename from tests/distributed_grids/2d_coarse_grid_02/cmp/generic rename to tests/distributed_grids/2d_coarse_grid_02.output diff --git a/tests/distributed_grids/2d_coarse_grid_03.cc b/tests/distributed_grids/2d_coarse_grid_03.cc index 1d5c75760e..bbe607ef8c 100644 --- a/tests/distributed_grids/2d_coarse_grid_03.cc +++ b/tests/distributed_grids/2d_coarse_grid_03.cc @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarse_grid_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarse_grid_03/cmp/generic b/tests/distributed_grids/2d_coarse_grid_03.output similarity index 100% rename from tests/distributed_grids/2d_coarse_grid_03/cmp/generic rename to tests/distributed_grids/2d_coarse_grid_03.output diff --git a/tests/distributed_grids/2d_coarse_grid_04.cc b/tests/distributed_grids/2d_coarse_grid_04.cc index 1d92ba9c95..1a53a61d21 100644 --- a/tests/distributed_grids/2d_coarse_grid_04.cc +++ b/tests/distributed_grids/2d_coarse_grid_04.cc @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarse_grid_04/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarse_grid_04/cmp/generic b/tests/distributed_grids/2d_coarse_grid_04.output similarity index 100% rename from tests/distributed_grids/2d_coarse_grid_04/cmp/generic rename to tests/distributed_grids/2d_coarse_grid_04.output diff --git a/tests/distributed_grids/2d_coarse_grid_x_01.cc b/tests/distributed_grids/2d_coarse_grid_x_01.cc index f37f5e90ab..a06dd659d2 100644 --- a/tests/distributed_grids/2d_coarse_grid_x_01.cc +++ b/tests/distributed_grids/2d_coarse_grid_x_01.cc @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarse_grid_x_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarse_grid_x_01/cmp/generic b/tests/distributed_grids/2d_coarse_grid_x_01.output similarity index 100% rename from tests/distributed_grids/2d_coarse_grid_x_01/cmp/generic rename to tests/distributed_grids/2d_coarse_grid_x_01.output diff --git a/tests/distributed_grids/2d_coarsening_01.cc b/tests/distributed_grids/2d_coarsening_01.cc index 12845d7320..8dab24c414 100644 --- a/tests/distributed_grids/2d_coarsening_01.cc +++ b/tests/distributed_grids/2d_coarsening_01.cc @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarsening_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarsening_01/cmp/generic b/tests/distributed_grids/2d_coarsening_01.output similarity index 100% rename from tests/distributed_grids/2d_coarsening_01/cmp/generic rename to tests/distributed_grids/2d_coarsening_01.output diff --git a/tests/distributed_grids/2d_coarsening_02.cc b/tests/distributed_grids/2d_coarsening_02.cc index eaa47bc5ca..4b090cb7b1 100644 --- a/tests/distributed_grids/2d_coarsening_02.cc +++ b/tests/distributed_grids/2d_coarsening_02.cc @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarsening_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarsening_02/cmp/generic b/tests/distributed_grids/2d_coarsening_02.output similarity index 100% rename from tests/distributed_grids/2d_coarsening_02/cmp/generic rename to tests/distributed_grids/2d_coarsening_02.output diff --git a/tests/distributed_grids/2d_coarsening_03.cc b/tests/distributed_grids/2d_coarsening_03.cc index f1559894e3..98bfa2072f 100644 --- a/tests/distributed_grids/2d_coarsening_03.cc +++ b/tests/distributed_grids/2d_coarsening_03.cc @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarsening_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarsening_03/cmp/generic b/tests/distributed_grids/2d_coarsening_03.output similarity index 100% rename from tests/distributed_grids/2d_coarsening_03/cmp/generic rename to tests/distributed_grids/2d_coarsening_03.output diff --git a/tests/distributed_grids/2d_coarsening_05.cc b/tests/distributed_grids/2d_coarsening_05.cc index 151a9922ba..3b5374b6f1 100644 --- a/tests/distributed_grids/2d_coarsening_05.cc +++ b/tests/distributed_grids/2d_coarsening_05.cc @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_coarsening_05/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_coarsening_05/cmp/generic b/tests/distributed_grids/2d_coarsening_05.output similarity index 100% rename from tests/distributed_grids/2d_coarsening_05/cmp/generic rename to tests/distributed_grids/2d_coarsening_05.output diff --git a/tests/distributed_grids/2d_dofhandler_01.cc b/tests/distributed_grids/2d_dofhandler_01.cc index 171f823f45..e3a1ce465e 100644 --- a/tests/distributed_grids/2d_dofhandler_01.cc +++ b/tests/distributed_grids/2d_dofhandler_01.cc @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_dofhandler_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_dofhandler_01/cmp/generic b/tests/distributed_grids/2d_dofhandler_01.output similarity index 100% rename from tests/distributed_grids/2d_dofhandler_01/cmp/generic rename to tests/distributed_grids/2d_dofhandler_01.output diff --git a/tests/distributed_grids/2d_refinement_01.cc b/tests/distributed_grids/2d_refinement_01.cc index 8d3f7a4f61..05e7adeab6 100644 --- a/tests/distributed_grids/2d_refinement_01.cc +++ b/tests/distributed_grids/2d_refinement_01.cc @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_refinement_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_refinement_01/cmp/generic b/tests/distributed_grids/2d_refinement_01.output similarity index 100% rename from tests/distributed_grids/2d_refinement_01/cmp/generic rename to tests/distributed_grids/2d_refinement_01.output diff --git a/tests/distributed_grids/2d_refinement_02.cc b/tests/distributed_grids/2d_refinement_02.cc index 90cbc96fe3..6e43150188 100644 --- a/tests/distributed_grids/2d_refinement_02.cc +++ b/tests/distributed_grids/2d_refinement_02.cc @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_refinement_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_refinement_02/cmp/generic b/tests/distributed_grids/2d_refinement_02.output similarity index 100% rename from tests/distributed_grids/2d_refinement_02/cmp/generic rename to tests/distributed_grids/2d_refinement_02.output diff --git a/tests/distributed_grids/2d_refinement_03.cc b/tests/distributed_grids/2d_refinement_03.cc index 6ac0edffc9..647c202964 100644 --- a/tests/distributed_grids/2d_refinement_03.cc +++ b/tests/distributed_grids/2d_refinement_03.cc @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_refinement_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_refinement_03/cmp/generic b/tests/distributed_grids/2d_refinement_03.output similarity index 100% rename from tests/distributed_grids/2d_refinement_03/cmp/generic rename to tests/distributed_grids/2d_refinement_03.output diff --git a/tests/distributed_grids/2d_refinement_04.cc b/tests/distributed_grids/2d_refinement_04.cc index 85e2fc745c..dcbb7be217 100644 --- a/tests/distributed_grids/2d_refinement_04.cc +++ b/tests/distributed_grids/2d_refinement_04.cc @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_refinement_04/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_refinement_04/cmp/generic b/tests/distributed_grids/2d_refinement_04.output similarity index 100% rename from tests/distributed_grids/2d_refinement_04/cmp/generic rename to tests/distributed_grids/2d_refinement_04.output diff --git a/tests/distributed_grids/2d_refinement_05.cc b/tests/distributed_grids/2d_refinement_05.cc index 47b508f748..80ac7fb7fd 100644 --- a/tests/distributed_grids/2d_refinement_05.cc +++ b/tests/distributed_grids/2d_refinement_05.cc @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_refinement_05/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_refinement_05/cmp/generic b/tests/distributed_grids/2d_refinement_05.output similarity index 100% rename from tests/distributed_grids/2d_refinement_05/cmp/generic rename to tests/distributed_grids/2d_refinement_05.output diff --git a/tests/distributed_grids/2d_refinement_06.cc b/tests/distributed_grids/2d_refinement_06.cc index c0a1fe651f..5b0e24d066 100644 --- a/tests/distributed_grids/2d_refinement_06.cc +++ b/tests/distributed_grids/2d_refinement_06.cc @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_refinement_06/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_refinement_06/cmp/generic b/tests/distributed_grids/2d_refinement_06.output similarity index 100% rename from tests/distributed_grids/2d_refinement_06/cmp/generic rename to tests/distributed_grids/2d_refinement_06.output diff --git a/tests/distributed_grids/2d_refinement_07.cc b/tests/distributed_grids/2d_refinement_07.cc index 6ee6442382..cfa27fae86 100644 --- a/tests/distributed_grids/2d_refinement_07.cc +++ b/tests/distributed_grids/2d_refinement_07.cc @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) deal_II_exceptions::disable_abort_on_exception(); Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("2d_refinement_07/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/2d_refinement_07/cmp/generic b/tests/distributed_grids/2d_refinement_07.output similarity index 100% rename from tests/distributed_grids/2d_refinement_07/cmp/generic rename to tests/distributed_grids/2d_refinement_07.output diff --git a/tests/distributed_grids/3d_coarse_grid_01.cc b/tests/distributed_grids/3d_coarse_grid_01.cc index 090e9939a3..9e6e8a8c6c 100644 --- a/tests/distributed_grids/3d_coarse_grid_01.cc +++ b/tests/distributed_grids/3d_coarse_grid_01.cc @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarse_grid_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarse_grid_01/cmp/generic b/tests/distributed_grids/3d_coarse_grid_01.output similarity index 100% rename from tests/distributed_grids/3d_coarse_grid_01/cmp/generic rename to tests/distributed_grids/3d_coarse_grid_01.output diff --git a/tests/distributed_grids/3d_coarse_grid_02.cc b/tests/distributed_grids/3d_coarse_grid_02.cc index fca3c8265a..b591d0aa7f 100644 --- a/tests/distributed_grids/3d_coarse_grid_02.cc +++ b/tests/distributed_grids/3d_coarse_grid_02.cc @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarse_grid_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarse_grid_02/cmp/generic b/tests/distributed_grids/3d_coarse_grid_02.output similarity index 100% rename from tests/distributed_grids/3d_coarse_grid_02/cmp/generic rename to tests/distributed_grids/3d_coarse_grid_02.output diff --git a/tests/distributed_grids/3d_coarse_grid_03.cc b/tests/distributed_grids/3d_coarse_grid_03.cc index a5a4e6fad9..996c529876 100644 --- a/tests/distributed_grids/3d_coarse_grid_03.cc +++ b/tests/distributed_grids/3d_coarse_grid_03.cc @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarse_grid_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarse_grid_03/cmp/generic b/tests/distributed_grids/3d_coarse_grid_03.output similarity index 100% rename from tests/distributed_grids/3d_coarse_grid_03/cmp/generic rename to tests/distributed_grids/3d_coarse_grid_03.output diff --git a/tests/distributed_grids/3d_coarse_grid_04.cc b/tests/distributed_grids/3d_coarse_grid_04.cc index c2e6115945..2f45b18236 100644 --- a/tests/distributed_grids/3d_coarse_grid_04.cc +++ b/tests/distributed_grids/3d_coarse_grid_04.cc @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarse_grid_04/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarse_grid_04/cmp/generic b/tests/distributed_grids/3d_coarse_grid_04.output similarity index 100% rename from tests/distributed_grids/3d_coarse_grid_04/cmp/generic rename to tests/distributed_grids/3d_coarse_grid_04.output diff --git a/tests/distributed_grids/3d_coarse_grid_05.cc b/tests/distributed_grids/3d_coarse_grid_05.cc index f75fdcb61b..420d62b8e3 100644 --- a/tests/distributed_grids/3d_coarse_grid_05.cc +++ b/tests/distributed_grids/3d_coarse_grid_05.cc @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarse_grid_05/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarse_grid_05/cmp/generic b/tests/distributed_grids/3d_coarse_grid_05.output similarity index 100% rename from tests/distributed_grids/3d_coarse_grid_05/cmp/generic rename to tests/distributed_grids/3d_coarse_grid_05.output diff --git a/tests/distributed_grids/3d_coarse_grid_06.cc b/tests/distributed_grids/3d_coarse_grid_06.cc index 03c1eeeb41..5bb8018bae 100644 --- a/tests/distributed_grids/3d_coarse_grid_06.cc +++ b/tests/distributed_grids/3d_coarse_grid_06.cc @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarse_grid_06/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarse_grid_06/cmp/generic b/tests/distributed_grids/3d_coarse_grid_06.output similarity index 100% rename from tests/distributed_grids/3d_coarse_grid_06/cmp/generic rename to tests/distributed_grids/3d_coarse_grid_06.output diff --git a/tests/distributed_grids/3d_coarse_grid_x_01.cc b/tests/distributed_grids/3d_coarse_grid_x_01.cc index da62cff4d5..26a10ac660 100644 --- a/tests/distributed_grids/3d_coarse_grid_x_01.cc +++ b/tests/distributed_grids/3d_coarse_grid_x_01.cc @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarse_grid_x_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarse_grid_x_01/cmp/generic b/tests/distributed_grids/3d_coarse_grid_x_01.output similarity index 100% rename from tests/distributed_grids/3d_coarse_grid_x_01/cmp/generic rename to tests/distributed_grids/3d_coarse_grid_x_01.output diff --git a/tests/distributed_grids/3d_coarsening_01.cc b/tests/distributed_grids/3d_coarsening_01.cc index fe03304b21..c7ef9acc95 100644 --- a/tests/distributed_grids/3d_coarsening_01.cc +++ b/tests/distributed_grids/3d_coarsening_01.cc @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarsening_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarsening_01/cmp/generic b/tests/distributed_grids/3d_coarsening_01.output similarity index 100% rename from tests/distributed_grids/3d_coarsening_01/cmp/generic rename to tests/distributed_grids/3d_coarsening_01.output diff --git a/tests/distributed_grids/3d_coarsening_02.cc b/tests/distributed_grids/3d_coarsening_02.cc index dbb63d9adb..b74ea13b74 100644 --- a/tests/distributed_grids/3d_coarsening_02.cc +++ b/tests/distributed_grids/3d_coarsening_02.cc @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarsening_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarsening_02/cmp/generic b/tests/distributed_grids/3d_coarsening_02.output similarity index 100% rename from tests/distributed_grids/3d_coarsening_02/cmp/generic rename to tests/distributed_grids/3d_coarsening_02.output diff --git a/tests/distributed_grids/3d_coarsening_03.cc b/tests/distributed_grids/3d_coarsening_03.cc index ac0d016bc1..a5696697cd 100644 --- a/tests/distributed_grids/3d_coarsening_03.cc +++ b/tests/distributed_grids/3d_coarsening_03.cc @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarsening_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarsening_03/cmp/generic b/tests/distributed_grids/3d_coarsening_03.output similarity index 100% rename from tests/distributed_grids/3d_coarsening_03/cmp/generic rename to tests/distributed_grids/3d_coarsening_03.output diff --git a/tests/distributed_grids/3d_coarsening_04.cc b/tests/distributed_grids/3d_coarsening_04.cc index be1c6c2a3f..2b356084f2 100644 --- a/tests/distributed_grids/3d_coarsening_04.cc +++ b/tests/distributed_grids/3d_coarsening_04.cc @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarsening_04/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarsening_04/cmp/generic b/tests/distributed_grids/3d_coarsening_04.output similarity index 100% rename from tests/distributed_grids/3d_coarsening_04/cmp/generic rename to tests/distributed_grids/3d_coarsening_04.output diff --git a/tests/distributed_grids/3d_coarsening_05.cc b/tests/distributed_grids/3d_coarsening_05.cc index ccb18f8529..5ba688788a 100644 --- a/tests/distributed_grids/3d_coarsening_05.cc +++ b/tests/distributed_grids/3d_coarsening_05.cc @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_coarsening_05/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_coarsening_05/cmp/generic b/tests/distributed_grids/3d_coarsening_05.output similarity index 100% rename from tests/distributed_grids/3d_coarsening_05/cmp/generic rename to tests/distributed_grids/3d_coarsening_05.output diff --git a/tests/distributed_grids/3d_refinement_01.cc b/tests/distributed_grids/3d_refinement_01.cc index d7367f509a..6571b41bdb 100644 --- a/tests/distributed_grids/3d_refinement_01.cc +++ b/tests/distributed_grids/3d_refinement_01.cc @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_refinement_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_01/cmp/generic b/tests/distributed_grids/3d_refinement_01.output similarity index 100% rename from tests/distributed_grids/3d_refinement_01/cmp/generic rename to tests/distributed_grids/3d_refinement_01.output diff --git a/tests/distributed_grids/3d_refinement_02.cc b/tests/distributed_grids/3d_refinement_02.cc index 9a56a2bd2c..b126caa0c8 100644 --- a/tests/distributed_grids/3d_refinement_02.cc +++ b/tests/distributed_grids/3d_refinement_02.cc @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_refinement_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_02/cmp/generic b/tests/distributed_grids/3d_refinement_02.output similarity index 100% rename from tests/distributed_grids/3d_refinement_02/cmp/generic rename to tests/distributed_grids/3d_refinement_02.output diff --git a/tests/distributed_grids/3d_refinement_03.cc b/tests/distributed_grids/3d_refinement_03.cc index 1e74d1e5ab..5582944a47 100644 --- a/tests/distributed_grids/3d_refinement_03.cc +++ b/tests/distributed_grids/3d_refinement_03.cc @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("3d_refinement_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_03/cmp/generic b/tests/distributed_grids/3d_refinement_03.output similarity index 100% rename from tests/distributed_grids/3d_refinement_03/cmp/generic rename to tests/distributed_grids/3d_refinement_03.output diff --git a/tests/distributed_grids/3d_refinement_04.cc b/tests/distributed_grids/3d_refinement_04.cc index 8eff960e65..8fcd9eb390 100644 --- a/tests/distributed_grids/3d_refinement_04.cc +++ b/tests/distributed_grids/3d_refinement_04.cc @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("3d_refinement_04/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_04/cmp/generic b/tests/distributed_grids/3d_refinement_04.output similarity index 100% rename from tests/distributed_grids/3d_refinement_04/cmp/generic rename to tests/distributed_grids/3d_refinement_04.output diff --git a/tests/distributed_grids/3d_refinement_05.cc b/tests/distributed_grids/3d_refinement_05.cc index 76adb480cd..25e94326d6 100644 --- a/tests/distributed_grids/3d_refinement_05.cc +++ b/tests/distributed_grids/3d_refinement_05.cc @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("3d_refinement_05/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_05/cmp/generic b/tests/distributed_grids/3d_refinement_05.output similarity index 100% rename from tests/distributed_grids/3d_refinement_05/cmp/generic rename to tests/distributed_grids/3d_refinement_05.output diff --git a/tests/distributed_grids/3d_refinement_06.cc b/tests/distributed_grids/3d_refinement_06.cc index d4621d59b1..d0e6e4d570 100644 --- a/tests/distributed_grids/3d_refinement_06.cc +++ b/tests/distributed_grids/3d_refinement_06.cc @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("3d_refinement_06/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_06/cmp/generic b/tests/distributed_grids/3d_refinement_06.output similarity index 100% rename from tests/distributed_grids/3d_refinement_06/cmp/generic rename to tests/distributed_grids/3d_refinement_06.output diff --git a/tests/distributed_grids/3d_refinement_07.cc b/tests/distributed_grids/3d_refinement_07.cc index e3d6e9f0c0..b3c9c84cae 100644 --- a/tests/distributed_grids/3d_refinement_07.cc +++ b/tests/distributed_grids/3d_refinement_07.cc @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("3d_refinement_07/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_07/cmp/generic b/tests/distributed_grids/3d_refinement_07.output similarity index 100% rename from tests/distributed_grids/3d_refinement_07/cmp/generic rename to tests/distributed_grids/3d_refinement_07.output diff --git a/tests/distributed_grids/3d_refinement_08.cc b/tests/distributed_grids/3d_refinement_08.cc index 1da2a64e8c..88676c5c31 100644 --- a/tests/distributed_grids/3d_refinement_08.cc +++ b/tests/distributed_grids/3d_refinement_08.cc @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("3d_refinement_08/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_08/cmp/generic b/tests/distributed_grids/3d_refinement_08.output similarity index 100% rename from tests/distributed_grids/3d_refinement_08/cmp/generic rename to tests/distributed_grids/3d_refinement_08.output diff --git a/tests/distributed_grids/3d_refinement_09.cc b/tests/distributed_grids/3d_refinement_09.cc index b22509e383..2c7baf9b07 100644 --- a/tests/distributed_grids/3d_refinement_09.cc +++ b/tests/distributed_grids/3d_refinement_09.cc @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) deal_II_exceptions::disable_abort_on_exception(); Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("3d_refinement_09/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/3d_refinement_09/cmp/generic b/tests/distributed_grids/3d_refinement_09.output similarity index 100% rename from tests/distributed_grids/3d_refinement_09/cmp/generic rename to tests/distributed_grids/3d_refinement_09.output diff --git a/tests/distributed_grids/Makefile b/tests/distributed_grids/Makefile deleted file mode 100644 index dcb40acded..0000000000 --- a/tests/distributed_grids/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -############################################################ -# $Id$ -# Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors -############################################################ - -include ../Makefile.paths -include $D/common/Make.global_options - -# we have a couple tests in this directory that take about 10 -# minutes. set the limit to 30 -ULIMIT_LIMIT=1800 - -include ../Makefile.rules --include Makefile.depend --include Makefile.tests diff --git a/tests/distributed_grids/anisotropic.cc b/tests/distributed_grids/anisotropic.cc index 1a8de77f57..8124dfb3e2 100644 --- a/tests/distributed_grids/anisotropic.cc +++ b/tests/distributed_grids/anisotropic.cc @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("anisotropic/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/anisotropic/cmp/generic b/tests/distributed_grids/anisotropic.output similarity index 100% rename from tests/distributed_grids/anisotropic/cmp/generic rename to tests/distributed_grids/anisotropic.output diff --git a/tests/distributed_grids/count_dofs_per_block_01.cc b/tests/distributed_grids/count_dofs_per_block_01.cc index bf046470f7..19120e7f23 100644 --- a/tests/distributed_grids/count_dofs_per_block_01.cc +++ b/tests/distributed_grids/count_dofs_per_block_01.cc @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); if (myid == 0) { - std::ofstream logfile("count_dofs_per_block_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/count_dofs_per_block_01/cmp/generic b/tests/distributed_grids/count_dofs_per_block_01.output similarity index 100% rename from tests/distributed_grids/count_dofs_per_block_01/cmp/generic rename to tests/distributed_grids/count_dofs_per_block_01.output diff --git a/tests/distributed_grids/count_dofs_per_component_01.cc b/tests/distributed_grids/count_dofs_per_component_01.cc index 3e2f72a513..095c7a1e4d 100644 --- a/tests/distributed_grids/count_dofs_per_component_01.cc +++ b/tests/distributed_grids/count_dofs_per_component_01.cc @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); if (myid == 0) { - std::ofstream logfile("count_dofs_per_component_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/count_dofs_per_component_01/cmp/generic b/tests/distributed_grids/count_dofs_per_component_01.output similarity index 100% rename from tests/distributed_grids/count_dofs_per_component_01/cmp/generic rename to tests/distributed_grids/count_dofs_per_component_01.output diff --git a/tests/distributed_grids/dof_handler_number_cache.cc b/tests/distributed_grids/dof_handler_number_cache.cc index 3bf1631e98..877391b7a5 100644 --- a/tests/distributed_grids/dof_handler_number_cache.cc +++ b/tests/distributed_grids/dof_handler_number_cache.cc @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); if (myid == 0) { - std::ofstream logfile("dof_handler_number_cache/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/dof_handler_number_cache/cmp/generic b/tests/distributed_grids/dof_handler_number_cache.output similarity index 100% rename from tests/distributed_grids/dof_handler_number_cache/cmp/generic rename to tests/distributed_grids/dof_handler_number_cache.output diff --git a/tests/distributed_grids/solution_transfer_01.cc b/tests/distributed_grids/solution_transfer_01.cc index 0c23ecebb3..d8162515a0 100644 --- a/tests/distributed_grids/solution_transfer_01.cc +++ b/tests/distributed_grids/solution_transfer_01.cc @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("solution_transfer_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/solution_transfer_01/cmp/generic b/tests/distributed_grids/solution_transfer_01.output similarity index 100% rename from tests/distributed_grids/solution_transfer_01/cmp/generic rename to tests/distributed_grids/solution_transfer_01.output diff --git a/tests/distributed_grids/solution_transfer_02.cc b/tests/distributed_grids/solution_transfer_02.cc index fd54ee7c14..57290b1739 100644 --- a/tests/distributed_grids/solution_transfer_02.cc +++ b/tests/distributed_grids/solution_transfer_02.cc @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("solution_transfer_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/solution_transfer_02/cmp/generic b/tests/distributed_grids/solution_transfer_02.output similarity index 100% rename from tests/distributed_grids/solution_transfer_02/cmp/generic rename to tests/distributed_grids/solution_transfer_02.output diff --git a/tests/distributed_grids/solution_transfer_03.cc b/tests/distributed_grids/solution_transfer_03.cc index a424e388b4..e70e556277 100644 --- a/tests/distributed_grids/solution_transfer_03.cc +++ b/tests/distributed_grids/solution_transfer_03.cc @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) (void)argv; #endif - std::ofstream logfile("solution_transfer_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/solution_transfer_03/cmp/generic b/tests/distributed_grids/solution_transfer_03.output similarity index 100% rename from tests/distributed_grids/solution_transfer_03/cmp/generic rename to tests/distributed_grids/solution_transfer_03.output diff --git a/tests/distributed_grids/solution_transfer_04.cc b/tests/distributed_grids/solution_transfer_04.cc index 869c7ea9cb..59a55ef35c 100644 --- a/tests/distributed_grids/solution_transfer_04.cc +++ b/tests/distributed_grids/solution_transfer_04.cc @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("solution_transfer_04/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/solution_transfer_04/cmp/generic b/tests/distributed_grids/solution_transfer_04.output similarity index 100% rename from tests/distributed_grids/solution_transfer_04/cmp/generic rename to tests/distributed_grids/solution_transfer_04.output diff --git a/tests/distributed_grids/subdomain_id_01.cc b/tests/distributed_grids/subdomain_id_01.cc index ba026f68f5..8c59edf724 100644 --- a/tests/distributed_grids/subdomain_id_01.cc +++ b/tests/distributed_grids/subdomain_id_01.cc @@ -65,7 +65,7 @@ int main (int argc, char *argv[]) deal_II_exceptions::disable_abort_on_exception(); Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("subdomain_id_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/subdomain_id_01/cmp/generic b/tests/distributed_grids/subdomain_id_01.output similarity index 100% rename from tests/distributed_grids/subdomain_id_01/cmp/generic rename to tests/distributed_grids/subdomain_id_01.output diff --git a/tests/distributed_grids/tria_settings_01.cc b/tests/distributed_grids/tria_settings_01.cc index 7db3941e68..be7c5a8a30 100644 --- a/tests/distributed_grids/tria_settings_01.cc +++ b/tests/distributed_grids/tria_settings_01.cc @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("tria_settings_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/tria_settings_01/cmp/generic b/tests/distributed_grids/tria_settings_01.output similarity index 100% rename from tests/distributed_grids/tria_settings_01/cmp/generic rename to tests/distributed_grids/tria_settings_01.output diff --git a/tests/distributed_grids/update_number_cache_01.cc b/tests/distributed_grids/update_number_cache_01.cc index e28ec03167..80247336b7 100644 --- a/tests/distributed_grids/update_number_cache_01.cc +++ b/tests/distributed_grids/update_number_cache_01.cc @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); - std::ofstream logfile("update_number_cache_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/distributed_grids/update_number_cache_01/cmp/generic b/tests/distributed_grids/update_number_cache_01.output similarity index 100% rename from tests/distributed_grids/update_number_cache_01/cmp/generic rename to tests/distributed_grids/update_number_cache_01.output -- 2.39.5