From ff9190ddc91318af35060145441594c3ec2f6f6c Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Mon, 26 Aug 2013 00:38:43 +0000 Subject: [PATCH] Convert matrix_free tests to ctest. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30488 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/CMakeLists.txt | 2 +- tests/matrix_free/CMakeLists.txt | 1 + tests/matrix_free/compress_constraints.cc | 2 +- .../cmp/generic => compress_constraints.output} | 0 tests/matrix_free/compress_mapping.cc | 2 +- .../{compress_mapping/cmp/generic => compress_mapping.output} | 0 tests/matrix_free/copy.cc | 2 +- tests/matrix_free/{copy/cmp/generic => copy.output} | 0 tests/matrix_free/estimate_condition_number_mass.cc | 2 +- .../cmp/generic => estimate_condition_number_mass.output} | 0 tests/matrix_free/get_functions_cartesian.cc | 2 +- .../cmp/generic => get_functions_cartesian.output} | 0 tests/matrix_free/get_functions_circle.cc | 2 +- .../cmp/generic => get_functions_circle.output} | 0 tests/matrix_free/get_functions_constraints.cc | 2 +- .../cmp/generic => get_functions_constraints.output} | 0 tests/matrix_free/get_functions_float.cc | 2 +- .../cmp/generic => get_functions_float.output} | 0 tests/matrix_free/get_functions_gl.cc | 2 +- .../{get_functions_gl/cmp/generic => get_functions_gl.output} | 0 tests/matrix_free/get_functions_mappingq.cc | 2 +- .../cmp/generic => get_functions_mappingq.output} | 0 tests/matrix_free/get_functions_multife.cc | 2 +- .../cmp/generic => get_functions_multife.output} | 0 tests/matrix_free/get_functions_multife2.cc | 2 +- .../cmp/generic => get_functions_multife2.output} | 0 tests/matrix_free/get_functions_q_hierarchical.cc | 2 +- .../cmp/generic => get_functions_q_hierarchical.output} | 0 tests/matrix_free/get_functions_rect.cc | 2 +- .../cmp/generic => get_functions_rect.output} | 0 tests/matrix_free/get_functions_variants.cc | 2 +- .../cmp/generic => get_functions_variants.output} | 0 tests/matrix_free/get_values_plain.cc | 2 +- .../{get_values_plain/cmp/generic => get_values_plain.output} | 0 tests/matrix_free/integrate_functions.cc | 2 +- .../cmp/generic => integrate_functions.output} | 0 tests/matrix_free/integrate_functions_multife.cc | 2 +- .../cmp/generic => integrate_functions_multife.output} | 0 tests/matrix_free/integrate_functions_multife2.cc | 2 +- .../cmp/generic => integrate_functions_multife2.output} | 0 tests/matrix_free/matrix_vector_01.cc | 2 +- .../{matrix_vector_01/cmp/generic => matrix_vector_01.output} | 0 tests/matrix_free/matrix_vector_02.cc | 2 +- .../{matrix_vector_02/cmp/generic => matrix_vector_02.output} | 0 tests/matrix_free/matrix_vector_03.cc | 2 +- .../{matrix_vector_03/cmp/generic => matrix_vector_03.output} | 0 tests/matrix_free/matrix_vector_04.cc | 2 +- .../{matrix_vector_04/cmp/generic => matrix_vector_04.output} | 0 tests/matrix_free/matrix_vector_05.cc | 2 +- .../{matrix_vector_05/cmp/generic => matrix_vector_05.output} | 0 tests/matrix_free/matrix_vector_06.cc | 2 +- .../{matrix_vector_06/cmp/generic => matrix_vector_06.output} | 0 tests/matrix_free/matrix_vector_07.cc | 2 +- .../{matrix_vector_07/cmp/generic => matrix_vector_07.output} | 0 tests/matrix_free/matrix_vector_08.cc | 2 +- .../{matrix_vector_08/cmp/generic => matrix_vector_08.output} | 0 tests/matrix_free/matrix_vector_09.cc | 2 +- .../{matrix_vector_09/cmp/generic => matrix_vector_09.output} | 0 tests/matrix_free/matrix_vector_curl.cc | 2 +- .../cmp/generic => matrix_vector_curl.output} | 0 tests/matrix_free/matrix_vector_div.cc | 2 +- .../{matrix_vector_div/cmp/generic => matrix_vector_div.output} | 0 tests/matrix_free/matrix_vector_float.cc | 2 +- .../cmp/generic => matrix_vector_float.output} | 0 tests/matrix_free/matrix_vector_hp.cc | 2 +- .../{matrix_vector_hp/cmp/generic => matrix_vector_hp.output} | 0 tests/matrix_free/matrix_vector_mg.cc | 2 +- .../{matrix_vector_mg/cmp/generic => matrix_vector_mg.output} | 0 tests/matrix_free/matrix_vector_stokes.cc | 2 +- .../cmp/generic => matrix_vector_stokes.output} | 0 tests/matrix_free/matrix_vector_stokes_noflux.cc | 2 +- .../cmp/generic => matrix_vector_stokes_noflux.output} | 0 tests/matrix_free/no_index_initialize.cc | 2 +- .../cmp/generic => no_index_initialize.output} | 0 tests/matrix_free/quadrature_points.cc | 2 +- .../{quadrature_points/cmp/generic => quadrature_points.output} | 0 tests/matrix_free/step-37.cc | 2 +- tests/matrix_free/{step-37/cmp/generic => step-37.output} | 0 tests/matrix_free/thread_correctness.cc | 2 +- .../cmp/generic => thread_correctness.output} | 0 tests/matrix_free/thread_correctness_hp.cc | 2 +- .../cmp/generic => thread_correctness_hp.output} | 0 tests/matrix_free/update_mapping_only.cc | 2 +- .../cmp/generic => update_mapping_only.output} | 0 84 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 tests/matrix_free/CMakeLists.txt rename tests/matrix_free/{compress_constraints/cmp/generic => compress_constraints.output} (100%) rename tests/matrix_free/{compress_mapping/cmp/generic => compress_mapping.output} (100%) rename tests/matrix_free/{copy/cmp/generic => copy.output} (100%) rename tests/matrix_free/{estimate_condition_number_mass/cmp/generic => estimate_condition_number_mass.output} (100%) rename tests/matrix_free/{get_functions_cartesian/cmp/generic => get_functions_cartesian.output} (100%) rename tests/matrix_free/{get_functions_circle/cmp/generic => get_functions_circle.output} (100%) rename tests/matrix_free/{get_functions_constraints/cmp/generic => get_functions_constraints.output} (100%) rename tests/matrix_free/{get_functions_float/cmp/generic => get_functions_float.output} (100%) rename tests/matrix_free/{get_functions_gl/cmp/generic => get_functions_gl.output} (100%) rename tests/matrix_free/{get_functions_mappingq/cmp/generic => get_functions_mappingq.output} (100%) rename tests/matrix_free/{get_functions_multife/cmp/generic => get_functions_multife.output} (100%) rename tests/matrix_free/{get_functions_multife2/cmp/generic => get_functions_multife2.output} (100%) rename tests/matrix_free/{get_functions_q_hierarchical/cmp/generic => get_functions_q_hierarchical.output} (100%) rename tests/matrix_free/{get_functions_rect/cmp/generic => get_functions_rect.output} (100%) rename tests/matrix_free/{get_functions_variants/cmp/generic => get_functions_variants.output} (100%) rename tests/matrix_free/{get_values_plain/cmp/generic => get_values_plain.output} (100%) rename tests/matrix_free/{integrate_functions/cmp/generic => integrate_functions.output} (100%) rename tests/matrix_free/{integrate_functions_multife/cmp/generic => integrate_functions_multife.output} (100%) rename tests/matrix_free/{integrate_functions_multife2/cmp/generic => integrate_functions_multife2.output} (100%) rename tests/matrix_free/{matrix_vector_01/cmp/generic => matrix_vector_01.output} (100%) rename tests/matrix_free/{matrix_vector_02/cmp/generic => matrix_vector_02.output} (100%) rename tests/matrix_free/{matrix_vector_03/cmp/generic => matrix_vector_03.output} (100%) rename tests/matrix_free/{matrix_vector_04/cmp/generic => matrix_vector_04.output} (100%) rename tests/matrix_free/{matrix_vector_05/cmp/generic => matrix_vector_05.output} (100%) rename tests/matrix_free/{matrix_vector_06/cmp/generic => matrix_vector_06.output} (100%) rename tests/matrix_free/{matrix_vector_07/cmp/generic => matrix_vector_07.output} (100%) rename tests/matrix_free/{matrix_vector_08/cmp/generic => matrix_vector_08.output} (100%) rename tests/matrix_free/{matrix_vector_09/cmp/generic => matrix_vector_09.output} (100%) rename tests/matrix_free/{matrix_vector_curl/cmp/generic => matrix_vector_curl.output} (100%) rename tests/matrix_free/{matrix_vector_div/cmp/generic => matrix_vector_div.output} (100%) rename tests/matrix_free/{matrix_vector_float/cmp/generic => matrix_vector_float.output} (100%) rename tests/matrix_free/{matrix_vector_hp/cmp/generic => matrix_vector_hp.output} (100%) rename tests/matrix_free/{matrix_vector_mg/cmp/generic => matrix_vector_mg.output} (100%) rename tests/matrix_free/{matrix_vector_stokes/cmp/generic => matrix_vector_stokes.output} (100%) rename tests/matrix_free/{matrix_vector_stokes_noflux/cmp/generic => matrix_vector_stokes_noflux.output} (100%) rename tests/matrix_free/{no_index_initialize/cmp/generic => no_index_initialize.output} (100%) rename tests/matrix_free/{quadrature_points/cmp/generic => quadrature_points.output} (100%) rename tests/matrix_free/{step-37/cmp/generic => step-37.output} (100%) rename tests/matrix_free/{thread_correctness/cmp/generic => thread_correctness.output} (100%) rename tests/matrix_free/{thread_correctness_hp/cmp/generic => thread_correctness_hp.output} (100%) rename tests/matrix_free/{update_mapping_only/cmp/generic => update_mapping_only.output} (100%) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9cc1d9adc4..9c0fa43da7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -87,7 +87,7 @@ ADD_SUBDIRECTORY(grid) #integrators ADD_SUBDIRECTORY(lac) #lib -#matrix_free +ADD_SUBDIRECTORY(matrix_free) #mesh_converter ADD_SUBDIRECTORY(multigrid) #serialization diff --git a/tests/matrix_free/CMakeLists.txt b/tests/matrix_free/CMakeLists.txt new file mode 100644 index 0000000000..0efb828f2c --- /dev/null +++ b/tests/matrix_free/CMakeLists.txt @@ -0,0 +1 @@ +DEAL_II_PICKUP_TESTS() diff --git a/tests/matrix_free/compress_constraints.cc b/tests/matrix_free/compress_constraints.cc index d7bd3a8b7f..1e1e340289 100644 --- a/tests/matrix_free/compress_constraints.cc +++ b/tests/matrix_free/compress_constraints.cc @@ -34,7 +34,7 @@ #include "create_mesh.h" -std::ofstream logfile("compress_constraints/output"); +std::ofstream logfile("output"); diff --git a/tests/matrix_free/compress_constraints/cmp/generic b/tests/matrix_free/compress_constraints.output similarity index 100% rename from tests/matrix_free/compress_constraints/cmp/generic rename to tests/matrix_free/compress_constraints.output diff --git a/tests/matrix_free/compress_mapping.cc b/tests/matrix_free/compress_mapping.cc index 9ee1f2d55b..f63235672a 100644 --- a/tests/matrix_free/compress_mapping.cc +++ b/tests/matrix_free/compress_mapping.cc @@ -34,7 +34,7 @@ #include "create_mesh.h" -std::ofstream logfile("compress_mapping/output"); +std::ofstream logfile("output"); diff --git a/tests/matrix_free/compress_mapping/cmp/generic b/tests/matrix_free/compress_mapping.output similarity index 100% rename from tests/matrix_free/compress_mapping/cmp/generic rename to tests/matrix_free/compress_mapping.output diff --git a/tests/matrix_free/copy.cc b/tests/matrix_free/copy.cc index af56180cae..071959c83d 100644 --- a/tests/matrix_free/copy.cc +++ b/tests/matrix_free/copy.cc @@ -23,7 +23,7 @@ #include "../tests.h" #include -std::ofstream logfile("copy/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/copy/cmp/generic b/tests/matrix_free/copy.output similarity index 100% rename from tests/matrix_free/copy/cmp/generic rename to tests/matrix_free/copy.output diff --git a/tests/matrix_free/estimate_condition_number_mass.cc b/tests/matrix_free/estimate_condition_number_mass.cc index a3e4d6d830..1b1ba19203 100644 --- a/tests/matrix_free/estimate_condition_number_mass.cc +++ b/tests/matrix_free/estimate_condition_number_mass.cc @@ -22,7 +22,7 @@ #include "../tests.h" -std::ofstream logfile("estimate_condition_number_mass/output"); +std::ofstream logfile("output"); #include #include diff --git a/tests/matrix_free/estimate_condition_number_mass/cmp/generic b/tests/matrix_free/estimate_condition_number_mass.output similarity index 100% rename from tests/matrix_free/estimate_condition_number_mass/cmp/generic rename to tests/matrix_free/estimate_condition_number_mass.output diff --git a/tests/matrix_free/get_functions_cartesian.cc b/tests/matrix_free/get_functions_cartesian.cc index c4d84e1564..ed4609af74 100644 --- a/tests/matrix_free/get_functions_cartesian.cc +++ b/tests/matrix_free/get_functions_cartesian.cc @@ -25,7 +25,7 @@ #include "../tests.h" -std::ofstream logfile("get_functions_cartesian/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/get_functions_cartesian/cmp/generic b/tests/matrix_free/get_functions_cartesian.output similarity index 100% rename from tests/matrix_free/get_functions_cartesian/cmp/generic rename to tests/matrix_free/get_functions_cartesian.output diff --git a/tests/matrix_free/get_functions_circle.cc b/tests/matrix_free/get_functions_circle.cc index 5a920a7c9e..eab595cb6f 100644 --- a/tests/matrix_free/get_functions_circle.cc +++ b/tests/matrix_free/get_functions_circle.cc @@ -24,7 +24,7 @@ #include "../tests.h" -std::ofstream logfile("get_functions_circle/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/get_functions_circle/cmp/generic b/tests/matrix_free/get_functions_circle.output similarity index 100% rename from tests/matrix_free/get_functions_circle/cmp/generic rename to tests/matrix_free/get_functions_circle.output diff --git a/tests/matrix_free/get_functions_constraints.cc b/tests/matrix_free/get_functions_constraints.cc index a79080e18b..288b2f91d1 100644 --- a/tests/matrix_free/get_functions_constraints.cc +++ b/tests/matrix_free/get_functions_constraints.cc @@ -22,7 +22,7 @@ #include "../tests.h" -std::ofstream logfile("get_functions_constraints/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/get_functions_constraints/cmp/generic b/tests/matrix_free/get_functions_constraints.output similarity index 100% rename from tests/matrix_free/get_functions_constraints/cmp/generic rename to tests/matrix_free/get_functions_constraints.output diff --git a/tests/matrix_free/get_functions_float.cc b/tests/matrix_free/get_functions_float.cc index 93f665ba45..f3806c55c3 100644 --- a/tests/matrix_free/get_functions_float.cc +++ b/tests/matrix_free/get_functions_float.cc @@ -25,7 +25,7 @@ #include #include "create_mesh.h" -std::ofstream logfile("get_functions_float/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/get_functions_float/cmp/generic b/tests/matrix_free/get_functions_float.output similarity index 100% rename from tests/matrix_free/get_functions_float/cmp/generic rename to tests/matrix_free/get_functions_float.output diff --git a/tests/matrix_free/get_functions_gl.cc b/tests/matrix_free/get_functions_gl.cc index fa524669f9..a5b2dd1b90 100644 --- a/tests/matrix_free/get_functions_gl.cc +++ b/tests/matrix_free/get_functions_gl.cc @@ -25,7 +25,7 @@ #include "../tests.h" -std::ofstream logfile("get_functions_gl/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/get_functions_gl/cmp/generic b/tests/matrix_free/get_functions_gl.output similarity index 100% rename from tests/matrix_free/get_functions_gl/cmp/generic rename to tests/matrix_free/get_functions_gl.output diff --git a/tests/matrix_free/get_functions_mappingq.cc b/tests/matrix_free/get_functions_mappingq.cc index f9c6a015b1..866eea77c3 100644 --- a/tests/matrix_free/get_functions_mappingq.cc +++ b/tests/matrix_free/get_functions_mappingq.cc @@ -24,7 +24,7 @@ #include "../tests.h" -std::ofstream logfile("get_functions_mappingq/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/get_functions_mappingq/cmp/generic b/tests/matrix_free/get_functions_mappingq.output similarity index 100% rename from tests/matrix_free/get_functions_mappingq/cmp/generic rename to tests/matrix_free/get_functions_mappingq.output diff --git a/tests/matrix_free/get_functions_multife.cc b/tests/matrix_free/get_functions_multife.cc index cdd15fa7c7..5dec4bd27e 100644 --- a/tests/matrix_free/get_functions_multife.cc +++ b/tests/matrix_free/get_functions_multife.cc @@ -42,7 +42,7 @@ #include -std::ofstream logfile("get_functions_multife/output"); +std::ofstream logfile("output"); template diff --git a/tests/matrix_free/get_functions_multife/cmp/generic b/tests/matrix_free/get_functions_multife.output similarity index 100% rename from tests/matrix_free/get_functions_multife/cmp/generic rename to tests/matrix_free/get_functions_multife.output diff --git a/tests/matrix_free/get_functions_multife2.cc b/tests/matrix_free/get_functions_multife2.cc index b2beb0a550..328ae91880 100644 --- a/tests/matrix_free/get_functions_multife2.cc +++ b/tests/matrix_free/get_functions_multife2.cc @@ -44,7 +44,7 @@ #include -std::ofstream logfile("get_functions_multife2/output"); +std::ofstream logfile("output"); template diff --git a/tests/matrix_free/get_functions_multife2/cmp/generic b/tests/matrix_free/get_functions_multife2.output similarity index 100% rename from tests/matrix_free/get_functions_multife2/cmp/generic rename to tests/matrix_free/get_functions_multife2.output diff --git a/tests/matrix_free/get_functions_q_hierarchical.cc b/tests/matrix_free/get_functions_q_hierarchical.cc index 0eb6128e1b..01601f2944 100644 --- a/tests/matrix_free/get_functions_q_hierarchical.cc +++ b/tests/matrix_free/get_functions_q_hierarchical.cc @@ -27,7 +27,7 @@ #include #include -std::ofstream logfile("get_functions_q_hierarchical/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/get_functions_q_hierarchical/cmp/generic b/tests/matrix_free/get_functions_q_hierarchical.output similarity index 100% rename from tests/matrix_free/get_functions_q_hierarchical/cmp/generic rename to tests/matrix_free/get_functions_q_hierarchical.output diff --git a/tests/matrix_free/get_functions_rect.cc b/tests/matrix_free/get_functions_rect.cc index fa960c5f19..881125ad79 100644 --- a/tests/matrix_free/get_functions_rect.cc +++ b/tests/matrix_free/get_functions_rect.cc @@ -25,7 +25,7 @@ #include "../tests.h" -std::ofstream logfile("get_functions_rect/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/get_functions_rect/cmp/generic b/tests/matrix_free/get_functions_rect.output similarity index 100% rename from tests/matrix_free/get_functions_rect/cmp/generic rename to tests/matrix_free/get_functions_rect.output diff --git a/tests/matrix_free/get_functions_variants.cc b/tests/matrix_free/get_functions_variants.cc index b3156eb72d..6bd47df328 100644 --- a/tests/matrix_free/get_functions_variants.cc +++ b/tests/matrix_free/get_functions_variants.cc @@ -41,7 +41,7 @@ #include #include -std::ofstream logfile("get_functions_variants/output"); +std::ofstream logfile("output"); template diff --git a/tests/matrix_free/get_functions_variants/cmp/generic b/tests/matrix_free/get_functions_variants.output similarity index 100% rename from tests/matrix_free/get_functions_variants/cmp/generic rename to tests/matrix_free/get_functions_variants.output diff --git a/tests/matrix_free/get_values_plain.cc b/tests/matrix_free/get_values_plain.cc index 854aab5984..378006b9e1 100644 --- a/tests/matrix_free/get_values_plain.cc +++ b/tests/matrix_free/get_values_plain.cc @@ -42,7 +42,7 @@ #include #include -std::ofstream logfile("get_values_plain/output"); +std::ofstream logfile("output"); template diff --git a/tests/matrix_free/get_values_plain/cmp/generic b/tests/matrix_free/get_values_plain.output similarity index 100% rename from tests/matrix_free/get_values_plain/cmp/generic rename to tests/matrix_free/get_values_plain.output diff --git a/tests/matrix_free/integrate_functions.cc b/tests/matrix_free/integrate_functions.cc index 201a2e2939..313a249d87 100644 --- a/tests/matrix_free/integrate_functions.cc +++ b/tests/matrix_free/integrate_functions.cc @@ -40,7 +40,7 @@ #include -std::ofstream logfile("integrate_functions/output"); +std::ofstream logfile("output"); template diff --git a/tests/matrix_free/integrate_functions/cmp/generic b/tests/matrix_free/integrate_functions.output similarity index 100% rename from tests/matrix_free/integrate_functions/cmp/generic rename to tests/matrix_free/integrate_functions.output diff --git a/tests/matrix_free/integrate_functions_multife.cc b/tests/matrix_free/integrate_functions_multife.cc index 3a1a8844ed..2f3f7fe0bb 100644 --- a/tests/matrix_free/integrate_functions_multife.cc +++ b/tests/matrix_free/integrate_functions_multife.cc @@ -41,7 +41,7 @@ #include -std::ofstream logfile("integrate_functions_multife/output"); +std::ofstream logfile("output"); template diff --git a/tests/matrix_free/integrate_functions_multife/cmp/generic b/tests/matrix_free/integrate_functions_multife.output similarity index 100% rename from tests/matrix_free/integrate_functions_multife/cmp/generic rename to tests/matrix_free/integrate_functions_multife.output diff --git a/tests/matrix_free/integrate_functions_multife2.cc b/tests/matrix_free/integrate_functions_multife2.cc index 9fbf6c09e9..2cff7afd65 100644 --- a/tests/matrix_free/integrate_functions_multife2.cc +++ b/tests/matrix_free/integrate_functions_multife2.cc @@ -44,7 +44,7 @@ #include -std::ofstream logfile("integrate_functions_multife2/output"); +std::ofstream logfile("output"); template diff --git a/tests/matrix_free/integrate_functions_multife2/cmp/generic b/tests/matrix_free/integrate_functions_multife2.output similarity index 100% rename from tests/matrix_free/integrate_functions_multife2/cmp/generic rename to tests/matrix_free/integrate_functions_multife2.output diff --git a/tests/matrix_free/matrix_vector_01.cc b/tests/matrix_free/matrix_vector_01.cc index 683dc944a4..e7349b8e32 100644 --- a/tests/matrix_free/matrix_vector_01.cc +++ b/tests/matrix_free/matrix_vector_01.cc @@ -23,7 +23,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_01/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_01/cmp/generic b/tests/matrix_free/matrix_vector_01.output similarity index 100% rename from tests/matrix_free/matrix_vector_01/cmp/generic rename to tests/matrix_free/matrix_vector_01.output diff --git a/tests/matrix_free/matrix_vector_02.cc b/tests/matrix_free/matrix_vector_02.cc index 8736bfed7a..19aa558b7d 100644 --- a/tests/matrix_free/matrix_vector_02.cc +++ b/tests/matrix_free/matrix_vector_02.cc @@ -24,7 +24,7 @@ #include "../tests.h" #include -std::ofstream logfile("matrix_vector_02/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_02/cmp/generic b/tests/matrix_free/matrix_vector_02.output similarity index 100% rename from tests/matrix_free/matrix_vector_02/cmp/generic rename to tests/matrix_free/matrix_vector_02.output diff --git a/tests/matrix_free/matrix_vector_03.cc b/tests/matrix_free/matrix_vector_03.cc index 917e9f3682..e1d75e105c 100644 --- a/tests/matrix_free/matrix_vector_03.cc +++ b/tests/matrix_free/matrix_vector_03.cc @@ -24,7 +24,7 @@ #include "../tests.h" #include -std::ofstream logfile("matrix_vector_03/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_03/cmp/generic b/tests/matrix_free/matrix_vector_03.output similarity index 100% rename from tests/matrix_free/matrix_vector_03/cmp/generic rename to tests/matrix_free/matrix_vector_03.output diff --git a/tests/matrix_free/matrix_vector_04.cc b/tests/matrix_free/matrix_vector_04.cc index 8e3a341231..36b71b3aaa 100644 --- a/tests/matrix_free/matrix_vector_04.cc +++ b/tests/matrix_free/matrix_vector_04.cc @@ -23,7 +23,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_04/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_04/cmp/generic b/tests/matrix_free/matrix_vector_04.output similarity index 100% rename from tests/matrix_free/matrix_vector_04/cmp/generic rename to tests/matrix_free/matrix_vector_04.output diff --git a/tests/matrix_free/matrix_vector_05.cc b/tests/matrix_free/matrix_vector_05.cc index ca6858c290..534ae4949d 100644 --- a/tests/matrix_free/matrix_vector_05.cc +++ b/tests/matrix_free/matrix_vector_05.cc @@ -23,7 +23,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_05/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_05/cmp/generic b/tests/matrix_free/matrix_vector_05.output similarity index 100% rename from tests/matrix_free/matrix_vector_05/cmp/generic rename to tests/matrix_free/matrix_vector_05.output diff --git a/tests/matrix_free/matrix_vector_06.cc b/tests/matrix_free/matrix_vector_06.cc index 94895391f9..8b35cdad86 100644 --- a/tests/matrix_free/matrix_vector_06.cc +++ b/tests/matrix_free/matrix_vector_06.cc @@ -26,7 +26,7 @@ #include #include "create_mesh.h" -std::ofstream logfile("matrix_vector_06/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_06/cmp/generic b/tests/matrix_free/matrix_vector_06.output similarity index 100% rename from tests/matrix_free/matrix_vector_06/cmp/generic rename to tests/matrix_free/matrix_vector_06.output diff --git a/tests/matrix_free/matrix_vector_07.cc b/tests/matrix_free/matrix_vector_07.cc index 13f2ca60de..663b35ff98 100644 --- a/tests/matrix_free/matrix_vector_07.cc +++ b/tests/matrix_free/matrix_vector_07.cc @@ -28,7 +28,7 @@ #include #include -std::ofstream logfile("matrix_vector_07/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_07/cmp/generic b/tests/matrix_free/matrix_vector_07.output similarity index 100% rename from tests/matrix_free/matrix_vector_07/cmp/generic rename to tests/matrix_free/matrix_vector_07.output diff --git a/tests/matrix_free/matrix_vector_08.cc b/tests/matrix_free/matrix_vector_08.cc index 875ea18a57..6411e2f6a0 100644 --- a/tests/matrix_free/matrix_vector_08.cc +++ b/tests/matrix_free/matrix_vector_08.cc @@ -24,7 +24,7 @@ #include #include "create_mesh.h" -std::ofstream logfile("matrix_vector_08/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_08/cmp/generic b/tests/matrix_free/matrix_vector_08.output similarity index 100% rename from tests/matrix_free/matrix_vector_08/cmp/generic rename to tests/matrix_free/matrix_vector_08.output diff --git a/tests/matrix_free/matrix_vector_09.cc b/tests/matrix_free/matrix_vector_09.cc index 814fdf7d7e..6db2ebe73b 100644 --- a/tests/matrix_free/matrix_vector_09.cc +++ b/tests/matrix_free/matrix_vector_09.cc @@ -24,7 +24,7 @@ #include #include "create_mesh.h" -std::ofstream logfile("matrix_vector_09/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_09/cmp/generic b/tests/matrix_free/matrix_vector_09.output similarity index 100% rename from tests/matrix_free/matrix_vector_09/cmp/generic rename to tests/matrix_free/matrix_vector_09.output diff --git a/tests/matrix_free/matrix_vector_curl.cc b/tests/matrix_free/matrix_vector_curl.cc index b6092e2e77..2993a1f2ba 100644 --- a/tests/matrix_free/matrix_vector_curl.cc +++ b/tests/matrix_free/matrix_vector_curl.cc @@ -24,7 +24,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_curl/output"); +std::ofstream logfile("output"); #include #include diff --git a/tests/matrix_free/matrix_vector_curl/cmp/generic b/tests/matrix_free/matrix_vector_curl.output similarity index 100% rename from tests/matrix_free/matrix_vector_curl/cmp/generic rename to tests/matrix_free/matrix_vector_curl.output diff --git a/tests/matrix_free/matrix_vector_div.cc b/tests/matrix_free/matrix_vector_div.cc index d52e114535..875638b89e 100644 --- a/tests/matrix_free/matrix_vector_div.cc +++ b/tests/matrix_free/matrix_vector_div.cc @@ -24,7 +24,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_div/output"); +std::ofstream logfile("output"); #include #include diff --git a/tests/matrix_free/matrix_vector_div/cmp/generic b/tests/matrix_free/matrix_vector_div.output similarity index 100% rename from tests/matrix_free/matrix_vector_div/cmp/generic rename to tests/matrix_free/matrix_vector_div.output diff --git a/tests/matrix_free/matrix_vector_float.cc b/tests/matrix_free/matrix_vector_float.cc index c5f48154f8..303fc04895 100644 --- a/tests/matrix_free/matrix_vector_float.cc +++ b/tests/matrix_free/matrix_vector_float.cc @@ -23,7 +23,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_float/output"); +std::ofstream logfile("output"); #include "create_mesh.h" #include "matrix_vector_common.h" diff --git a/tests/matrix_free/matrix_vector_float/cmp/generic b/tests/matrix_free/matrix_vector_float.output similarity index 100% rename from tests/matrix_free/matrix_vector_float/cmp/generic rename to tests/matrix_free/matrix_vector_float.output diff --git a/tests/matrix_free/matrix_vector_hp.cc b/tests/matrix_free/matrix_vector_hp.cc index ff8b43fa51..bf092966ea 100644 --- a/tests/matrix_free/matrix_vector_hp.cc +++ b/tests/matrix_free/matrix_vector_hp.cc @@ -23,7 +23,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_hp/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" #include diff --git a/tests/matrix_free/matrix_vector_hp/cmp/generic b/tests/matrix_free/matrix_vector_hp.output similarity index 100% rename from tests/matrix_free/matrix_vector_hp/cmp/generic rename to tests/matrix_free/matrix_vector_hp.output diff --git a/tests/matrix_free/matrix_vector_mg.cc b/tests/matrix_free/matrix_vector_mg.cc index deb7009e24..c86f675a40 100644 --- a/tests/matrix_free/matrix_vector_mg.cc +++ b/tests/matrix_free/matrix_vector_mg.cc @@ -23,7 +23,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_mg/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" #include diff --git a/tests/matrix_free/matrix_vector_mg/cmp/generic b/tests/matrix_free/matrix_vector_mg.output similarity index 100% rename from tests/matrix_free/matrix_vector_mg/cmp/generic rename to tests/matrix_free/matrix_vector_mg.output diff --git a/tests/matrix_free/matrix_vector_stokes.cc b/tests/matrix_free/matrix_vector_stokes.cc index 2ae0057b7f..04c5003192 100644 --- a/tests/matrix_free/matrix_vector_stokes.cc +++ b/tests/matrix_free/matrix_vector_stokes.cc @@ -23,7 +23,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_stokes/output"); +std::ofstream logfile("output"); #include #include diff --git a/tests/matrix_free/matrix_vector_stokes/cmp/generic b/tests/matrix_free/matrix_vector_stokes.output similarity index 100% rename from tests/matrix_free/matrix_vector_stokes/cmp/generic rename to tests/matrix_free/matrix_vector_stokes.output diff --git a/tests/matrix_free/matrix_vector_stokes_noflux.cc b/tests/matrix_free/matrix_vector_stokes_noflux.cc index 145ed7dc48..c4cfd300ae 100644 --- a/tests/matrix_free/matrix_vector_stokes_noflux.cc +++ b/tests/matrix_free/matrix_vector_stokes_noflux.cc @@ -24,7 +24,7 @@ #include "../tests.h" -std::ofstream logfile("matrix_vector_stokes_noflux/output"); +std::ofstream logfile("output"); #include #include diff --git a/tests/matrix_free/matrix_vector_stokes_noflux/cmp/generic b/tests/matrix_free/matrix_vector_stokes_noflux.output similarity index 100% rename from tests/matrix_free/matrix_vector_stokes_noflux/cmp/generic rename to tests/matrix_free/matrix_vector_stokes_noflux.output diff --git a/tests/matrix_free/no_index_initialize.cc b/tests/matrix_free/no_index_initialize.cc index 5cec8344df..3c2af197fc 100644 --- a/tests/matrix_free/no_index_initialize.cc +++ b/tests/matrix_free/no_index_initialize.cc @@ -22,7 +22,7 @@ #include "../tests.h" -std::ofstream logfile("no_index_initialize/output"); +std::ofstream logfile("output"); #include #include diff --git a/tests/matrix_free/no_index_initialize/cmp/generic b/tests/matrix_free/no_index_initialize.output similarity index 100% rename from tests/matrix_free/no_index_initialize/cmp/generic rename to tests/matrix_free/no_index_initialize.output diff --git a/tests/matrix_free/quadrature_points.cc b/tests/matrix_free/quadrature_points.cc index 9cc4382018..206b90ef73 100644 --- a/tests/matrix_free/quadrature_points.cc +++ b/tests/matrix_free/quadrature_points.cc @@ -39,7 +39,7 @@ #include #include -std::ofstream logfile("quadrature_points/output"); +std::ofstream logfile("output"); template diff --git a/tests/matrix_free/quadrature_points/cmp/generic b/tests/matrix_free/quadrature_points.output similarity index 100% rename from tests/matrix_free/quadrature_points/cmp/generic rename to tests/matrix_free/quadrature_points.output diff --git a/tests/matrix_free/step-37.cc b/tests/matrix_free/step-37.cc index e50a362d30..23c3f5fe02 100644 --- a/tests/matrix_free/step-37.cc +++ b/tests/matrix_free/step-37.cc @@ -637,7 +637,7 @@ namespace Step37 int main () { - std::ofstream logfile("step-37/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision (3); deallog.threshold_double(1e-10); diff --git a/tests/matrix_free/step-37/cmp/generic b/tests/matrix_free/step-37.output similarity index 100% rename from tests/matrix_free/step-37/cmp/generic rename to tests/matrix_free/step-37.output diff --git a/tests/matrix_free/thread_correctness.cc b/tests/matrix_free/thread_correctness.cc index d3dd5eedc8..76a8d3d2f3 100644 --- a/tests/matrix_free/thread_correctness.cc +++ b/tests/matrix_free/thread_correctness.cc @@ -23,7 +23,7 @@ #include #include "create_mesh.h" -std::ofstream logfile("thread_correctness/output"); +std::ofstream logfile("output"); #include "matrix_vector_common.h" diff --git a/tests/matrix_free/thread_correctness/cmp/generic b/tests/matrix_free/thread_correctness.output similarity index 100% rename from tests/matrix_free/thread_correctness/cmp/generic rename to tests/matrix_free/thread_correctness.output diff --git a/tests/matrix_free/thread_correctness_hp.cc b/tests/matrix_free/thread_correctness_hp.cc index e5ec29044d..03c3f1df8d 100644 --- a/tests/matrix_free/thread_correctness_hp.cc +++ b/tests/matrix_free/thread_correctness_hp.cc @@ -22,7 +22,7 @@ #include "../tests.h" -std::ofstream logfile("thread_correctness_hp/output"); +std::ofstream logfile("output"); #include "create_mesh.h" #include "matrix_vector_common.h" diff --git a/tests/matrix_free/thread_correctness_hp/cmp/generic b/tests/matrix_free/thread_correctness_hp.output similarity index 100% rename from tests/matrix_free/thread_correctness_hp/cmp/generic rename to tests/matrix_free/thread_correctness_hp.output diff --git a/tests/matrix_free/update_mapping_only.cc b/tests/matrix_free/update_mapping_only.cc index 3ec881dd01..e721100e81 100644 --- a/tests/matrix_free/update_mapping_only.cc +++ b/tests/matrix_free/update_mapping_only.cc @@ -25,7 +25,7 @@ #include -std::ofstream logfile("update_mapping_only/output"); +std::ofstream logfile("output"); #include "get_functions_common.h" diff --git a/tests/matrix_free/update_mapping_only/cmp/generic b/tests/matrix_free/update_mapping_only.output similarity index 100% rename from tests/matrix_free/update_mapping_only/cmp/generic rename to tests/matrix_free/update_mapping_only.output -- 2.39.5