From c700f62f86e1428ef5bc2e48e06f778200db9ced Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 27 Aug 2016 21:04:29 -0400 Subject: [PATCH] Remove tests/mpi/coarse_grid_common.h. The only functions in this header file that are actually used in this directory are some extra LogStream::operator<< overloads: those belong (logically) in the tests.h header file. --- tests/mpi/attach_data_01.cc | 1 - tests/mpi/blockvec_01.cc | 1 - tests/mpi/cell_weights_01.cc | 1 - .../mpi/cell_weights_01_back_and_forth_01.cc | 1 - .../mpi/cell_weights_01_back_and_forth_02.cc | 1 - tests/mpi/cell_weights_02.cc | 1 - tests/mpi/cell_weights_03.cc | 1 - tests/mpi/cell_weights_04.cc | 1 - tests/mpi/cell_weights_05.cc | 1 - tests/mpi/cell_weights_06.cc | 1 - tests/mpi/coarse_grid_common.h | 132 ------------------ tests/mpi/codim_01.cc | 1 - tests/mpi/communicate_moved_vertices_01.cc | 1 - tests/mpi/communicate_moved_vertices_02.cc | 1 - tests/mpi/compute_mean_value.cc | 1 - tests/mpi/condense_01.cc | 1 - tests/mpi/constraint_matrix_trilinos_bug.cc | 1 - tests/mpi/extract_boundary_dofs.cc | 1 - tests/mpi/extract_constant_modes_01.cc | 1 - tests/mpi/extract_constant_modes_02.cc | 1 - tests/mpi/extract_locally_active_dofs.cc | 1 - tests/mpi/fe_field_function_01.cc | 1 - tests/mpi/fe_field_function_02.cc | 1 - tests/mpi/find_active_cell_around_point_01.cc | 1 - tests/mpi/integrate_difference.cc | 1 - tests/mpi/interpolate_01.cc | 1 - tests/mpi/interpolate_02.cc | 1 - tests/mpi/interpolate_03.cc | 1 - tests/mpi/interpolate_04.cc | 1 - tests/mpi/is_locally_owned.cc | 1 - tests/mpi/make_zero_boundary_values.cc | 1 - tests/mpi/map_dofs_to_support_points.cc | 1 - tests/mpi/mg_01.cc | 1 - tests/mpi/mg_02.cc | 1 - tests/mpi/mg_03.cc | 1 - tests/mpi/mg_04.cc | 1 - tests/mpi/mg_05.cc | 1 - tests/mpi/mg_06.cc | 1 - tests/mpi/p4est_2d_coarse_01.cc | 1 - tests/mpi/p4est_2d_constraintmatrix_01.cc | 1 - tests/mpi/p4est_2d_constraintmatrix_02.cc | 1 - tests/mpi/p4est_2d_constraintmatrix_03.cc | 1 - tests/mpi/p4est_2d_constraintmatrix_04.cc | 1 - tests/mpi/p4est_2d_dofhandler_01.cc | 1 - tests/mpi/p4est_2d_dofhandler_02.cc | 1 - tests/mpi/p4est_2d_dofhandler_03.cc | 1 - tests/mpi/p4est_2d_dofhandler_04.cc | 1 - tests/mpi/p4est_2d_dofhandler_05.cc | 1 - tests/mpi/p4est_2d_ghost_01.cc | 1 - tests/mpi/p4est_2d_ghost_02.cc | 1 - tests/mpi/p4est_2d_refine_01.cc | 1 - tests/mpi/p4est_2d_refine_02.cc | 1 - tests/mpi/p4est_2d_refine_03.cc | 1 - tests/mpi/p4est_2d_renumber_01.cc | 1 - tests/mpi/p4est_2d_renumber_02.cc | 1 - tests/mpi/p4est_2d_simple.cc | 1 - tests/mpi/p4est_3d_constraintmatrix_01.cc | 1 - tests/mpi/p4est_3d_constraintmatrix_02.cc | 1 - tests/mpi/p4est_3d_constraintmatrix_03.cc | 1 - tests/mpi/p4est_3d_constraintmatrix_04.cc | 1 - tests/mpi/p4est_3d_ghost_01.cc | 1 - tests/mpi/p4est_3d_refine_01.cc | 1 - tests/mpi/p4est_3d_refine_02.cc | 1 - tests/mpi/p4est_3d_refine_03.cc | 1 - tests/mpi/p4est_3d_refine_04.cc | 1 - tests/mpi/p4est_data_out_01.cc | 1 - tests/mpi/p4est_get_subdomain_association.cc | 1 - tests/mpi/p4est_max_refine.cc | 1 - tests/mpi/p4est_save_01.cc | 1 - tests/mpi/p4est_save_02.cc | 1 - tests/mpi/p4est_save_03.cc | 1 - tests/mpi/p4est_save_04.cc | 1 - tests/mpi/parallel_partitioner_03.cc | 1 - tests/mpi/parallel_vtu_01.cc | 1 - tests/mpi/renumber_z_order_01.cc | 1 - tests/mpi/renumber_z_order_02.cc | 1 - tests/mpi/repartition_01.cc | 1 - tests/mpi/repartition_02.cc | 1 - tests/mpi/repartition_03.cc | 1 - tests/mpi/solution_transfer_01.cc | 1 - tests/mpi/tria_01.cc | 1 - tests/mpi/tria_copy_triangulation.cc | 1 - tests/mpi/trilinos_vector_ghosts_01.cc | 1 - tests/tests.h | 34 +++++ 84 files changed, 34 insertions(+), 214 deletions(-) delete mode 100644 tests/mpi/coarse_grid_common.h diff --git a/tests/mpi/attach_data_01.cc b/tests/mpi/attach_data_01.cc index 595eedee77..542885bb99 100644 --- a/tests/mpi/attach_data_01.cc +++ b/tests/mpi/attach_data_01.cc @@ -18,7 +18,6 @@ // check register_data_attach and notify_ready_to_unpack #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/blockvec_01.cc b/tests/mpi/blockvec_01.cc index 003fe251f7..67d9a8da1a 100644 --- a/tests/mpi/blockvec_01.cc +++ b/tests/mpi/blockvec_01.cc @@ -18,7 +18,6 @@ // Test constructor/reinit of BlockVector with IndexSets #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/cell_weights_01.cc b/tests/mpi/cell_weights_01.cc index 1ec31654ad..11f3b945f6 100644 --- a/tests/mpi/cell_weights_01.cc +++ b/tests/mpi/cell_weights_01.cc @@ -20,7 +20,6 @@ // this test does not use any cell weights, but the following ones will #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/cell_weights_01_back_and_forth_01.cc b/tests/mpi/cell_weights_01_back_and_forth_01.cc index ddf8a0fb53..6d895b3cf8 100644 --- a/tests/mpi/cell_weights_01_back_and_forth_01.cc +++ b/tests/mpi/cell_weights_01_back_and_forth_01.cc @@ -22,7 +22,6 @@ // same mesh as if there had been no weights at all to begin with #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/cell_weights_01_back_and_forth_02.cc b/tests/mpi/cell_weights_01_back_and_forth_02.cc index 9269bbc350..3e5121a255 100644 --- a/tests/mpi/cell_weights_01_back_and_forth_02.cc +++ b/tests/mpi/cell_weights_01_back_and_forth_02.cc @@ -21,7 +21,6 @@ // simply don't attach any weights at all #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/cell_weights_02.cc b/tests/mpi/cell_weights_02.cc index b34a522eaa..ac4fbddad6 100644 --- a/tests/mpi/cell_weights_02.cc +++ b/tests/mpi/cell_weights_02.cc @@ -21,7 +21,6 @@ // should still be equal #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/cell_weights_03.cc b/tests/mpi/cell_weights_03.cc index 839499823f..2fee499744 100644 --- a/tests/mpi/cell_weights_03.cc +++ b/tests/mpi/cell_weights_03.cc @@ -21,7 +21,6 @@ // should yield non-equal mesh sizes #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/cell_weights_04.cc b/tests/mpi/cell_weights_04.cc index c4a61e6d2e..9b722438a8 100644 --- a/tests/mpi/cell_weights_04.cc +++ b/tests/mpi/cell_weights_04.cc @@ -19,7 +19,6 @@ // like _03, but with a larger spread of weights #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/cell_weights_05.cc b/tests/mpi/cell_weights_05.cc index 35a3e42e95..276dca5d66 100644 --- a/tests/mpi/cell_weights_05.cc +++ b/tests/mpi/cell_weights_05.cc @@ -30,7 +30,6 @@ // remaining cells even close to equally #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/cell_weights_06.cc b/tests/mpi/cell_weights_06.cc index 56f477d101..d7b283e6f7 100644 --- a/tests/mpi/cell_weights_06.cc +++ b/tests/mpi/cell_weights_06.cc @@ -27,7 +27,6 @@ // stores 0/84/172 cells in 2d, rather than the expected 4/126/126 #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/coarse_grid_common.h b/tests/mpi/coarse_grid_common.h deleted file mode 100644 index f7d775bbab..0000000000 --- a/tests/mpi/coarse_grid_common.h +++ /dev/null @@ -1,132 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2008 - 2015 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - -#include "../tests.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - - -template -void write_vtk (const parallel::distributed::Triangulation &tria, - const char *filename) -{ - deallog << "Checksum: " - << tria.get_checksum () - << std::endl; - - tria.write_mesh_vtk (filename); - - if (false) - { - - int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); - - - // copy the .pvtu and .vtu files - // into the logstream - if (myid==0) - { - std::ifstream in((std::string(filename) + ".pvtu").c_str()); - while (in) - { - std::string s; - std::getline(in, s); - deallog.get_file_stream() << s << "\n"; - } - } - - if (myid==0) - { - std::ifstream in((std::string(filename) + "_0000.vtu").c_str()); - while (in) - { - std::string s; - std::getline(in, s); - deallog.get_file_stream() << s << "\n"; - } - } - } -} - - -template -void assert_tria_equal(const Triangulation &a, const Triangulation &b) -{ - Assert (a.n_active_cells() == b.n_active_cells(), - ExcInternalError()); - - std::string file1 = "tmp_grid1"; - std::string file2 = "tmp_grid2"; - - std::ofstream out1(file1.c_str()); - GridOut().write_gnuplot (a, out1); - std::ofstream out2(file2.c_str()); - GridOut().write_gnuplot (b, out2); - - out1.close(); - out2.close(); - - //compare the two files - std::string cmd = std::string("diff -q ")+file1+std::string(" ")+file2; - AssertThrow (system(cmd.c_str()) == 0, ExcInternalError()); - - //and delete them - std::remove (file1.c_str()); - std::remove (file2.c_str()); -} - - -/* - * Do not use a template here to work around an overload resolution issue with clang and - * enabled C++11 mode. - * - * - Maier 2013 - */ -LogStream & -operator << (LogStream &out, - const std::vector &v) -{ - for (unsigned int i=0; i &v) -{ - for (unsigned int i=0; i &v) -{ - for (unsigned int i=0; i and DataOutput. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/communicate_moved_vertices_01.cc b/tests/mpi/communicate_moved_vertices_01.cc index 65a080b1c6..2320b0b5ba 100644 --- a/tests/mpi/communicate_moved_vertices_01.cc +++ b/tests/mpi/communicate_moved_vertices_01.cc @@ -18,7 +18,6 @@ // test Triangulation::communicate_locally_moved_vertices() #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/communicate_moved_vertices_02.cc b/tests/mpi/communicate_moved_vertices_02.cc index 0de4798296..2c2c5b74d4 100644 --- a/tests/mpi/communicate_moved_vertices_02.cc +++ b/tests/mpi/communicate_moved_vertices_02.cc @@ -19,7 +19,6 @@ // only move some of the vertices #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/compute_mean_value.cc b/tests/mpi/compute_mean_value.cc index fa7e6a4173..eb51c380e9 100644 --- a/tests/mpi/compute_mean_value.cc +++ b/tests/mpi/compute_mean_value.cc @@ -20,7 +20,6 @@ // value of the interpolation must be the mean of the linear function #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/condense_01.cc b/tests/mpi/condense_01.cc index b013aa70f4..ea3f768c29 100644 --- a/tests/mpi/condense_01.cc +++ b/tests/mpi/condense_01.cc @@ -18,7 +18,6 @@ // test ConstraintMatrix::condense(in, out) #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/constraint_matrix_trilinos_bug.cc b/tests/mpi/constraint_matrix_trilinos_bug.cc index 0118d4bce3..b24e96e3ba 100644 --- a/tests/mpi/constraint_matrix_trilinos_bug.cc +++ b/tests/mpi/constraint_matrix_trilinos_bug.cc @@ -21,7 +21,6 @@ // ghost elements. check that this happens. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/extract_boundary_dofs.cc b/tests/mpi/extract_boundary_dofs.cc index dd504df867..ca219e4c68 100644 --- a/tests/mpi/extract_boundary_dofs.cc +++ b/tests/mpi/extract_boundary_dofs.cc @@ -18,7 +18,6 @@ // Test DoFTools::extract_boundary_dofs for parallel DoFHandlers #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/extract_constant_modes_01.cc b/tests/mpi/extract_constant_modes_01.cc index 24d8fbe834..334b40a448 100644 --- a/tests/mpi/extract_constant_modes_01.cc +++ b/tests/mpi/extract_constant_modes_01.cc @@ -18,7 +18,6 @@ // test DoFTools::extract_constant_modes #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/extract_constant_modes_02.cc b/tests/mpi/extract_constant_modes_02.cc index ca08fc49cb..97cedf8e7e 100644 --- a/tests/mpi/extract_constant_modes_02.cc +++ b/tests/mpi/extract_constant_modes_02.cc @@ -18,7 +18,6 @@ // test DoFTools::extract_constant_modes with FE_Q_DG0 #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/extract_locally_active_dofs.cc b/tests/mpi/extract_locally_active_dofs.cc index c82ab4b4b1..32484fda8c 100644 --- a/tests/mpi/extract_locally_active_dofs.cc +++ b/tests/mpi/extract_locally_active_dofs.cc @@ -19,7 +19,6 @@ // same result as DoFTools::extract_dofs_with_subdomain_association() #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/fe_field_function_01.cc b/tests/mpi/fe_field_function_01.cc index 8305bbd4e7..8df8170292 100644 --- a/tests/mpi/fe_field_function_01.cc +++ b/tests/mpi/fe_field_function_01.cc @@ -20,7 +20,6 @@ // value of the interpolation must be the mean of the linear function #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/fe_field_function_02.cc b/tests/mpi/fe_field_function_02.cc index 64ecbb3fd1..b01e70bc60 100644 --- a/tests/mpi/fe_field_function_02.cc +++ b/tests/mpi/fe_field_function_02.cc @@ -22,7 +22,6 @@ // didn't expect getting a ghost cell. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/find_active_cell_around_point_01.cc b/tests/mpi/find_active_cell_around_point_01.cc index 9539e6ea12..eaa679ebeb 100644 --- a/tests/mpi/find_active_cell_around_point_01.cc +++ b/tests/mpi/find_active_cell_around_point_01.cc @@ -18,7 +18,6 @@ // make sure only one processor finds a locally-owned cell around a point #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/integrate_difference.cc b/tests/mpi/integrate_difference.cc index 233373c8fc..27b67cb5db 100644 --- a/tests/mpi/integrate_difference.cc +++ b/tests/mpi/integrate_difference.cc @@ -18,7 +18,6 @@ // Test VectorTools::integrate_difference for parallel computations. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/interpolate_01.cc b/tests/mpi/interpolate_01.cc index 3330f9976a..9a5bfb6375 100644 --- a/tests/mpi/interpolate_01.cc +++ b/tests/mpi/interpolate_01.cc @@ -21,7 +21,6 @@ // wrong with having too many tests, though. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/interpolate_02.cc b/tests/mpi/interpolate_02.cc index bd995a1d83..2b16e86f3f 100644 --- a/tests/mpi/interpolate_02.cc +++ b/tests/mpi/interpolate_02.cc @@ -22,7 +22,6 @@ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/interpolate_03.cc b/tests/mpi/interpolate_03.cc index 7bb7495ee7..e416b3e8ac 100644 --- a/tests/mpi/interpolate_03.cc +++ b/tests/mpi/interpolate_03.cc @@ -21,7 +21,6 @@ // that interpolate() does not call compress()! #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/interpolate_04.cc b/tests/mpi/interpolate_04.cc index 5e29c67e6e..2be3115f25 100644 --- a/tests/mpi/interpolate_04.cc +++ b/tests/mpi/interpolate_04.cc @@ -18,7 +18,6 @@ // test FETools::interpolation_difference #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/is_locally_owned.cc b/tests/mpi/is_locally_owned.cc index 9a11c594e2..7f50575bc5 100644 --- a/tests/mpi/is_locally_owned.cc +++ b/tests/mpi/is_locally_owned.cc @@ -18,7 +18,6 @@ // check CellAccessor::is_locally_owned #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/make_zero_boundary_values.cc b/tests/mpi/make_zero_boundary_values.cc index 8e12d140e9..02a07336ea 100644 --- a/tests/mpi/make_zero_boundary_values.cc +++ b/tests/mpi/make_zero_boundary_values.cc @@ -18,7 +18,6 @@ // Test DoFTools::make_zero_boundary_constraints for parallel DoFHandlers #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/map_dofs_to_support_points.cc b/tests/mpi/map_dofs_to_support_points.cc index 2a45869a2e..2886966d8d 100644 --- a/tests/mpi/map_dofs_to_support_points.cc +++ b/tests/mpi/map_dofs_to_support_points.cc @@ -18,7 +18,6 @@ // Test DoFTools::map_dofs_to_support_points for parallel DoFHandlers #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/mg_01.cc b/tests/mpi/mg_01.cc index 2fca62a3d2..3bc25ff004 100644 --- a/tests/mpi/mg_01.cc +++ b/tests/mpi/mg_01.cc @@ -18,7 +18,6 @@ // check level_subdomain_id for distributed Triangulation #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/mg_02.cc b/tests/mpi/mg_02.cc index 18b3650878..e9f21d363a 100644 --- a/tests/mpi/mg_02.cc +++ b/tests/mpi/mg_02.cc @@ -18,7 +18,6 @@ // distribute dofs and mgdofs for a parallel Triangulation #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/mg_03.cc b/tests/mpi/mg_03.cc index 865f234f96..93edccb637 100644 --- a/tests/mpi/mg_03.cc +++ b/tests/mpi/mg_03.cc @@ -31,7 +31,6 @@ */ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/mg_04.cc b/tests/mpi/mg_04.cc index 68552b35d1..47785f1c94 100644 --- a/tests/mpi/mg_04.cc +++ b/tests/mpi/mg_04.cc @@ -28,7 +28,6 @@ Additional Information: */ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/mg_05.cc b/tests/mpi/mg_05.cc index 59c2d643b0..1133fdf1d9 100644 --- a/tests/mpi/mg_05.cc +++ b/tests/mpi/mg_05.cc @@ -28,7 +28,6 @@ Additional Information: */ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/mg_06.cc b/tests/mpi/mg_06.cc index ceb8ba4643..272b96560f 100644 --- a/tests/mpi/mg_06.cc +++ b/tests/mpi/mg_06.cc @@ -28,7 +28,6 @@ Additional Information: */ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_coarse_01.cc b/tests/mpi/p4est_2d_coarse_01.cc index 234441b5d9..5a4a89045e 100644 --- a/tests/mpi/p4est_2d_coarse_01.cc +++ b/tests/mpi/p4est_2d_coarse_01.cc @@ -18,7 +18,6 @@ // Test interaction with p4est with a few simple coarse grids in 2d #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc index b10a2a01e8..5352330fe6 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc @@ -20,7 +20,6 @@ // Simple mesh. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_constraintmatrix_02.cc b/tests/mpi/p4est_2d_constraintmatrix_02.cc index 9b9de08026..d95d6de520 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc @@ -20,7 +20,6 @@ // Refine one corner. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc index 5e81442b84..e5773a8209 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -20,7 +20,6 @@ // Mesh: shell with random refinement #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc index 1ebd5d7ed3..fd2365c895 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -20,7 +20,6 @@ // Mesh: shell with random refinement #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_dofhandler_01.cc b/tests/mpi/p4est_2d_dofhandler_01.cc index b140b3683d..5c780a0d48 100644 --- a/tests/mpi/p4est_2d_dofhandler_01.cc +++ b/tests/mpi/p4est_2d_dofhandler_01.cc @@ -18,7 +18,6 @@ // create a parallel DoFHandler #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_dofhandler_02.cc b/tests/mpi/p4est_2d_dofhandler_02.cc index 8d17793dfb..61161daa36 100644 --- a/tests/mpi/p4est_2d_dofhandler_02.cc +++ b/tests/mpi/p4est_2d_dofhandler_02.cc @@ -18,7 +18,6 @@ // create a parallel DoFHandler on a 2d adaptively refined mesh #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_dofhandler_03.cc b/tests/mpi/p4est_2d_dofhandler_03.cc index 4584c0a360..2f91da8546 100644 --- a/tests/mpi/p4est_2d_dofhandler_03.cc +++ b/tests/mpi/p4est_2d_dofhandler_03.cc @@ -19,7 +19,6 @@ // check correct transfer of DoF on ghostcells. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_dofhandler_04.cc b/tests/mpi/p4est_2d_dofhandler_04.cc index 600260afa3..0ec79f2a92 100644 --- a/tests/mpi/p4est_2d_dofhandler_04.cc +++ b/tests/mpi/p4est_2d_dofhandler_04.cc @@ -19,7 +19,6 @@ // check DoFTools::extract_locally_active_dofs #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_dofhandler_05.cc b/tests/mpi/p4est_2d_dofhandler_05.cc index 9277fb64fc..a626f08d6d 100644 --- a/tests/mpi/p4est_2d_dofhandler_05.cc +++ b/tests/mpi/p4est_2d_dofhandler_05.cc @@ -20,7 +20,6 @@ // during development #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_ghost_01.cc b/tests/mpi/p4est_2d_ghost_01.cc index 7a9f38b582..022582b091 100644 --- a/tests/mpi/p4est_2d_ghost_01.cc +++ b/tests/mpi/p4est_2d_ghost_01.cc @@ -18,7 +18,6 @@ // check existence of ghost layer in 2d #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_ghost_02.cc b/tests/mpi/p4est_2d_ghost_02.cc index 3fa04ec8ad..7d91d97ee2 100644 --- a/tests/mpi/p4est_2d_ghost_02.cc +++ b/tests/mpi/p4est_2d_ghost_02.cc @@ -18,7 +18,6 @@ // check existence of ghost layer in 2d with global refinement #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_refine_01.cc b/tests/mpi/p4est_2d_refine_01.cc index 1d912b5359..83af42e359 100644 --- a/tests/mpi/p4est_2d_refine_01.cc +++ b/tests/mpi/p4est_2d_refine_01.cc @@ -18,7 +18,6 @@ // one global refinement of a 2d square with p4est #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_refine_02.cc b/tests/mpi/p4est_2d_refine_02.cc index 578b139301..426f9db003 100644 --- a/tests/mpi/p4est_2d_refine_02.cc +++ b/tests/mpi/p4est_2d_refine_02.cc @@ -18,7 +18,6 @@ // refine bottom-left cell after one global refinement of a square in 2d and check p4est-output #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_refine_03.cc b/tests/mpi/p4est_2d_refine_03.cc index f8183cd33b..7f833fff6a 100644 --- a/tests/mpi/p4est_2d_refine_03.cc +++ b/tests/mpi/p4est_2d_refine_03.cc @@ -18,7 +18,6 @@ // recursively refine a 2d mesh #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_renumber_01.cc b/tests/mpi/p4est_2d_renumber_01.cc index f972bacaca..608d0b4219 100644 --- a/tests/mpi/p4est_2d_renumber_01.cc +++ b/tests/mpi/p4est_2d_renumber_01.cc @@ -20,7 +20,6 @@ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_renumber_02.cc b/tests/mpi/p4est_2d_renumber_02.cc index b68feddd9a..3cbfb9e330 100644 --- a/tests/mpi/p4est_2d_renumber_02.cc +++ b/tests/mpi/p4est_2d_renumber_02.cc @@ -23,7 +23,6 @@ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_2d_simple.cc b/tests/mpi/p4est_2d_simple.cc index 07e8bd93d0..6053937e41 100644 --- a/tests/mpi/p4est_2d_simple.cc +++ b/tests/mpi/p4est_2d_simple.cc @@ -18,7 +18,6 @@ // test p4est grid interaction with one cell in 2d #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_constraintmatrix_01.cc b/tests/mpi/p4est_3d_constraintmatrix_01.cc index 023dedf6b2..31aabe3db5 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc @@ -20,7 +20,6 @@ // Mesh: 3d Random refinement. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_constraintmatrix_02.cc b/tests/mpi/p4est_3d_constraintmatrix_02.cc index 53559103d0..14dd6a349b 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_02.cc @@ -19,7 +19,6 @@ // with Trilinos #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc index 06ba12f0e2..bcb7ed028d 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -20,7 +20,6 @@ // Mesh: shell with random refinement #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_constraintmatrix_04.cc b/tests/mpi/p4est_3d_constraintmatrix_04.cc index fd74173866..6b9616f051 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_04.cc @@ -19,7 +19,6 @@ // Mesh: hypercube where 7 of 8 octants are refined. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_ghost_01.cc b/tests/mpi/p4est_3d_ghost_01.cc index 2a55d82d6d..37cd1b7fc8 100644 --- a/tests/mpi/p4est_3d_ghost_01.cc +++ b/tests/mpi/p4est_3d_ghost_01.cc @@ -19,7 +19,6 @@ // 3d mesh. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_refine_01.cc b/tests/mpi/p4est_3d_refine_01.cc index fbb4361aa8..e32de905db 100644 --- a/tests/mpi/p4est_3d_refine_01.cc +++ b/tests/mpi/p4est_3d_refine_01.cc @@ -18,7 +18,6 @@ // recursively refine a 3d mesh #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_refine_02.cc b/tests/mpi/p4est_3d_refine_02.cc index dfe0ade4fc..60f6abb35d 100644 --- a/tests/mpi/p4est_3d_refine_02.cc +++ b/tests/mpi/p4est_3d_refine_02.cc @@ -24,7 +24,6 @@ //[t500u:16597] [22] ./p4est_3d_refine_02/exe(_Z4testILi3EEvv+0x109) [0x410f1c] #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_refine_03.cc b/tests/mpi/p4est_3d_refine_03.cc index 6db7f49388..79eec67a4e 100644 --- a/tests/mpi/p4est_3d_refine_03.cc +++ b/tests/mpi/p4est_3d_refine_03.cc @@ -36,7 +36,6 @@ */ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_3d_refine_04.cc b/tests/mpi/p4est_3d_refine_04.cc index 2a04b2c1c3..e7916568c4 100644 --- a/tests/mpi/p4est_3d_refine_04.cc +++ b/tests/mpi/p4est_3d_refine_04.cc @@ -23,7 +23,6 @@ // apparently rather subtle and indeed pretty frustrating bug... #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_data_out_01.cc b/tests/mpi/p4est_data_out_01.cc index b0a5811bd2..51f33fd323 100644 --- a/tests/mpi/p4est_data_out_01.cc +++ b/tests/mpi/p4est_data_out_01.cc @@ -24,7 +24,6 @@ // the format stays as it is right now. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_get_subdomain_association.cc b/tests/mpi/p4est_get_subdomain_association.cc index 534ab6a2bd..ed7987d7b7 100644 --- a/tests/mpi/p4est_get_subdomain_association.cc +++ b/tests/mpi/p4est_get_subdomain_association.cc @@ -22,7 +22,6 @@ // is non-contiguous #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_max_refine.cc b/tests/mpi/p4est_max_refine.cc index 0a9bbcf287..6e594c107d 100644 --- a/tests/mpi/p4est_max_refine.cc +++ b/tests/mpi/p4est_max_refine.cc @@ -18,7 +18,6 @@ // recursively refine a 2d mesh to a very high level #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_save_01.cc b/tests/mpi/p4est_save_01.cc index e079db9952..818de42069 100644 --- a/tests/mpi/p4est_save_01.cc +++ b/tests/mpi/p4est_save_01.cc @@ -18,7 +18,6 @@ // save and load a triangulation #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_save_02.cc b/tests/mpi/p4est_save_02.cc index dd5b71b02c..77800aaa71 100644 --- a/tests/mpi/p4est_save_02.cc +++ b/tests/mpi/p4est_save_02.cc @@ -18,7 +18,6 @@ // save and load a triangulation with one solution vector #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_save_03.cc b/tests/mpi/p4est_save_03.cc index 8c9b1df4a6..8e7d421935 100644 --- a/tests/mpi/p4est_save_03.cc +++ b/tests/mpi/p4est_save_03.cc @@ -19,7 +19,6 @@ // crashes right now #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/p4est_save_04.cc b/tests/mpi/p4est_save_04.cc index 28086449d6..831b82e8a7 100644 --- a/tests/mpi/p4est_save_04.cc +++ b/tests/mpi/p4est_save_04.cc @@ -18,7 +18,6 @@ // save and load a triangulation with a different number of cpus #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/parallel_partitioner_03.cc b/tests/mpi/parallel_partitioner_03.cc index 96434ada2e..3168955136 100644 --- a/tests/mpi/parallel_partitioner_03.cc +++ b/tests/mpi/parallel_partitioner_03.cc @@ -17,7 +17,6 @@ // let processors write ghost_targets, import_indices, import_targets to file #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/parallel_vtu_01.cc b/tests/mpi/parallel_vtu_01.cc index 0ccaccd92a..b20cfd6bed 100644 --- a/tests/mpi/parallel_vtu_01.cc +++ b/tests/mpi/parallel_vtu_01.cc @@ -19,7 +19,6 @@ // (uses MPI IO) #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/renumber_z_order_01.cc b/tests/mpi/renumber_z_order_01.cc index 79c9ecb28c..1b17a6d58f 100644 --- a/tests/mpi/renumber_z_order_01.cc +++ b/tests/mpi/renumber_z_order_01.cc @@ -22,7 +22,6 @@ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/renumber_z_order_02.cc b/tests/mpi/renumber_z_order_02.cc index dc54c52e8d..8eccad91b7 100644 --- a/tests/mpi/renumber_z_order_02.cc +++ b/tests/mpi/renumber_z_order_02.cc @@ -22,7 +22,6 @@ #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/repartition_01.cc b/tests/mpi/repartition_01.cc index a99a59afaf..cfeccce6f4 100644 --- a/tests/mpi/repartition_01.cc +++ b/tests/mpi/repartition_01.cc @@ -18,7 +18,6 @@ // test manual repartitioning #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/repartition_02.cc b/tests/mpi/repartition_02.cc index 1bd517d0b7..c6080ad656 100644 --- a/tests/mpi/repartition_02.cc +++ b/tests/mpi/repartition_02.cc @@ -18,7 +18,6 @@ // test manual repartitioning and transfering data #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/repartition_03.cc b/tests/mpi/repartition_03.cc index 6f5f944842..528cedef52 100644 --- a/tests/mpi/repartition_03.cc +++ b/tests/mpi/repartition_03.cc @@ -18,7 +18,6 @@ // test that a second call to repartition() doesn't do anything #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/solution_transfer_01.cc b/tests/mpi/solution_transfer_01.cc index 47f31e9c77..f535a92cb9 100644 --- a/tests/mpi/solution_transfer_01.cc +++ b/tests/mpi/solution_transfer_01.cc @@ -19,7 +19,6 @@ // cells. this was fixed with r24007 #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/tria_01.cc b/tests/mpi/tria_01.cc index 0b425ae0f7..6e64bd67fd 100644 --- a/tests/mpi/tria_01.cc +++ b/tests/mpi/tria_01.cc @@ -19,7 +19,6 @@ // begin(i) should work even if we have no cells on that level #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/tria_copy_triangulation.cc b/tests/mpi/tria_copy_triangulation.cc index 4a651c5c2d..a28b7f54cf 100644 --- a/tests/mpi/tria_copy_triangulation.cc +++ b/tests/mpi/tria_copy_triangulation.cc @@ -34,7 +34,6 @@ // compare #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/mpi/trilinos_vector_ghosts_01.cc b/tests/mpi/trilinos_vector_ghosts_01.cc index 7379b599d0..14ccde0e27 100644 --- a/tests/mpi/trilinos_vector_ghosts_01.cc +++ b/tests/mpi/trilinos_vector_ghosts_01.cc @@ -20,7 +20,6 @@ // has_ghost_elements(). this shouldn't happen. #include "../tests.h" -#include "coarse_grid_common.h" #include #include #include diff --git a/tests/tests.h b/tests/tests.h index b0e2207aa0..5886c1d0d6 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -32,6 +32,7 @@ #include #include #include +#include #if defined(DEBUG) && defined(DEAL_II_HAVE_FP_EXCEPTIONS) # include @@ -522,5 +523,38 @@ struct SetGrainSizes DEAL_II_NAMESPACE_CLOSE +/* + * Do not use a template here to work around an overload resolution issue with clang and + * enabled C++11 mode. + * + * - Maier 2013 + */ +LogStream & +operator << (LogStream &out, + const std::vector &v) +{ + for (unsigned int i=0; i &v) +{ + for (unsigned int i=0; i &v) +{ + for (unsigned int i=0; i