From 807b56c5124e2629c3ceeccfa07b9d8b8a8e53fb Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 21 Aug 2013 19:43:05 +0000 Subject: [PATCH] Intermediate git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30382 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/CMakeLists.txt | 28 ++++++++++++++++++- tests/codim_one/CMakeLists.txt | 1 + tests/codim_one/bem.cc | 6 ++-- .../codim_one/{bem/cmp/generic => bem.output} | 0 tests/codim_one/bem_integration.cc | 2 +- .../cmp/generic => bem_integration.output} | 0 tests/codim_one/boundary_indicator_01.cc | 2 +- .../generic => boundary_indicator_01.output} | 0 tests/codim_one/data_out.cc | 6 ++-- .../{data_out/cmp/generic => data_out.output} | 0 tests/codim_one/data_out_02.cc | 4 +-- .../cmp/generic => data_out_02.output} | 0 tests/codim_one/data_out_03.cc | 2 +- .../cmp/generic => data_out_03.output} | 0 tests/codim_one/data_out_03/square.msh | 17 ----------- tests/codim_one/direction_flag_01.cc | 2 +- .../cmp/generic => direction_flag_01.output} | 0 tests/codim_one/direction_flag_02.cc | 2 +- .../cmp/generic => direction_flag_02.output} | 0 tests/codim_one/direction_flag_03.cc | 2 +- .../cmp/generic => direction_flag_03.output} | 0 tests/codim_one/error_estimator_01.cc | 2 +- .../cmp/generic => error_estimator_01.output} | 0 tests/codim_one/extract_boundary_mesh_00.cc | 2 +- ...eneric => extract_boundary_mesh_00.output} | 0 tests/codim_one/extract_boundary_mesh_01.cc | 2 +- ...eneric => extract_boundary_mesh_01.output} | 0 tests/codim_one/extract_boundary_mesh_02.cc | 2 +- ...eneric => extract_boundary_mesh_02.output} | 0 tests/codim_one/extract_boundary_mesh_03.cc | 2 +- ...eneric => extract_boundary_mesh_03.output} | 0 tests/codim_one/extract_boundary_mesh_04.cc | 2 +- ...eneric => extract_boundary_mesh_04.output} | 0 tests/codim_one/extract_boundary_mesh_05.cc | 2 +- ...eneric => extract_boundary_mesh_05.output} | 0 tests/codim_one/extract_boundary_mesh_06.cc | 2 +- ...eneric => extract_boundary_mesh_06.output} | 0 tests/codim_one/extract_boundary_mesh_07.cc | 2 +- ...eneric => extract_boundary_mesh_07.output} | 0 tests/codim_one/fe_dgq_prolongation_01.cc | 2 +- .../generic => fe_dgq_prolongation_01.output} | 0 tests/codim_one/fe_values_extractor_01.cc | 2 +- .../generic => fe_values_extractor_01.output} | 0 .../fe_values_extractor_01/square.msh | 17 ----------- tests/codim_one/gradients.cc | 12 ++++---- .../cmp/generic => gradients.output} | 0 tests/codim_one/gradients_1.cc | 14 +++++----- .../cmp/generic => gradients_1.output} | 0 tests/codim_one/grid_in_out.cc | 8 +++--- .../cmp/generic => grid_in_out.output} | 0 tests/codim_one/grid_in_out_02.cc | 6 ++-- .../cmp/generic => grid_in_out_02.output} | 0 tests/codim_one/grid_in_out_03.cc | 6 ++-- .../cmp/generic => grid_in_out_03.output} | 0 tests/codim_one/grid_refinement.cc | 6 ++-- .../cmp/generic => grid_refinement.output} | 0 .../{data_out_02 => grids}/square.msh | 0 tests/codim_one/hanging_nodes_01.cc | 2 +- .../cmp/generic => hanging_nodes_01.output} | 0 tests/codim_one/hanging_nodes_02.cc | 2 +- .../cmp/generic => hanging_nodes_02.output} | 0 tests/codim_one/hanging_nodes_03.cc | 2 +- .../cmp/generic => hanging_nodes_03.output} | 0 tests/codim_one/integrate_log.cc | 2 +- .../cmp/generic => integrate_log.output} | 0 tests/codim_one/integrate_log_2.cc | 2 +- .../cmp/generic => integrate_log_2.output} | 0 tests/codim_one/integrate_one_over_r.cc | 2 +- .../generic => integrate_one_over_r.output} | 0 .../interpolate_boundary_values_01.cc | 6 ++-- ... => interpolate_boundary_values_01.output} | 0 ...polate_boundary_values_01_vector_valued.cc | 6 ++-- ...e_boundary_values_01_vector_valued.output} | 0 .../interpolate_boundary_values_02.cc | 2 +- ... => interpolate_boundary_values_02.output} | 0 ...polate_boundary_values_02_vector_valued.cc | 2 +- ...e_boundary_values_02_vector_valued.output} | 0 .../interpolate_boundary_values_03.cc | 2 +- ... => interpolate_boundary_values_03.output} | 0 ...erpolate_boundary_values_1d_closed_ring.cc | 2 +- ...ate_boundary_values_1d_closed_ring.output} | 0 tests/codim_one/interpolation.cc | 6 ++-- .../cmp/generic => interpolation.output} | 0 tests/codim_one/interpolation_2.cc | 6 ++-- .../cmp/generic => interpolation_2.output} | 0 tests/codim_one/interpolation_3.cc | 6 ++-- .../cmp/generic => interpolation_3.output} | 0 tests/codim_one/mapping_01.cc | 2 +- .../cmp/generic => mapping_01.output} | 0 tests/codim_one/mapping_02.cc | 2 +- .../cmp/generic => mapping_02.output} | 0 tests/codim_one/mapping_03.cc | 2 +- .../cmp/generic => mapping_03.output} | 0 tests/codim_one/mapping_q1.cc | 8 +++--- .../cmp/generic => mapping_q1.output} | 0 tests/codim_one/mapping_q1_eulerian.cc | 8 +++--- .../generic => mapping_q1_eulerian.output} | 0 tests/codim_one/mapping_q_eulerian.cc | 16 +++++------ .../cmp/generic => mapping_q_eulerian.output} | 0 tests/codim_one/mean_value.cc | 2 +- .../cmp/generic => mean_value.output} | 0 tests/codim_one/mesh_bug.cc | 4 +-- .../{mesh_bug/cmp/generic => mesh_bug.output} | 0 tests/codim_one/normal_vectors_01.cc | 2 +- .../cmp/generic => normal_vectors_01.output} | 0 tests/codim_one/projection.cc | 6 ++-- .../cmp/generic => projection.output} | 0 tests/codim_one/projection_dgp.cc | 6 ++-- .../cmp/generic => projection_dgp.output} | 0 tests/codim_one/renumber_component_wise_01.cc | 6 ++-- ...eric => renumber_component_wise_01.output} | 0 tests/codim_one/solution_transfer_01.cc | 2 +- .../generic => solution_transfer_01.output} | 0 tests/codim_one/surface.cc | 18 ++++++------ .../{surface/cmp/generic => surface.output} | 0 tests/codim_one/tensor_matrix_conversion.cc | 2 +- ...eneric => tensor_matrix_conversion.output} | 0 tests/codim_one/torus_01.cc | 2 +- .../{torus_01/cmp/generic => torus_01.output} | 0 tests/codim_one/transform_01.cc | 2 +- .../cmp/generic => transform_01.output} | 0 121 files changed, 149 insertions(+), 156 deletions(-) create mode 100644 tests/codim_one/CMakeLists.txt rename tests/codim_one/{bem/cmp/generic => bem.output} (100%) rename tests/codim_one/{bem_integration/cmp/generic => bem_integration.output} (100%) rename tests/codim_one/{boundary_indicator_01/cmp/generic => boundary_indicator_01.output} (100%) rename tests/codim_one/{data_out/cmp/generic => data_out.output} (100%) rename tests/codim_one/{data_out_02/cmp/generic => data_out_02.output} (100%) rename tests/codim_one/{data_out_03/cmp/generic => data_out_03.output} (100%) delete mode 100644 tests/codim_one/data_out_03/square.msh rename tests/codim_one/{direction_flag_01/cmp/generic => direction_flag_01.output} (100%) rename tests/codim_one/{direction_flag_02/cmp/generic => direction_flag_02.output} (100%) rename tests/codim_one/{direction_flag_03/cmp/generic => direction_flag_03.output} (100%) rename tests/codim_one/{error_estimator_01/cmp/generic => error_estimator_01.output} (100%) rename tests/codim_one/{extract_boundary_mesh_00/cmp/generic => extract_boundary_mesh_00.output} (100%) rename tests/codim_one/{extract_boundary_mesh_01/cmp/generic => extract_boundary_mesh_01.output} (100%) rename tests/codim_one/{extract_boundary_mesh_02/cmp/generic => extract_boundary_mesh_02.output} (100%) rename tests/codim_one/{extract_boundary_mesh_03/cmp/generic => extract_boundary_mesh_03.output} (100%) rename tests/codim_one/{extract_boundary_mesh_04/cmp/generic => extract_boundary_mesh_04.output} (100%) rename tests/codim_one/{extract_boundary_mesh_05/cmp/generic => extract_boundary_mesh_05.output} (100%) rename tests/codim_one/{extract_boundary_mesh_06/cmp/generic => extract_boundary_mesh_06.output} (100%) rename tests/codim_one/{extract_boundary_mesh_07/cmp/generic => extract_boundary_mesh_07.output} (100%) rename tests/codim_one/{fe_dgq_prolongation_01/cmp/generic => fe_dgq_prolongation_01.output} (100%) rename tests/codim_one/{fe_values_extractor_01/cmp/generic => fe_values_extractor_01.output} (100%) delete mode 100644 tests/codim_one/fe_values_extractor_01/square.msh rename tests/codim_one/{gradients/cmp/generic => gradients.output} (100%) rename tests/codim_one/{gradients_1/cmp/generic => gradients_1.output} (100%) rename tests/codim_one/{grid_in_out/cmp/generic => grid_in_out.output} (100%) rename tests/codim_one/{grid_in_out_02/cmp/generic => grid_in_out_02.output} (100%) rename tests/codim_one/{grid_in_out_03/cmp/generic => grid_in_out_03.output} (100%) rename tests/codim_one/{grid_refinement/cmp/generic => grid_refinement.output} (100%) rename tests/codim_one/{data_out_02 => grids}/square.msh (100%) rename tests/codim_one/{hanging_nodes_01/cmp/generic => hanging_nodes_01.output} (100%) rename tests/codim_one/{hanging_nodes_02/cmp/generic => hanging_nodes_02.output} (100%) rename tests/codim_one/{hanging_nodes_03/cmp/generic => hanging_nodes_03.output} (100%) rename tests/codim_one/{integrate_log/cmp/generic => integrate_log.output} (100%) rename tests/codim_one/{integrate_log_2/cmp/generic => integrate_log_2.output} (100%) rename tests/codim_one/{integrate_one_over_r/cmp/generic => integrate_one_over_r.output} (100%) rename tests/codim_one/{interpolate_boundary_values_01/cmp/generic => interpolate_boundary_values_01.output} (100%) rename tests/codim_one/{interpolate_boundary_values_01_vector_valued/cmp/generic => interpolate_boundary_values_01_vector_valued.output} (100%) rename tests/codim_one/{interpolate_boundary_values_02/cmp/generic => interpolate_boundary_values_02.output} (100%) rename tests/codim_one/{interpolate_boundary_values_02_vector_valued/cmp/generic => interpolate_boundary_values_02_vector_valued.output} (100%) rename tests/codim_one/{interpolate_boundary_values_03/cmp/generic => interpolate_boundary_values_03.output} (100%) rename tests/codim_one/{interpolate_boundary_values_1d_closed_ring/cmp/generic => interpolate_boundary_values_1d_closed_ring.output} (100%) rename tests/codim_one/{interpolation/cmp/generic => interpolation.output} (100%) rename tests/codim_one/{interpolation_2/cmp/generic => interpolation_2.output} (100%) rename tests/codim_one/{interpolation_3/cmp/generic => interpolation_3.output} (100%) rename tests/codim_one/{mapping_01/cmp/generic => mapping_01.output} (100%) rename tests/codim_one/{mapping_02/cmp/generic => mapping_02.output} (100%) rename tests/codim_one/{mapping_03/cmp/generic => mapping_03.output} (100%) rename tests/codim_one/{mapping_q1/cmp/generic => mapping_q1.output} (100%) rename tests/codim_one/{mapping_q1_eulerian/cmp/generic => mapping_q1_eulerian.output} (100%) rename tests/codim_one/{mapping_q_eulerian/cmp/generic => mapping_q_eulerian.output} (100%) rename tests/codim_one/{mean_value/cmp/generic => mean_value.output} (100%) rename tests/codim_one/{mesh_bug/cmp/generic => mesh_bug.output} (100%) rename tests/codim_one/{normal_vectors_01/cmp/generic => normal_vectors_01.output} (100%) rename tests/codim_one/{projection/cmp/generic => projection.output} (100%) rename tests/codim_one/{projection_dgp/cmp/generic => projection_dgp.output} (100%) rename tests/codim_one/{renumber_component_wise_01/cmp/generic => renumber_component_wise_01.output} (100%) rename tests/codim_one/{solution_transfer_01/cmp/generic => solution_transfer_01.output} (100%) rename tests/codim_one/{surface/cmp/generic => surface.output} (100%) rename tests/codim_one/{tensor_matrix_conversion/cmp/generic => tensor_matrix_conversion.output} (100%) rename tests/codim_one/{torus_01/cmp/generic => torus_01.output} (100%) rename tests/codim_one/{transform_01/cmp/generic => transform_01.output} (100%) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2b177334d4..8c5760ddaf 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -64,7 +64,33 @@ SET_IF_EMPTY(DEAL_II_TEST_TIME_LIMIT 120) MESSAGE(STATUS "Proceed to test definitions") + +#a-framework +#all-headers ADD_SUBDIRECTORY(aniso) ADD_SUBDIRECTORY(base) -#ADD_SUBDIRECTORY(bits) +#benchmarks +#bits ADD_SUBDIRECTORY(codim_one) +#deal.II +#distributed_grids +#fail +#fe +#gla +#grid +#hp +#hsl +#integrators +#lac +#lapack +#lib +#matrix_free +#mesh_converter +#metis +#mpi +#multigrid +#petsc +#serialization +#slepc +#trilinos +#umfpack diff --git a/tests/codim_one/CMakeLists.txt b/tests/codim_one/CMakeLists.txt new file mode 100644 index 0000000000..0efb828f2c --- /dev/null +++ b/tests/codim_one/CMakeLists.txt @@ -0,0 +1 @@ +DEAL_II_PICKUP_TESTS() diff --git a/tests/codim_one/bem.cc b/tests/codim_one/bem.cc index bca014b1f2..d020a959b4 100644 --- a/tests/codim_one/bem.cc +++ b/tests/codim_one/bem.cc @@ -53,7 +53,7 @@ #include #include -std::ofstream logfile("bem/output"); +std::ofstream logfile("output"); template class BEM @@ -126,7 +126,7 @@ BEM::run() { - read_grid("grids/circle_R10.inp"); + read_grid("SOURCE_DIR/grids/circle_R10.inp"); Point p; HyperBallBoundary boundary(p,10.); @@ -688,7 +688,7 @@ BEM::solve() // dataout.add_data_vector(smooth_solution, "quadratic_potential"); // dataout.build_patches(fe_q.degree); // char outname[50]; -// sprintf(outname, "bem/bem_gradient.vtk"); +// sprintf(outname, "bem_gradient.vtk"); // std::ofstream file(outname); // dataout.write_vtk(file); // dataout.write_vtk(logfile); diff --git a/tests/codim_one/bem/cmp/generic b/tests/codim_one/bem.output similarity index 100% rename from tests/codim_one/bem/cmp/generic rename to tests/codim_one/bem.output diff --git a/tests/codim_one/bem_integration.cc b/tests/codim_one/bem_integration.cc index e4115f23d3..bc93a9a772 100644 --- a/tests/codim_one/bem_integration.cc +++ b/tests/codim_one/bem_integration.cc @@ -56,7 +56,7 @@ using namespace std; -ofstream logfile("bem_integration/output"); +ofstream logfile("output"); template diff --git a/tests/codim_one/bem_integration/cmp/generic b/tests/codim_one/bem_integration.output similarity index 100% rename from tests/codim_one/bem_integration/cmp/generic rename to tests/codim_one/bem_integration.output diff --git a/tests/codim_one/boundary_indicator_01.cc b/tests/codim_one/boundary_indicator_01.cc index 1d80e3f5d0..5f9d260a38 100644 --- a/tests/codim_one/boundary_indicator_01.cc +++ b/tests/codim_one/boundary_indicator_01.cc @@ -50,7 +50,7 @@ void save_mesh(const Triangulation &tria) int main () { - ofstream logfile("boundary_indicator_01/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/boundary_indicator_01/cmp/generic b/tests/codim_one/boundary_indicator_01.output similarity index 100% rename from tests/codim_one/boundary_indicator_01/cmp/generic rename to tests/codim_one/boundary_indicator_01.output diff --git a/tests/codim_one/data_out.cc b/tests/codim_one/data_out.cc index 4d9a7bfac0..dfb06699cc 100644 --- a/tests/codim_one/data_out.cc +++ b/tests/codim_one/data_out.cc @@ -42,7 +42,7 @@ #include #include -std::ofstream logfile("data_out/output"); +std::ofstream logfile("output"); template @@ -80,10 +80,10 @@ int main () deallog.attach(logfile); deallog.depth_console(0); deallog << "Test<1,2>" << std::endl; - test<1,2>("grids/circle_2.inp"); + test<1,2>("SOURCE_DIR/grids/circle_2.inp"); deallog << "Test<2,3>" << std::endl; - test<2,3>("grids/sphere_2.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_2.inp"); return 0; } diff --git a/tests/codim_one/data_out/cmp/generic b/tests/codim_one/data_out.output similarity index 100% rename from tests/codim_one/data_out/cmp/generic rename to tests/codim_one/data_out.output diff --git a/tests/codim_one/data_out_02.cc b/tests/codim_one/data_out_02.cc index 774efc62a4..8225f5615f 100644 --- a/tests/codim_one/data_out_02.cc +++ b/tests/codim_one/data_out_02.cc @@ -36,7 +36,7 @@ #include #include -std::ofstream logfile("data_out_02/output"); +std::ofstream logfile("output"); int main () @@ -53,7 +53,7 @@ int main () GridIn grid_in; grid_in.attach_triangulation (triangulation); - std::ifstream fname("data_out_02/square.msh"); + std::ifstream fname("square.msh"); grid_in.read_msh (fname); dof_handler.distribute_dofs (fe); diff --git a/tests/codim_one/data_out_02/cmp/generic b/tests/codim_one/data_out_02.output similarity index 100% rename from tests/codim_one/data_out_02/cmp/generic rename to tests/codim_one/data_out_02.output diff --git a/tests/codim_one/data_out_03.cc b/tests/codim_one/data_out_03.cc index e181f9b635..b37193f334 100644 --- a/tests/codim_one/data_out_03.cc +++ b/tests/codim_one/data_out_03.cc @@ -37,7 +37,7 @@ #include #include -std::ofstream logfile("data_out_03/output"); +std::ofstream logfile("output"); template class Identity : public Function diff --git a/tests/codim_one/data_out_03/cmp/generic b/tests/codim_one/data_out_03.output similarity index 100% rename from tests/codim_one/data_out_03/cmp/generic rename to tests/codim_one/data_out_03.output diff --git a/tests/codim_one/data_out_03/square.msh b/tests/codim_one/data_out_03/square.msh deleted file mode 100644 index 997b625492..0000000000 --- a/tests/codim_one/data_out_03/square.msh +++ /dev/null @@ -1,17 +0,0 @@ -$MeshFormat -2.1 0 8 -$EndMeshFormat -$Nodes -4 -1 0 0 0 -2 1 0 0 -3 1 1 0 -4 0 1 0 -$EndNodes -$Elements -4 -1 1 3 0 1 0 1 2 -2 1 3 0 1 0 2 3 -3 1 3 0 1 0 3 4 -4 1 3 0 1 0 4 1 -$EndElements diff --git a/tests/codim_one/direction_flag_01.cc b/tests/codim_one/direction_flag_01.cc index 4aa106ceae..a8e88ebe2c 100644 --- a/tests/codim_one/direction_flag_01.cc +++ b/tests/codim_one/direction_flag_01.cc @@ -64,7 +64,7 @@ void test () int main () { - ofstream logfile("direction_flag_01/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/direction_flag_01/cmp/generic b/tests/codim_one/direction_flag_01.output similarity index 100% rename from tests/codim_one/direction_flag_01/cmp/generic rename to tests/codim_one/direction_flag_01.output diff --git a/tests/codim_one/direction_flag_02.cc b/tests/codim_one/direction_flag_02.cc index 262f6bcd7d..f1274f83fe 100644 --- a/tests/codim_one/direction_flag_02.cc +++ b/tests/codim_one/direction_flag_02.cc @@ -64,7 +64,7 @@ void test () int main () { - ofstream logfile("direction_flag_02/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/direction_flag_02/cmp/generic b/tests/codim_one/direction_flag_02.output similarity index 100% rename from tests/codim_one/direction_flag_02/cmp/generic rename to tests/codim_one/direction_flag_02.output diff --git a/tests/codim_one/direction_flag_03.cc b/tests/codim_one/direction_flag_03.cc index f425bbfd32..9b0c90c3ac 100644 --- a/tests/codim_one/direction_flag_03.cc +++ b/tests/codim_one/direction_flag_03.cc @@ -49,7 +49,7 @@ void test () int main () { - ofstream logfile("direction_flag_03/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/direction_flag_03/cmp/generic b/tests/codim_one/direction_flag_03.output similarity index 100% rename from tests/codim_one/direction_flag_03/cmp/generic rename to tests/codim_one/direction_flag_03.output diff --git a/tests/codim_one/error_estimator_01.cc b/tests/codim_one/error_estimator_01.cc index be7564e7a6..2f64315280 100644 --- a/tests/codim_one/error_estimator_01.cc +++ b/tests/codim_one/error_estimator_01.cc @@ -202,7 +202,7 @@ check () int main () { - std::ofstream logfile ("error_estimator_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (2); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/codim_one/error_estimator_01/cmp/generic b/tests/codim_one/error_estimator_01.output similarity index 100% rename from tests/codim_one/error_estimator_01/cmp/generic rename to tests/codim_one/error_estimator_01.output diff --git a/tests/codim_one/extract_boundary_mesh_00.cc b/tests/codim_one/extract_boundary_mesh_00.cc index 75de68acfa..2aa0bcc0b0 100644 --- a/tests/codim_one/extract_boundary_mesh_00.cc +++ b/tests/codim_one/extract_boundary_mesh_00.cc @@ -90,7 +90,7 @@ void save_mesh(const Triangulation &tria) int main () { - ofstream logfile("extract_boundary_mesh_00/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/extract_boundary_mesh_00/cmp/generic b/tests/codim_one/extract_boundary_mesh_00.output similarity index 100% rename from tests/codim_one/extract_boundary_mesh_00/cmp/generic rename to tests/codim_one/extract_boundary_mesh_00.output diff --git a/tests/codim_one/extract_boundary_mesh_01.cc b/tests/codim_one/extract_boundary_mesh_01.cc index 729a35cc8d..a4c0fbb345 100644 --- a/tests/codim_one/extract_boundary_mesh_01.cc +++ b/tests/codim_one/extract_boundary_mesh_01.cc @@ -95,7 +95,7 @@ void save_mesh(const Triangulation &tria) int main () { - ofstream logfile("extract_boundary_mesh_01/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/extract_boundary_mesh_01/cmp/generic b/tests/codim_one/extract_boundary_mesh_01.output similarity index 100% rename from tests/codim_one/extract_boundary_mesh_01/cmp/generic rename to tests/codim_one/extract_boundary_mesh_01.output diff --git a/tests/codim_one/extract_boundary_mesh_02.cc b/tests/codim_one/extract_boundary_mesh_02.cc index 949b40c708..573a45066d 100644 --- a/tests/codim_one/extract_boundary_mesh_02.cc +++ b/tests/codim_one/extract_boundary_mesh_02.cc @@ -82,7 +82,7 @@ void save_mesh(const Triangulation &tria) int main () { - ofstream logfile("extract_boundary_mesh_02/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/extract_boundary_mesh_02/cmp/generic b/tests/codim_one/extract_boundary_mesh_02.output similarity index 100% rename from tests/codim_one/extract_boundary_mesh_02/cmp/generic rename to tests/codim_one/extract_boundary_mesh_02.output diff --git a/tests/codim_one/extract_boundary_mesh_03.cc b/tests/codim_one/extract_boundary_mesh_03.cc index f0976c9384..b820cb4391 100644 --- a/tests/codim_one/extract_boundary_mesh_03.cc +++ b/tests/codim_one/extract_boundary_mesh_03.cc @@ -90,7 +90,7 @@ void save_mesh(const Triangulation &tria) int main () { - ofstream logfile("extract_boundary_mesh_03/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/extract_boundary_mesh_03/cmp/generic b/tests/codim_one/extract_boundary_mesh_03.output similarity index 100% rename from tests/codim_one/extract_boundary_mesh_03/cmp/generic rename to tests/codim_one/extract_boundary_mesh_03.output diff --git a/tests/codim_one/extract_boundary_mesh_04.cc b/tests/codim_one/extract_boundary_mesh_04.cc index 8b388a94d0..942651a808 100644 --- a/tests/codim_one/extract_boundary_mesh_04.cc +++ b/tests/codim_one/extract_boundary_mesh_04.cc @@ -90,7 +90,7 @@ void save_mesh(const Triangulation &tria) int main () { - ofstream logfile("extract_boundary_mesh_04/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/extract_boundary_mesh_04/cmp/generic b/tests/codim_one/extract_boundary_mesh_04.output similarity index 100% rename from tests/codim_one/extract_boundary_mesh_04/cmp/generic rename to tests/codim_one/extract_boundary_mesh_04.output diff --git a/tests/codim_one/extract_boundary_mesh_05.cc b/tests/codim_one/extract_boundary_mesh_05.cc index c8bfbc29cc..5fe9a377fb 100644 --- a/tests/codim_one/extract_boundary_mesh_05.cc +++ b/tests/codim_one/extract_boundary_mesh_05.cc @@ -73,7 +73,7 @@ void test () int main () { - ofstream logfile("extract_boundary_mesh_05/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/extract_boundary_mesh_05/cmp/generic b/tests/codim_one/extract_boundary_mesh_05.output similarity index 100% rename from tests/codim_one/extract_boundary_mesh_05/cmp/generic rename to tests/codim_one/extract_boundary_mesh_05.output diff --git a/tests/codim_one/extract_boundary_mesh_06.cc b/tests/codim_one/extract_boundary_mesh_06.cc index f00bb4c90c..aa1d178592 100644 --- a/tests/codim_one/extract_boundary_mesh_06.cc +++ b/tests/codim_one/extract_boundary_mesh_06.cc @@ -61,7 +61,7 @@ void test () int main () { - ofstream logfile("extract_boundary_mesh_06/output"); + ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/extract_boundary_mesh_06/cmp/generic b/tests/codim_one/extract_boundary_mesh_06.output similarity index 100% rename from tests/codim_one/extract_boundary_mesh_06/cmp/generic rename to tests/codim_one/extract_boundary_mesh_06.output diff --git a/tests/codim_one/extract_boundary_mesh_07.cc b/tests/codim_one/extract_boundary_mesh_07.cc index c92143821c..e52ae55475 100644 --- a/tests/codim_one/extract_boundary_mesh_07.cc +++ b/tests/codim_one/extract_boundary_mesh_07.cc @@ -108,7 +108,7 @@ namespace Step38 int main () { - std::ofstream logfile("extract_boundary_mesh_07/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/extract_boundary_mesh_07/cmp/generic b/tests/codim_one/extract_boundary_mesh_07.output similarity index 100% rename from tests/codim_one/extract_boundary_mesh_07/cmp/generic rename to tests/codim_one/extract_boundary_mesh_07.output diff --git a/tests/codim_one/fe_dgq_prolongation_01.cc b/tests/codim_one/fe_dgq_prolongation_01.cc index 401306b56d..63499e7ba6 100644 --- a/tests/codim_one/fe_dgq_prolongation_01.cc +++ b/tests/codim_one/fe_dgq_prolongation_01.cc @@ -29,7 +29,7 @@ using namespace dealii; int main () { - std::ofstream logfile("fe_dgq_prolongation_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/fe_dgq_prolongation_01/cmp/generic b/tests/codim_one/fe_dgq_prolongation_01.output similarity index 100% rename from tests/codim_one/fe_dgq_prolongation_01/cmp/generic rename to tests/codim_one/fe_dgq_prolongation_01.output diff --git a/tests/codim_one/fe_values_extractor_01.cc b/tests/codim_one/fe_values_extractor_01.cc index 79ba606be3..f8fe854ac7 100644 --- a/tests/codim_one/fe_values_extractor_01.cc +++ b/tests/codim_one/fe_values_extractor_01.cc @@ -39,7 +39,7 @@ #include #include -std::ofstream logfile("fe_values_extractor_01/output"); +std::ofstream logfile("output"); int main () diff --git a/tests/codim_one/fe_values_extractor_01/cmp/generic b/tests/codim_one/fe_values_extractor_01.output similarity index 100% rename from tests/codim_one/fe_values_extractor_01/cmp/generic rename to tests/codim_one/fe_values_extractor_01.output diff --git a/tests/codim_one/fe_values_extractor_01/square.msh b/tests/codim_one/fe_values_extractor_01/square.msh deleted file mode 100644 index 997b625492..0000000000 --- a/tests/codim_one/fe_values_extractor_01/square.msh +++ /dev/null @@ -1,17 +0,0 @@ -$MeshFormat -2.1 0 8 -$EndMeshFormat -$Nodes -4 -1 0 0 0 -2 1 0 0 -3 1 1 0 -4 0 1 0 -$EndNodes -$Elements -4 -1 1 3 0 1 0 1 2 -2 1 3 0 1 0 2 3 -3 1 3 0 1 0 3 4 -4 1 3 0 1 0 4 1 -$EndElements diff --git a/tests/codim_one/gradients.cc b/tests/codim_one/gradients.cc index 02120ab21c..8d100fdd68 100644 --- a/tests/codim_one/gradients.cc +++ b/tests/codim_one/gradients.cc @@ -50,7 +50,7 @@ -std::ofstream logfile("gradients/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -206,16 +206,16 @@ int main () deallog.threshold_double(1.e-12); deallog<<"Test <1,2>"<("grids/circle_4.inp"); + test<1,2>("SOURCE_DIR/grids/circle_4.inp"); deallog<"<("grids/sphere_1.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); -// test<2,3>("grids/sphere_2.inp"); -// test<2,3>("grids/sphere_3.inp"); -// test<2,3>("grids/sphere_4.inp"); +// test<2,3>("SOURCE_DIR/grids/sphere_2.inp"); +// test<2,3>("SOURCE_DIR/grids/sphere_3.inp"); +// test<2,3>("SOURCE_DIR/grids/sphere_4.inp"); return 0; } diff --git a/tests/codim_one/gradients/cmp/generic b/tests/codim_one/gradients.output similarity index 100% rename from tests/codim_one/gradients/cmp/generic rename to tests/codim_one/gradients.output diff --git a/tests/codim_one/gradients_1.cc b/tests/codim_one/gradients_1.cc index 036af20898..231c383d5c 100644 --- a/tests/codim_one/gradients_1.cc +++ b/tests/codim_one/gradients_1.cc @@ -50,7 +50,7 @@ -std::ofstream logfile("gradients_1/output"); +std::ofstream logfile("output"); template void test(std::string filename, unsigned int degree = 1) @@ -122,16 +122,16 @@ int main () deallog.threshold_double(1.e-12); deallog<<"Test <1,2>, Q1, Q2, Q3"<("grids/circle_4.inp",1); - test<1,2>("grids/circle_4.inp",2); - test<1,2>("grids/circle_4.inp",3); + test<1,2>("SOURCE_DIR/grids/circle_4.inp",1); + test<1,2>("SOURCE_DIR/grids/circle_4.inp",2); + test<1,2>("SOURCE_DIR/grids/circle_4.inp",3); deallog<, Q1, Q2, Q3"<("grids/sphere_1.inp",1); - test<2,3>("grids/sphere_1.inp",2); - test<2,3>("grids/sphere_1.inp",3); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp",1); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp",2); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp",3); return 0; diff --git a/tests/codim_one/gradients_1/cmp/generic b/tests/codim_one/gradients_1.output similarity index 100% rename from tests/codim_one/gradients_1/cmp/generic rename to tests/codim_one/gradients_1.output diff --git a/tests/codim_one/grid_in_out.cc b/tests/codim_one/grid_in_out.cc index 62121a8fe0..0692fc2d21 100644 --- a/tests/codim_one/grid_in_out.cc +++ b/tests/codim_one/grid_in_out.cc @@ -27,7 +27,7 @@ #include -std::ofstream logfile("grid_in_out/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -49,9 +49,9 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<1,2>("grids/circle_1.inp"); - test<2,3>("grids/square.inp"); - test<2,3>("grids/sphere_1.inp"); + test<1,2>("SOURCE_DIR/grids/circle_1.inp"); + test<2,3>("SOURCE_DIR/grids/square.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/grid_in_out/cmp/generic b/tests/codim_one/grid_in_out.output similarity index 100% rename from tests/codim_one/grid_in_out/cmp/generic rename to tests/codim_one/grid_in_out.output diff --git a/tests/codim_one/grid_in_out_02.cc b/tests/codim_one/grid_in_out_02.cc index 8b7bec2183..95bd20e56b 100644 --- a/tests/codim_one/grid_in_out_02.cc +++ b/tests/codim_one/grid_in_out_02.cc @@ -27,7 +27,7 @@ #include -std::ofstream logfile("grid_in_out_02/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -47,8 +47,8 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<2,3>("grids/square.inp"); - test<2,3>("grids/sphere_1.inp"); + test<2,3>("SOURCE_DIR/grids/square.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/grid_in_out_02/cmp/generic b/tests/codim_one/grid_in_out_02.output similarity index 100% rename from tests/codim_one/grid_in_out_02/cmp/generic rename to tests/codim_one/grid_in_out_02.output diff --git a/tests/codim_one/grid_in_out_03.cc b/tests/codim_one/grid_in_out_03.cc index 1ad1b0df50..ef8bb1f354 100644 --- a/tests/codim_one/grid_in_out_03.cc +++ b/tests/codim_one/grid_in_out_03.cc @@ -29,7 +29,7 @@ #include -std::ofstream logfile("grid_in_out_03/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -62,8 +62,8 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<2,3>("grids/square.inp"); - test<2,3>("grids/sphere_1.inp"); + test<2,3>("SOURCE_DIR/grids/square.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/grid_in_out_03/cmp/generic b/tests/codim_one/grid_in_out_03.output similarity index 100% rename from tests/codim_one/grid_in_out_03/cmp/generic rename to tests/codim_one/grid_in_out_03.output diff --git a/tests/codim_one/grid_refinement.cc b/tests/codim_one/grid_refinement.cc index 98040bd278..19b1db0f20 100644 --- a/tests/codim_one/grid_refinement.cc +++ b/tests/codim_one/grid_refinement.cc @@ -32,7 +32,7 @@ #include #include -std::ofstream logfile("grid_refinement/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -60,10 +60,10 @@ int main () deallog.depth_console(0); deallog << "Test<1,2>" << std::endl; - test<1,2>("grids/circle_1.inp"); + test<1,2>("SOURCE_DIR/grids/circle_1.inp"); deallog << std::endl << "Test<1,2>" << std::endl; - test<2,3>("grids/sphere_1.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/grid_refinement/cmp/generic b/tests/codim_one/grid_refinement.output similarity index 100% rename from tests/codim_one/grid_refinement/cmp/generic rename to tests/codim_one/grid_refinement.output diff --git a/tests/codim_one/data_out_02/square.msh b/tests/codim_one/grids/square.msh similarity index 100% rename from tests/codim_one/data_out_02/square.msh rename to tests/codim_one/grids/square.msh diff --git a/tests/codim_one/hanging_nodes_01.cc b/tests/codim_one/hanging_nodes_01.cc index 760ba462af..3bae622e1f 100644 --- a/tests/codim_one/hanging_nodes_01.cc +++ b/tests/codim_one/hanging_nodes_01.cc @@ -36,7 +36,7 @@ int main () { - std::ofstream logfile("hanging_nodes_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/hanging_nodes_01/cmp/generic b/tests/codim_one/hanging_nodes_01.output similarity index 100% rename from tests/codim_one/hanging_nodes_01/cmp/generic rename to tests/codim_one/hanging_nodes_01.output diff --git a/tests/codim_one/hanging_nodes_02.cc b/tests/codim_one/hanging_nodes_02.cc index 43f970b961..77024f9eee 100644 --- a/tests/codim_one/hanging_nodes_02.cc +++ b/tests/codim_one/hanging_nodes_02.cc @@ -36,7 +36,7 @@ int main () { - std::ofstream logfile("hanging_nodes_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/hanging_nodes_02/cmp/generic b/tests/codim_one/hanging_nodes_02.output similarity index 100% rename from tests/codim_one/hanging_nodes_02/cmp/generic rename to tests/codim_one/hanging_nodes_02.output diff --git a/tests/codim_one/hanging_nodes_03.cc b/tests/codim_one/hanging_nodes_03.cc index 6d43395194..8038dfa5a5 100644 --- a/tests/codim_one/hanging_nodes_03.cc +++ b/tests/codim_one/hanging_nodes_03.cc @@ -30,7 +30,7 @@ int main () { - std::ofstream logfile("hanging_nodes_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/hanging_nodes_03/cmp/generic b/tests/codim_one/hanging_nodes_03.output similarity index 100% rename from tests/codim_one/hanging_nodes_03/cmp/generic rename to tests/codim_one/hanging_nodes_03.output diff --git a/tests/codim_one/integrate_log.cc b/tests/codim_one/integrate_log.cc index 30efcc0055..65b2d632a6 100644 --- a/tests/codim_one/integrate_log.cc +++ b/tests/codim_one/integrate_log.cc @@ -45,7 +45,7 @@ #include -std::ofstream logfile("integrate_log/output"); +std::ofstream logfile("output"); double test(const unsigned int n, const unsigned int exponent, diff --git a/tests/codim_one/integrate_log/cmp/generic b/tests/codim_one/integrate_log.output similarity index 100% rename from tests/codim_one/integrate_log/cmp/generic rename to tests/codim_one/integrate_log.output diff --git a/tests/codim_one/integrate_log_2.cc b/tests/codim_one/integrate_log_2.cc index a73133bc71..eee9e8e3f3 100644 --- a/tests/codim_one/integrate_log_2.cc +++ b/tests/codim_one/integrate_log_2.cc @@ -46,7 +46,7 @@ using namespace std; -std::ofstream logfile("integrate_log_2/output"); +std::ofstream logfile("output"); // Returns the following integral: /int_0^1 x^N * ln(|x-point|/alpha) dx diff --git a/tests/codim_one/integrate_log_2/cmp/generic b/tests/codim_one/integrate_log_2.output similarity index 100% rename from tests/codim_one/integrate_log_2/cmp/generic rename to tests/codim_one/integrate_log_2.output diff --git a/tests/codim_one/integrate_one_over_r.cc b/tests/codim_one/integrate_one_over_r.cc index 4b94c9eca7..216994f3a3 100644 --- a/tests/codim_one/integrate_one_over_r.cc +++ b/tests/codim_one/integrate_one_over_r.cc @@ -41,7 +41,7 @@ double exact_integral_one_over_r(const unsigned int i, const unsigned int j, const unsigned int vertex_index); -ofstream logfile("integrate_one_over_r/output"); +ofstream logfile("output"); int main() { diff --git a/tests/codim_one/integrate_one_over_r/cmp/generic b/tests/codim_one/integrate_one_over_r.output similarity index 100% rename from tests/codim_one/integrate_one_over_r/cmp/generic rename to tests/codim_one/integrate_one_over_r.output diff --git a/tests/codim_one/interpolate_boundary_values_01.cc b/tests/codim_one/interpolate_boundary_values_01.cc index b690cdc703..9cee218c7f 100644 --- a/tests/codim_one/interpolate_boundary_values_01.cc +++ b/tests/codim_one/interpolate_boundary_values_01.cc @@ -30,7 +30,7 @@ #include -std::ofstream logfile("interpolate_boundary_values_01/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -85,8 +85,8 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<2,3>("grids/square.inp"); - test<2,3>("grids/sphere_1.inp"); + test<2,3>("SOURCE_DIR/grids/square.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/interpolate_boundary_values_01/cmp/generic b/tests/codim_one/interpolate_boundary_values_01.output similarity index 100% rename from tests/codim_one/interpolate_boundary_values_01/cmp/generic rename to tests/codim_one/interpolate_boundary_values_01.output diff --git a/tests/codim_one/interpolate_boundary_values_01_vector_valued.cc b/tests/codim_one/interpolate_boundary_values_01_vector_valued.cc index c19723bb79..2fe3f145d6 100644 --- a/tests/codim_one/interpolate_boundary_values_01_vector_valued.cc +++ b/tests/codim_one/interpolate_boundary_values_01_vector_valued.cc @@ -32,7 +32,7 @@ #include -std::ofstream logfile("interpolate_boundary_values_01_vector_valued/output"); +std::ofstream logfile("output"); template class X : public Function @@ -101,8 +101,8 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<2,3>("grids/square.inp"); - test<2,3>("grids/sphere_1.inp"); + test<2,3>("SOURCE_DIR/grids/square.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/interpolate_boundary_values_01_vector_valued/cmp/generic b/tests/codim_one/interpolate_boundary_values_01_vector_valued.output similarity index 100% rename from tests/codim_one/interpolate_boundary_values_01_vector_valued/cmp/generic rename to tests/codim_one/interpolate_boundary_values_01_vector_valued.output diff --git a/tests/codim_one/interpolate_boundary_values_02.cc b/tests/codim_one/interpolate_boundary_values_02.cc index bb4e12b701..e0a37ee245 100644 --- a/tests/codim_one/interpolate_boundary_values_02.cc +++ b/tests/codim_one/interpolate_boundary_values_02.cc @@ -31,7 +31,7 @@ #include -std::ofstream logfile("interpolate_boundary_values_02/output"); +std::ofstream logfile("output"); void test() { diff --git a/tests/codim_one/interpolate_boundary_values_02/cmp/generic b/tests/codim_one/interpolate_boundary_values_02.output similarity index 100% rename from tests/codim_one/interpolate_boundary_values_02/cmp/generic rename to tests/codim_one/interpolate_boundary_values_02.output diff --git a/tests/codim_one/interpolate_boundary_values_02_vector_valued.cc b/tests/codim_one/interpolate_boundary_values_02_vector_valued.cc index 62db68b2b3..f0694d6114 100644 --- a/tests/codim_one/interpolate_boundary_values_02_vector_valued.cc +++ b/tests/codim_one/interpolate_boundary_values_02_vector_valued.cc @@ -32,7 +32,7 @@ #include -std::ofstream logfile("interpolate_boundary_values_02_vector_valued/output"); +std::ofstream logfile("output"); template class X : public Function diff --git a/tests/codim_one/interpolate_boundary_values_02_vector_valued/cmp/generic b/tests/codim_one/interpolate_boundary_values_02_vector_valued.output similarity index 100% rename from tests/codim_one/interpolate_boundary_values_02_vector_valued/cmp/generic rename to tests/codim_one/interpolate_boundary_values_02_vector_valued.output diff --git a/tests/codim_one/interpolate_boundary_values_03.cc b/tests/codim_one/interpolate_boundary_values_03.cc index a396de8c9d..c6d9d08f6c 100644 --- a/tests/codim_one/interpolate_boundary_values_03.cc +++ b/tests/codim_one/interpolate_boundary_values_03.cc @@ -32,7 +32,7 @@ #include -std::ofstream logfile("interpolate_boundary_values_03/output"); +std::ofstream logfile("output"); void test() { diff --git a/tests/codim_one/interpolate_boundary_values_03/cmp/generic b/tests/codim_one/interpolate_boundary_values_03.output similarity index 100% rename from tests/codim_one/interpolate_boundary_values_03/cmp/generic rename to tests/codim_one/interpolate_boundary_values_03.output diff --git a/tests/codim_one/interpolate_boundary_values_1d_closed_ring.cc b/tests/codim_one/interpolate_boundary_values_1d_closed_ring.cc index 303cacb9fe..44be1491aa 100644 --- a/tests/codim_one/interpolate_boundary_values_1d_closed_ring.cc +++ b/tests/codim_one/interpolate_boundary_values_1d_closed_ring.cc @@ -41,7 +41,7 @@ using namespace dealii; -std::ofstream logfile("interpolate_boundary_values_1d_closed_ring/output"); +std::ofstream logfile("output"); void test() { diff --git a/tests/codim_one/interpolate_boundary_values_1d_closed_ring/cmp/generic b/tests/codim_one/interpolate_boundary_values_1d_closed_ring.output similarity index 100% rename from tests/codim_one/interpolate_boundary_values_1d_closed_ring/cmp/generic rename to tests/codim_one/interpolate_boundary_values_1d_closed_ring.output diff --git a/tests/codim_one/interpolation.cc b/tests/codim_one/interpolation.cc index 294b7bbb28..c90f446b46 100644 --- a/tests/codim_one/interpolation.cc +++ b/tests/codim_one/interpolation.cc @@ -42,7 +42,7 @@ #include #include -std::ofstream logfile("interpolation/output"); +std::ofstream logfile("output"); template @@ -89,10 +89,10 @@ int main () for (unsigned int n=1; n<8; ++n) { deallog << "Test<1,2>, finite element q_" << n << std::endl; - test<1,2>("grids/circle_2.inp",n); + test<1,2>("SOURCE_DIR/grids/circle_2.inp",n); deallog << "Test<1,2>, finite element q_" << n << std::endl; - test<2,3>("grids/sphere_2.inp",n); + test<2,3>("SOURCE_DIR/grids/sphere_2.inp",n); } return 0; } diff --git a/tests/codim_one/interpolation/cmp/generic b/tests/codim_one/interpolation.output similarity index 100% rename from tests/codim_one/interpolation/cmp/generic rename to tests/codim_one/interpolation.output diff --git a/tests/codim_one/interpolation_2.cc b/tests/codim_one/interpolation_2.cc index 0196eee1b1..b227a49484 100644 --- a/tests/codim_one/interpolation_2.cc +++ b/tests/codim_one/interpolation_2.cc @@ -43,7 +43,7 @@ #include -std::ofstream logfile("interpolation_2/output"); +std::ofstream logfile("output"); template @@ -84,10 +84,10 @@ int main () deallog.depth_console(0); deallog << "Test<1,2>" << std::endl; - test<1,2>("grids/circle_2.inp"); + test<1,2>("SOURCE_DIR/grids/circle_2.inp"); deallog << "Test<1,2>" << std::endl; - test<2,3>("grids/sphere_2.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_2.inp"); return 0; } diff --git a/tests/codim_one/interpolation_2/cmp/generic b/tests/codim_one/interpolation_2.output similarity index 100% rename from tests/codim_one/interpolation_2/cmp/generic rename to tests/codim_one/interpolation_2.output diff --git a/tests/codim_one/interpolation_3.cc b/tests/codim_one/interpolation_3.cc index fbf6d8541f..bdda97549f 100644 --- a/tests/codim_one/interpolation_3.cc +++ b/tests/codim_one/interpolation_3.cc @@ -44,7 +44,7 @@ #include -std::ofstream logfile("interpolation_3/output"); +std::ofstream logfile("output"); // Test interpolation on system of finite elements. @@ -93,10 +93,10 @@ int main () deallog.depth_console(0); deallog << "Test<1,2>" << std::endl; - test<1,2>("grids/circle_2.inp"); + test<1,2>("SOURCE_DIR/grids/circle_2.inp"); deallog << "Test<1,2>" << std::endl; - test<2,3>("grids/sphere_2.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_2.inp"); return 0; } diff --git a/tests/codim_one/interpolation_3/cmp/generic b/tests/codim_one/interpolation_3.output similarity index 100% rename from tests/codim_one/interpolation_3/cmp/generic rename to tests/codim_one/interpolation_3.output diff --git a/tests/codim_one/mapping_01.cc b/tests/codim_one/mapping_01.cc index b6b285a43c..fd527e3d1b 100644 --- a/tests/codim_one/mapping_01.cc +++ b/tests/codim_one/mapping_01.cc @@ -76,7 +76,7 @@ void test () int main () { - std::ofstream logfile("mapping_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/mapping_01/cmp/generic b/tests/codim_one/mapping_01.output similarity index 100% rename from tests/codim_one/mapping_01/cmp/generic rename to tests/codim_one/mapping_01.output diff --git a/tests/codim_one/mapping_02.cc b/tests/codim_one/mapping_02.cc index 134fbfd0d9..0849d7b8af 100644 --- a/tests/codim_one/mapping_02.cc +++ b/tests/codim_one/mapping_02.cc @@ -73,7 +73,7 @@ void test () int main () { - std::ofstream logfile("mapping_02/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/mapping_02/cmp/generic b/tests/codim_one/mapping_02.output similarity index 100% rename from tests/codim_one/mapping_02/cmp/generic rename to tests/codim_one/mapping_02.output diff --git a/tests/codim_one/mapping_03.cc b/tests/codim_one/mapping_03.cc index 99dd87f139..7d63f54852 100644 --- a/tests/codim_one/mapping_03.cc +++ b/tests/codim_one/mapping_03.cc @@ -60,7 +60,7 @@ void test (unsigned int degree) int main () { - std::ofstream logfile("mapping_03/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/mapping_03/cmp/generic b/tests/codim_one/mapping_03.output similarity index 100% rename from tests/codim_one/mapping_03/cmp/generic rename to tests/codim_one/mapping_03.output diff --git a/tests/codim_one/mapping_q1.cc b/tests/codim_one/mapping_q1.cc index aea9d7fc58..1c050a374c 100644 --- a/tests/codim_one/mapping_q1.cc +++ b/tests/codim_one/mapping_q1.cc @@ -34,7 +34,7 @@ #include #include -std::ofstream logfile("mapping_q1/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -78,9 +78,9 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<1,2>("grids/circle_1.inp"); - test<2,3>("grids/square.inp"); - test<2,3>("grids/sphere_1.inp"); + test<1,2>("SOURCE_DIR/grids/circle_1.inp"); + test<2,3>("SOURCE_DIR/grids/square.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/mapping_q1/cmp/generic b/tests/codim_one/mapping_q1.output similarity index 100% rename from tests/codim_one/mapping_q1/cmp/generic rename to tests/codim_one/mapping_q1.output diff --git a/tests/codim_one/mapping_q1_eulerian.cc b/tests/codim_one/mapping_q1_eulerian.cc index 4885107dec..cf8c616de0 100644 --- a/tests/codim_one/mapping_q1_eulerian.cc +++ b/tests/codim_one/mapping_q1_eulerian.cc @@ -37,7 +37,7 @@ #include #include -std::ofstream logfile("mapping_q1_eulerian/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -91,9 +91,9 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<1,2>("grids/circle_1.inp"); - test<2,3>("grids/square.inp"); - test<2,3>("grids/sphere_1.inp"); + test<1,2>("SOURCE_DIR/grids/circle_1.inp"); + test<2,3>("SOURCE_DIR/grids/square.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/mapping_q1_eulerian/cmp/generic b/tests/codim_one/mapping_q1_eulerian.output similarity index 100% rename from tests/codim_one/mapping_q1_eulerian/cmp/generic rename to tests/codim_one/mapping_q1_eulerian.output diff --git a/tests/codim_one/mapping_q_eulerian.cc b/tests/codim_one/mapping_q_eulerian.cc index 7ba13b321f..0a7df86893 100644 --- a/tests/codim_one/mapping_q_eulerian.cc +++ b/tests/codim_one/mapping_q_eulerian.cc @@ -37,7 +37,7 @@ #include #include -std::ofstream logfile("mapping_q_eulerian/output"); +std::ofstream logfile("output"); template void test(std::string filename, unsigned int degree) @@ -92,13 +92,13 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<1,2>("grids/circle_1.inp",1); - test<1,2>("grids/circle_1.inp",2); - test<2,3>("grids/square.inp",1); - test<2,3>("grids/square.inp",2); - test<2,3>("grids/sphere_1.inp",1); -// test<2,3>("grids/problem.inp",1); - test<2,3>("grids/sphere_1.inp",2); + test<1,2>("SOURCE_DIR/grids/circle_1.inp",1); + test<1,2>("SOURCE_DIR/grids/circle_1.inp",2); + test<2,3>("SOURCE_DIR/grids/square.inp",1); + test<2,3>("SOURCE_DIR/grids/square.inp",2); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp",1); +// test<2,3>("SOURCE_DIR/grids/problem.inp",1); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp",2); return 0; } diff --git a/tests/codim_one/mapping_q_eulerian/cmp/generic b/tests/codim_one/mapping_q_eulerian.output similarity index 100% rename from tests/codim_one/mapping_q_eulerian/cmp/generic rename to tests/codim_one/mapping_q_eulerian.output diff --git a/tests/codim_one/mean_value.cc b/tests/codim_one/mean_value.cc index e4e4d4fda2..0d0903a4ef 100644 --- a/tests/codim_one/mean_value.cc +++ b/tests/codim_one/mean_value.cc @@ -42,7 +42,7 @@ #include -std::ofstream logfile("mean_value/output"); +std::ofstream logfile("output"); template diff --git a/tests/codim_one/mean_value/cmp/generic b/tests/codim_one/mean_value.output similarity index 100% rename from tests/codim_one/mean_value/cmp/generic rename to tests/codim_one/mean_value.output diff --git a/tests/codim_one/mesh_bug.cc b/tests/codim_one/mesh_bug.cc index bae554ba33..7f8704108f 100644 --- a/tests/codim_one/mesh_bug.cc +++ b/tests/codim_one/mesh_bug.cc @@ -36,12 +36,12 @@ int main () { - std::ofstream logfile("mesh_bug/output"); + std::ofstream logfile("output"); Triangulation<2,3> tria; GridIn<2,3> gi; gi.attach_triangulation(tria); - std::ifstream infile("mesh_bug/cmp/generic"); + std::ifstream infile("cmp/generic"); gi.read(infile); const std::vector > &vertices = tria.get_vertices(); diff --git a/tests/codim_one/mesh_bug/cmp/generic b/tests/codim_one/mesh_bug.output similarity index 100% rename from tests/codim_one/mesh_bug/cmp/generic rename to tests/codim_one/mesh_bug.output diff --git a/tests/codim_one/normal_vectors_01.cc b/tests/codim_one/normal_vectors_01.cc index 84c825f708..d772846f1b 100644 --- a/tests/codim_one/normal_vectors_01.cc +++ b/tests/codim_one/normal_vectors_01.cc @@ -76,7 +76,7 @@ void test () int main () { - std::ofstream logfile("normal_vectors_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/normal_vectors_01/cmp/generic b/tests/codim_one/normal_vectors_01.output similarity index 100% rename from tests/codim_one/normal_vectors_01/cmp/generic rename to tests/codim_one/normal_vectors_01.output diff --git a/tests/codim_one/projection.cc b/tests/codim_one/projection.cc index 55809696ac..1f76b0c4f8 100644 --- a/tests/codim_one/projection.cc +++ b/tests/codim_one/projection.cc @@ -46,7 +46,7 @@ #include -std::ofstream logfile("projection/output"); +std::ofstream logfile("output"); template @@ -93,10 +93,10 @@ int main () for (unsigned int n=1; n<5; n++) { deallog << "Test<1,2>, continous finite element q_" << n << std::endl; - test<1,2>("grids/circle_2.inp",n); + test<1,2>("SOURCE_DIR/grids/circle_2.inp",n); deallog << "Test<2,3>, continous finite element q_" << n << std::endl; - test<2,3>("grids/sphere_2.inp",n); + test<2,3>("SOURCE_DIR/grids/sphere_2.inp",n); } return 0; } diff --git a/tests/codim_one/projection/cmp/generic b/tests/codim_one/projection.output similarity index 100% rename from tests/codim_one/projection/cmp/generic rename to tests/codim_one/projection.output diff --git a/tests/codim_one/projection_dgp.cc b/tests/codim_one/projection_dgp.cc index 1335827792..7e5c353e99 100644 --- a/tests/codim_one/projection_dgp.cc +++ b/tests/codim_one/projection_dgp.cc @@ -47,7 +47,7 @@ #include -std::ofstream logfile("projection_dgp/output"); +std::ofstream logfile("output"); template @@ -94,10 +94,10 @@ int main () for (unsigned int n=1; n<5; n++) { deallog << "Test<1,2>, continous finite element q_" << n << std::endl; - test<1,2>("grids/circle_2.inp",n); + test<1,2>("SOURCE_DIR/grids/circle_2.inp",n); deallog << "Test<2,3>, continous finite element q_" << n << std::endl; - test<2,3>("grids/sphere_2.inp",n); + test<2,3>("SOURCE_DIR/grids/sphere_2.inp",n); } return 0; } diff --git a/tests/codim_one/projection_dgp/cmp/generic b/tests/codim_one/projection_dgp.output similarity index 100% rename from tests/codim_one/projection_dgp/cmp/generic rename to tests/codim_one/projection_dgp.output diff --git a/tests/codim_one/renumber_component_wise_01.cc b/tests/codim_one/renumber_component_wise_01.cc index 33fd91d69f..eb932e0710 100644 --- a/tests/codim_one/renumber_component_wise_01.cc +++ b/tests/codim_one/renumber_component_wise_01.cc @@ -32,7 +32,7 @@ #include -std::ofstream logfile("renumber_component_wise_01/output"); +std::ofstream logfile("output"); template void test(std::string filename) @@ -71,8 +71,8 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - test<2,3>("grids/square.inp"); - test<2,3>("grids/sphere_1.inp"); + test<2,3>("SOURCE_DIR/grids/square.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); return 0; } diff --git a/tests/codim_one/renumber_component_wise_01/cmp/generic b/tests/codim_one/renumber_component_wise_01.output similarity index 100% rename from tests/codim_one/renumber_component_wise_01/cmp/generic rename to tests/codim_one/renumber_component_wise_01.output diff --git a/tests/codim_one/solution_transfer_01.cc b/tests/codim_one/solution_transfer_01.cc index 8d22812b9b..5d58c3b915 100644 --- a/tests/codim_one/solution_transfer_01.cc +++ b/tests/codim_one/solution_transfer_01.cc @@ -51,7 +51,7 @@ using namespace dealii; int main () { - std::ofstream logfile("solution_transfer_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/solution_transfer_01/cmp/generic b/tests/codim_one/solution_transfer_01.output similarity index 100% rename from tests/codim_one/solution_transfer_01/cmp/generic rename to tests/codim_one/solution_transfer_01.output diff --git a/tests/codim_one/surface.cc b/tests/codim_one/surface.cc index 4e9cf1937b..e04e303557 100644 --- a/tests/codim_one/surface.cc +++ b/tests/codim_one/surface.cc @@ -38,7 +38,7 @@ #include #include -std::ofstream logfile("surface/output"); +std::ofstream logfile("output"); // Computes the area and the outer normals of circles and spheres // which are more and more refined, and prints the error on the @@ -105,16 +105,16 @@ int main () deallog.depth_console(0); deallog<<"Test <1,2>"<("grids/circle_1.inp"); - test<1,2>("grids/circle_2.inp"); - test<1,2>("grids/circle_3.inp"); - test<1,2>("grids/circle_4.inp"); + test<1,2>("SOURCE_DIR/grids/circle_1.inp"); + test<1,2>("SOURCE_DIR/grids/circle_2.inp"); + test<1,2>("SOURCE_DIR/grids/circle_3.inp"); + test<1,2>("SOURCE_DIR/grids/circle_4.inp"); deallog<<"Test <2,3>"<("grids/sphere_1.inp"); - test<2,3>("grids/sphere_2.inp"); - test<2,3>("grids/sphere_3.inp"); - test<2,3>("grids/sphere_4.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_1.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_2.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_3.inp"); + test<2,3>("SOURCE_DIR/grids/sphere_4.inp"); return 0; } diff --git a/tests/codim_one/surface/cmp/generic b/tests/codim_one/surface.output similarity index 100% rename from tests/codim_one/surface/cmp/generic rename to tests/codim_one/surface.output diff --git a/tests/codim_one/tensor_matrix_conversion.cc b/tests/codim_one/tensor_matrix_conversion.cc index ab0139188c..d4b9c30e26 100644 --- a/tests/codim_one/tensor_matrix_conversion.cc +++ b/tests/codim_one/tensor_matrix_conversion.cc @@ -27,7 +27,7 @@ #include #include -std::ofstream logfile("tensor_matrix_conversion/output"); +std::ofstream logfile("output"); template diff --git a/tests/codim_one/tensor_matrix_conversion/cmp/generic b/tests/codim_one/tensor_matrix_conversion.output similarity index 100% rename from tests/codim_one/tensor_matrix_conversion/cmp/generic rename to tests/codim_one/tensor_matrix_conversion.output diff --git a/tests/codim_one/torus_01.cc b/tests/codim_one/torus_01.cc index f49cc86677..af63da020b 100644 --- a/tests/codim_one/torus_01.cc +++ b/tests/codim_one/torus_01.cc @@ -32,7 +32,7 @@ #include #include -std::ofstream logfile("torus_01/output"); +std::ofstream logfile("output"); int main () diff --git a/tests/codim_one/torus_01/cmp/generic b/tests/codim_one/torus_01.output similarity index 100% rename from tests/codim_one/torus_01/cmp/generic rename to tests/codim_one/torus_01.output diff --git a/tests/codim_one/transform_01.cc b/tests/codim_one/transform_01.cc index 8e35edfed5..afaab6487f 100644 --- a/tests/codim_one/transform_01.cc +++ b/tests/codim_one/transform_01.cc @@ -54,7 +54,7 @@ void save_mesh(const Triangulation &tria) int main () { - std::ofstream logfile("transform_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/codim_one/transform_01/cmp/generic b/tests/codim_one/transform_01.output similarity index 100% rename from tests/codim_one/transform_01/cmp/generic rename to tests/codim_one/transform_01.output -- 2.39.5