From 8efc9f53aa2389da209a456d4895cffbbe83d7af Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 22 Aug 2013 15:58:50 +0000 Subject: [PATCH] Convert /tests/fe git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30424 0785d39b-7218-0410-832d-ea1e28bc413d --- .../cmake/macros/macro_deal_ii_add_test.cmake | 21 +- tests/CMakeLists.txt | 2 +- tests/fe/CMakeLists.txt | 9 +- tests/fe/Makefile | 10 - tests/fe/abf_01.cc | 2 +- .../fe/{abf_01/cmp/generic => abf_01.output} | 0 tests/fe/abf_projection_01.cc | 2 +- .../cmp/generic => abf_projection_01.output} | 0 tests/fe/block_mask_01.cc | 2 +- .../cmp/generic => block_mask_01.output} | 0 tests/fe/block_mask_02.cc | 2 +- .../cmp/generic => block_mask_02.output} | 0 tests/fe/block_mask_03.cc | 2 +- .../cmp/generic => block_mask_03.output} | 0 tests/fe/block_mask_04.cc | 2 +- .../cmp/generic => block_mask_04.output} | 0 tests/fe/block_mask_05.cc | 2 +- .../cmp/generic => block_mask_05.output} | 0 tests/fe/block_mask_06.cc | 2 +- .../cmp/generic => block_mask_06.output} | 0 tests/fe/block_mask_07.cc | 2 +- .../cmp/generic => block_mask_07.output} | 0 tests/fe/block_mask_08.cc | 2 +- .../cmp/generic => block_mask_08.output} | 0 tests/fe/block_mask_09.cc | 2 +- .../cmp/generic => block_mask_09.output} | 0 tests/fe/block_mask_10.cc | 2 +- .../cmp/generic => block_mask_10.output} | 0 tests/fe/block_mask_11.cc | 2 +- .../cmp/generic => block_mask_11.output} | 0 tests/fe/cell_similarity_01.cc | 2 +- .../cmp/generic => cell_similarity_01.output} | 0 tests/fe/cell_similarity_02.cc | 2 +- .../cmp/generic => cell_similarity_02.output} | 0 tests/fe/cell_similarity_03.cc | 2 +- .../cmp/generic => cell_similarity_03.output} | 0 tests/fe/cell_similarity_04.cc | 2 +- .../cmp/generic => cell_similarity_04.output} | 0 tests/fe/cell_similarity_05.cc | 2 +- .../cmp/generic => cell_similarity_05.output} | 0 tests/fe/cell_similarity_06.cc | 2 +- .../cmp/generic => cell_similarity_06.output} | 0 tests/fe/cell_similarity_07.cc | 2 +- .../cmp/generic => cell_similarity_07.output} | 0 tests/fe/cell_similarity_08.cc | 2 +- .../cmp/generic => cell_similarity_08.output} | 0 tests/fe/cell_similarity_09.cc | 2 +- .../cmp/generic => cell_similarity_09.output} | 0 tests/fe/cell_similarity_10.cc | 2 +- .../cmp/generic => cell_similarity_10.output} | 0 tests/fe/cell_similarity_dgp_monomial_01.cc | 2 +- ...=> cell_similarity_dgp_monomial_01.output} | 0 tests/fe/cell_similarity_dgp_monomial_02.cc | 2 +- ...=> cell_similarity_dgp_monomial_02.output} | 0 tests/fe/cell_similarity_dgp_monomial_03.cc | 2 +- ...=> cell_similarity_dgp_monomial_03.output} | 0 tests/fe/cell_similarity_dgp_monomial_04.cc | 2 +- ...=> cell_similarity_dgp_monomial_04.output} | 0 tests/fe/cell_similarity_dgp_monomial_05.cc | 2 +- ...=> cell_similarity_dgp_monomial_05.output} | 0 tests/fe/cell_similarity_dgp_monomial_06.cc | 2 +- ...=> cell_similarity_dgp_monomial_06.output} | 0 tests/fe/cell_similarity_dgp_monomial_07.cc | 2 +- ...=> cell_similarity_dgp_monomial_07.output} | 0 tests/fe/cell_similarity_dgp_monomial_08.cc | 2 +- ...=> cell_similarity_dgp_monomial_08.output} | 0 tests/fe/cell_similarity_dgp_monomial_09.cc | 2 +- ...=> cell_similarity_dgp_monomial_09.output} | 0 tests/fe/cell_similarity_dgp_monomial_10.cc | 2 +- ...=> cell_similarity_dgp_monomial_10.output} | 0 .../cell_similarity_dgp_nonparametric_01.cc | 2 +- ...ll_similarity_dgp_nonparametric_01.output} | 0 .../cell_similarity_dgp_nonparametric_02.cc | 2 +- ...ll_similarity_dgp_nonparametric_02.output} | 0 .../cell_similarity_dgp_nonparametric_03.cc | 2 +- ...ll_similarity_dgp_nonparametric_03.output} | 0 .../cell_similarity_dgp_nonparametric_04.cc | 2 +- ...ll_similarity_dgp_nonparametric_04.output} | 0 .../cell_similarity_dgp_nonparametric_05.cc | 2 +- ...ll_similarity_dgp_nonparametric_05.output} | 0 .../cell_similarity_dgp_nonparametric_06.cc | 2 +- ...ll_similarity_dgp_nonparametric_06.output} | 0 .../cell_similarity_dgp_nonparametric_07.cc | 2 +- ...ll_similarity_dgp_nonparametric_07.output} | 0 .../cell_similarity_dgp_nonparametric_08.cc | 2 +- ...ll_similarity_dgp_nonparametric_08.output} | 0 .../cell_similarity_dgp_nonparametric_09.cc | 2 +- ...ll_similarity_dgp_nonparametric_09.output} | 0 .../cell_similarity_dgp_nonparametric_10.cc | 2 +- ...ll_similarity_dgp_nonparametric_10.output} | 0 tests/fe/check_derivatives.cc | 2 +- .../cmp/generic => check_derivatives.output} | 0 tests/fe/component_mask_01.cc | 2 +- .../cmp/generic => component_mask_01.output} | 0 tests/fe/component_mask_02.cc | 2 +- .../cmp/generic => component_mask_02.output} | 0 tests/fe/component_mask_03.cc | 2 +- .../cmp/generic => component_mask_03.output} | 0 tests/fe/component_mask_04.cc | 2 +- .../cmp/generic => component_mask_04.output} | 0 tests/fe/component_mask_05.cc | 2 +- .../cmp/generic => component_mask_05.output} | 0 tests/fe/component_mask_06.cc | 2 +- .../cmp/generic => component_mask_06.output} | 0 tests/fe/component_mask_07.cc | 2 +- .../cmp/generic => component_mask_07.output} | 0 tests/fe/component_mask_08.cc | 2 +- .../cmp/generic => component_mask_08.output} | 0 tests/fe/component_mask_09.cc | 2 +- .../cmp/generic => component_mask_09.output} | 0 tests/fe/component_mask_10.cc | 2 +- .../cmp/generic => component_mask_10.output} | 0 tests/fe/component_mask_11.cc | 2 +- .../cmp/generic => component_mask_11.output} | 0 tests/fe/component_mask_12.cc | 2 +- .../cmp/generic => component_mask_12.output} | 0 tests/fe/component_mask_13.cc | 2 +- .../cmp/generic => component_mask_13.output} | 0 tests/fe/component_mask_14.cc | 2 +- .../cmp/generic => component_mask_14.output} | 0 tests/fe/copy_01.cc | 2 +- .../{copy_01/cmp/generic => copy_01.output} | 0 .../{copy_fe/cmp/generic => copy_fe.output} | 0 tests/fe/derivatives.cc | 2 +- .../cmp/generic => derivatives.output} | 0 tests/fe/derivatives_face.cc | 2 +- .../cmp/generic => derivatives_face.output} | 0 tests/fe/dgp_01.cc | 2 +- .../fe/{dgp_01/cmp/generic => dgp_01.output} | 0 tests/fe/dgp_monomial_1.cc | 2 +- .../cmp/generic => dgp_monomial_1.output} | 0 tests/fe/dgp_monomial_2.cc | 2 +- .../cmp/generic => dgp_monomial_2.output} | 0 tests/fe/dgq_1.cc | 2 +- tests/fe/{dgq_1/cmp/generic => dgq_1.output} | 0 tests/fe/face_to_cell_q1_2d.cc | 2 +- .../cmp/generic => face_to_cell_q1_2d.output} | 0 tests/fe/face_to_cell_q2_2d.cc | 2 +- .../cmp/generic => face_to_cell_q2_2d.output} | 0 tests/fe/face_to_cell_q2xq2_2d.cc | 2 +- .../generic => face_to_cell_q2xq2_2d.output} | 0 tests/fe/face_to_cell_q3_2d.cc | 2 +- .../cmp/generic => face_to_cell_q3_2d.output} | 0 tests/fe/face_to_cell_q3xq4_2d.cc | 2 +- .../generic => face_to_cell_q3xq4_2d.output} | 0 tests/fe/face_to_cell_q4_2d.cc | 2 +- .../cmp/generic => face_to_cell_q4_2d.output} | 0 tests/fe/fe_data_test.cc | 2 +- .../cmp/generic => fe_data_test.output} | 0 ...c => fe_face_orientation_nedelec_0.output} | 0 ...=> fe_face_orientation_nedelec_000.output} | 0 ...=> fe_face_orientation_nedelec_001.output} | 0 ...=> fe_face_orientation_nedelec_010.output} | 0 ...=> fe_face_orientation_nedelec_011.output} | 0 ...=> fe_face_orientation_nedelec_100.output} | 0 ...=> fe_face_orientation_nedelec_101.output} | 0 ...=> fe_face_orientation_nedelec_110.output} | 0 ...=> fe_face_orientation_nedelec_111.output} | 0 tests/fe/fe_face_values_1d.cc | 2 +- .../cmp/generic => fe_face_values_1d.output} | 0 .../fe/fe_face_values_1d_mapping_cartesian.cc | 2 +- ...e_face_values_1d_mapping_cartesian.output} | 0 tests/fe/fe_face_values_1d_mapping_q2.cc | 2 +- ...ic => fe_face_values_1d_mapping_q2.output} | 0 .../generic => fe_prolongation_bdm.output} | 0 .../generic => fe_prolongation_dgp.output} | 0 .../generic => fe_prolongation_dgq.output} | 0 ...generic => fe_prolongation_nedelec.output} | 0 .../cmp/generic => fe_prolongation_q.output} | 0 .../generic => fe_prolongation_q_dg0.output} | 0 ... => fe_prolongation_q_hierarchical.output} | 0 ...eneric => fe_prolongation_q_iso_q1.output} | 0 .../cmp/generic => fe_prolongation_rt.output} | 0 .../generic => fe_prolongation_sys_01.output} | 0 .../generic => fe_prolongation_sys_02.output} | 0 .../generic => fe_prolongation_sys_03.output} | 0 .../generic => fe_prolongation_sys_04.output} | 0 .../generic => fe_prolongation_sys_05.output} | 0 .../generic => fe_prolongation_sys_06.output} | 0 .../generic => fe_prolongation_sys_07.output} | 0 .../generic => fe_prolongation_sys_08.output} | 0 .../generic => fe_prolongation_sys_09.output} | 0 .../generic => fe_prolongation_sys_10.output} | 0 tests/fe/fe_q_01.cc | 2 +- .../{fe_q_01/cmp/generic => fe_q_01.output} | 0 .../{fe_q_dg0/cmp/generic => fe_q_dg0.output} | 0 .../cmp/generic => fe_restriction_bdm.output} | 0 .../cmp/generic => fe_restriction_dgp.output} | 0 .../cmp/generic => fe_restriction_dgq.output} | 0 .../generic => fe_restriction_nedelec.output} | 0 .../cmp/generic => fe_restriction_q.output} | 0 .../generic => fe_restriction_q_dg0.output} | 0 ...c => fe_restriction_q_hierarchical.output} | 0 ...generic => fe_restriction_q_iso_q1.output} | 0 .../cmp/generic => fe_restriction_rt.output} | 0 .../generic => fe_restriction_sys_01.output} | 0 .../generic => fe_restriction_sys_02.output} | 0 .../generic => fe_restriction_sys_03.output} | 0 .../generic => fe_restriction_sys_04.output} | 0 .../generic => fe_restriction_sys_05.output} | 0 .../generic => fe_restriction_sys_06.output} | 0 .../generic => fe_restriction_sys_07.output} | 0 .../generic => fe_restriction_sys_08.output} | 0 .../generic => fe_restriction_sys_09.output} | 0 .../generic => fe_restriction_sys_10.output} | 0 .../generic => fe_support_points_bdm.output} | 0 ...neric => fe_support_points_nedelec.output} | 0 .../generic => fe_support_points_q.output} | 0 ...generic => fe_support_points_q_dg0.output} | 0 ...> fe_support_points_q_hierarchical.output} | 0 ...eric => fe_support_points_q_iso_q1.output} | 0 ...generic => fe_support_points_q_qg0.output} | 0 .../generic => fe_support_points_rt.output} | 0 ...eneric => fe_support_points_sys_01.output} | 0 ...eneric => fe_support_points_sys_02.output} | 0 ...eneric => fe_support_points_sys_03.output} | 0 ...eneric => fe_support_points_sys_04.output} | 0 ...eneric => fe_support_points_sys_05.output} | 0 ...eneric => fe_support_points_sys_06.output} | 0 ...eneric => fe_support_points_sys_07.output} | 0 ...eneric => fe_support_points_sys_08.output} | 0 ...eneric => fe_support_points_sys_09.output} | 0 ...eneric => fe_support_points_sys_10.output} | 0 tests/fe/fe_sys_projection_01.cc | 2 +- .../generic => fe_sys_projection_01.output} | 0 tests/fe/fe_sys_projection_01/rt.gpl | 184 ------------------ tests/fe/fe_tools.cc | 2 +- .../{fe_tools/cmp/generic => fe_tools.output} | 0 tests/fe/fe_tools_01.cc | 2 +- .../cmp/generic => fe_tools_01.output} | 0 tests/fe/fe_tools_test.cc | 2 +- .../cmp/generic => fe_tools_test.output} | 0 tests/fe/function.cc | 2 +- .../{function/cmp/generic => function.output} | 0 tests/fe/{abf_projection_01 => grids}/rt.gpl | 0 tests/fe/injection_dgp_monomial.cc | 2 +- .../generic => injection_dgp_monomial.output} | 0 tests/fe/injection_dgq.cc | 2 +- .../cmp/generic => injection_dgq.output} | 0 tests/fe/injection_q.cc | 2 +- .../cmp/generic => injection_q.output} | 0 tests/fe/injection_q_dg0.cc | 2 +- .../cmp/generic => injection_q_dg0.output} | 0 tests/fe/injection_q_iso_q1.cc | 2 +- .../cmp/generic => injection_q_iso_q1.output} | 0 tests/fe/injection_q_system.cc | 2 +- .../cmp/generic => injection_q_system.output} | 0 tests/fe/interpolate_q1.cc | 2 +- .../cmp/generic => interpolate_q1.output} | 0 tests/fe/interpolate_q_dg0.cc | 2 +- .../cmp/generic => interpolate_q_dg0.output} | 0 tests/fe/interpolate_q_iso_q1.cc | 2 +- .../generic => interpolate_q_iso_q1.output} | 0 tests/fe/interpolate_rt.cc | 2 +- .../cmp/generic => interpolate_rt.output} | 0 tests/fe/interpolate_rtn.cc | 2 +- .../cmp/generic => interpolate_rtn.output} | 0 tests/fe/interpolate_system.cc | 2 +- .../cmp/generic => interpolate_system.output} | 0 tests/fe/jacobians.cc | 2 +- .../cmp/generic => jacobians.output} | 0 tests/fe/mapping.cc | 2 +- .../{mapping/cmp/generic => mapping.output} | 0 tests/fe/mapping_c1.cc | 2 +- .../cmp/generic => mapping_c1.output} | 0 tests/fe/mapping_q1_eulerian.cc | 2 +- .../generic => mapping_q1_eulerian.output} | 0 tests/fe/mapping_q_eulerian.cc | 2 +- .../cmp/generic => mapping_q_eulerian.output} | 0 tests/fe/mapping_real_to_unit_02.cc | 2 +- ...generic => mapping_real_to_unit_02.output} | 0 tests/fe/mapping_real_to_unit_q1.cc | 2 +- ...generic => mapping_real_to_unit_q1.output} | 0 tests/fe/mapping_real_to_unit_q4_curved.cc | 2 +- ... => mapping_real_to_unit_q4_curved.output} | 0 .../mapping_real_to_unit_q4_curved_codim.cc | 2 +- ...pping_real_to_unit_q4_curved_codim.output} | 0 tests/fe/mapping_real_to_unit_q4_sphere.cc | 2 +- ... => mapping_real_to_unit_q4_sphere.output} | 0 tests/fe/mapping_real_to_unit_q4_sphere_x.cc | 2 +- ...> mapping_real_to_unit_q4_sphere_x.output} | 0 tests/fe/mapping_real_to_unit_q4_sphere_y.cc | 2 +- ...> mapping_real_to_unit_q4_sphere_y.output} | 0 tests/fe/mapping_real_to_unit_q4_sphere_z.cc | 2 +- ...> mapping_real_to_unit_q4_sphere_z.output} | 0 tests/fe/mapping_real_to_unit_q4_straight.cc | 2 +- ...> mapping_real_to_unit_q4_straight.output} | 0 tests/fe/mass_matrix_arbitrary_nodes.cc | 2 +- ...ric => mass_matrix_arbitrary_nodes.output} | 0 tests/fe/nedelec.cc | 4 +- .../{nedelec/cmp/generic => nedelec.output} | 0 tests/fe/nedelec_2.cc | 2 +- .../cmp/generic => nedelec_2.output} | 0 tests/fe/nedelec_3.cc | 2 +- .../cmp/generic => nedelec_3.output} | 0 tests/fe/nedelec_crash_01.cc | 2 +- .../cmp/generic => nedelec_crash_01.output} | 0 tests/fe/non_primitive_1.cc | 2 +- .../cmp/generic => non_primitive_1.output} | 0 tests/fe/non_primitive_2.cc | 2 +- .../cmp/generic => non_primitive_2.output} | 0 tests/fe/numbering.cc | 2 +- .../cmp/generic => numbering.output} | 0 tests/fe/q_1.cc | 2 +- tests/fe/{q_1/cmp/generic => q_1.output} | 0 tests/fe/q_2.cc | 2 +- tests/fe/{q_2/cmp/generic => q_2.output} | 0 tests/fe/q_3.cc | 2 +- tests/fe/{q_3/cmp/generic => q_3.output} | 0 tests/fe/q_4.cc | 2 +- tests/fe/{q_4/cmp/generic => q_4.output} | 0 tests/fe/q_dg0_projection_01.cc | 2 +- .../generic => q_dg0_projection_01.output} | 0 tests/fe/q_dg0_projection_01/rt.gpl | 184 ------------------ tests/fe/q_iso_q1_projection_01.cc | 2 +- .../generic => q_iso_q1_projection_01.output} | 0 tests/fe/q_iso_q1_projection_01/rt.gpl | 184 ------------------ tests/fe/rt_1.cc | 2 +- tests/fe/{rt_1/cmp/generic => rt_1.output} | 0 tests/fe/rt_1/rt.gpl | 184 ------------------ tests/fe/rt_10.cc | 2 +- tests/fe/{rt_10/cmp/generic => rt_10.output} | 0 tests/fe/rt_11.cc | 2 +- tests/fe/{rt_11/cmp/generic => rt_11.output} | 0 tests/fe/rt_12.cc | 2 +- tests/fe/{rt_12/cmp/generic => rt_12.output} | 0 tests/fe/rt_13.cc | 2 +- tests/fe/{rt_13/cmp/generic => rt_13.output} | 0 tests/fe/rt_14.cc | 2 +- tests/fe/{rt_14/cmp/generic => rt_14.output} | 0 tests/fe/rt_15.cc | 2 +- tests/fe/{rt_15/cmp/generic => rt_15.output} | 0 tests/fe/rt_2.cc | 2 +- tests/fe/{rt_2/cmp/generic => rt_2.output} | 0 tests/fe/rt_3.cc | 2 +- tests/fe/{rt_3/cmp/generic => rt_3.output} | 0 tests/fe/rt_5.cc | 2 +- tests/fe/{rt_5/cmp/generic => rt_5.output} | 0 tests/fe/rt_7.cc | 2 +- tests/fe/{rt_7/cmp/generic => rt_7.output} | 0 tests/fe/rt_8.cc | 2 +- tests/fe/{rt_8/cmp/generic => rt_8.output} | 0 tests/fe/rt_9.cc | 2 +- tests/fe/{rt_9/cmp/generic => rt_9.output} | 0 tests/fe/rt_approximation_01.cc | 2 +- .../generic => rt_approximation_01.output} | 0 tests/fe/rt_approximation_01/rt.gpl | 184 ------------------ tests/fe/rt_normal_02.cc | 2 +- .../cmp/generic => rt_normal_02.output} | 0 tests/fe/rt_normal_02/rt.gpl | 184 ------------------ tests/fe/rt_projection_01.cc | 2 +- .../cmp/generic => rt_projection_01.output} | 0 tests/fe/rt_projection_01/rt.gpl | 184 ------------------ tests/fe/rtdiff.cc | 2 +- .../fe/{rtdiff/cmp/generic => rtdiff.output} | 0 tests/fe/rtn_1.cc | 2 +- tests/fe/{rtn_1/cmp/generic => rtn_1.output} | 0 tests/fe/rtn_2.cc | 2 +- tests/fe/{rtn_2/cmp/generic => rtn_2.output} | 0 tests/fe/rtn_3.cc | 2 +- tests/fe/{rtn_3/cmp/generic => rtn_3.output} | 0 tests/fe/shapes_dgp.cc | 2 +- .../cmp/generic => shapes_dgp.output} | 0 tests/fe/shapes_dgp_monomial.cc | 2 +- .../generic => shapes_dgp_monomial.output} | 0 tests/fe/shapes_dgp_nonparametric.cc | 2 +- ...eneric => shapes_dgp_nonparametric.output} | 0 tests/fe/shapes_dgq.cc | 2 +- .../cmp/generic => shapes_dgq.output} | 0 tests/fe/shapes_faceq.cc | 2 +- .../cmp/generic => shapes_faceq.output} | 0 tests/fe/shapes_nedelec.cc | 2 +- .../cmp/generic => shapes_nedelec.output} | 0 tests/fe/shapes_q.cc | 2 +- .../{shapes_q/cmp/generic => shapes_q.output} | 0 tests/fe/shapes_q_dg0.cc | 2 +- .../cmp/generic => shapes_q_dg0.output} | 0 tests/fe/shapes_q_hierarchical.cc | 2 +- .../generic => shapes_q_hierarchical.output} | 0 tests/fe/shapes_q_iso_q1.cc | 2 +- .../cmp/generic => shapes_q_iso_q1.output} | 0 tests/fe/shapes_system.cc | 2 +- .../cmp/generic => shapes_system.output} | 0 tests/fe/system_01.cc | 2 +- .../cmp/generic => system_01.output} | 0 tests/fe/system_02.cc | 2 +- .../cmp/generic => system_02.output} | 0 tests/fe/system_index.cc | 2 +- .../cmp/generic => system_index.output} | 0 tests/fe/traits.cc | 2 +- .../fe/{traits/cmp/generic => traits.output} | 0 tests/fe/transfer.cc | 2 +- .../{transfer/cmp/generic => transfer.output} | 0 tests/fe/up_and_down.cc | 2 +- .../cmp/generic => up_and_down.output} | 0 395 files changed, 172 insertions(+), 1476 deletions(-) delete mode 100644 tests/fe/Makefile rename tests/fe/{abf_01/cmp/generic => abf_01.output} (100%) rename tests/fe/{abf_projection_01/cmp/generic => abf_projection_01.output} (100%) rename tests/fe/{block_mask_01/cmp/generic => block_mask_01.output} (100%) rename tests/fe/{block_mask_02/cmp/generic => block_mask_02.output} (100%) rename tests/fe/{block_mask_03/cmp/generic => block_mask_03.output} (100%) rename tests/fe/{block_mask_04/cmp/generic => block_mask_04.output} (100%) rename tests/fe/{block_mask_05/cmp/generic => block_mask_05.output} (100%) rename tests/fe/{block_mask_06/cmp/generic => block_mask_06.output} (100%) rename tests/fe/{block_mask_07/cmp/generic => block_mask_07.output} (100%) rename tests/fe/{block_mask_08/cmp/generic => block_mask_08.output} (100%) rename tests/fe/{block_mask_09/cmp/generic => block_mask_09.output} (100%) rename tests/fe/{block_mask_10/cmp/generic => block_mask_10.output} (100%) rename tests/fe/{block_mask_11/cmp/generic => block_mask_11.output} (100%) rename tests/fe/{cell_similarity_01/cmp/generic => cell_similarity_01.output} (100%) rename tests/fe/{cell_similarity_02/cmp/generic => cell_similarity_02.output} (100%) rename tests/fe/{cell_similarity_03/cmp/generic => cell_similarity_03.output} (100%) rename tests/fe/{cell_similarity_04/cmp/generic => cell_similarity_04.output} (100%) rename tests/fe/{cell_similarity_05/cmp/generic => cell_similarity_05.output} (100%) rename tests/fe/{cell_similarity_06/cmp/generic => cell_similarity_06.output} (100%) rename tests/fe/{cell_similarity_07/cmp/generic => cell_similarity_07.output} (100%) rename tests/fe/{cell_similarity_08/cmp/generic => cell_similarity_08.output} (100%) rename tests/fe/{cell_similarity_09/cmp/generic => cell_similarity_09.output} (100%) rename tests/fe/{cell_similarity_10/cmp/generic => cell_similarity_10.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_01/cmp/generic => cell_similarity_dgp_monomial_01.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_02/cmp/generic => cell_similarity_dgp_monomial_02.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_03/cmp/generic => cell_similarity_dgp_monomial_03.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_04/cmp/generic => cell_similarity_dgp_monomial_04.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_05/cmp/generic => cell_similarity_dgp_monomial_05.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_06/cmp/generic => cell_similarity_dgp_monomial_06.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_07/cmp/generic => cell_similarity_dgp_monomial_07.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_08/cmp/generic => cell_similarity_dgp_monomial_08.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_09/cmp/generic => cell_similarity_dgp_monomial_09.output} (100%) rename tests/fe/{cell_similarity_dgp_monomial_10/cmp/generic => cell_similarity_dgp_monomial_10.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_01/cmp/generic => cell_similarity_dgp_nonparametric_01.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_02/cmp/generic => cell_similarity_dgp_nonparametric_02.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_03/cmp/generic => cell_similarity_dgp_nonparametric_03.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_04/cmp/generic => cell_similarity_dgp_nonparametric_04.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_05/cmp/generic => cell_similarity_dgp_nonparametric_05.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_06/cmp/generic => cell_similarity_dgp_nonparametric_06.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_07/cmp/generic => cell_similarity_dgp_nonparametric_07.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_08/cmp/generic => cell_similarity_dgp_nonparametric_08.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_09/cmp/generic => cell_similarity_dgp_nonparametric_09.output} (100%) rename tests/fe/{cell_similarity_dgp_nonparametric_10/cmp/generic => cell_similarity_dgp_nonparametric_10.output} (100%) rename tests/fe/{check_derivatives/cmp/generic => check_derivatives.output} (100%) rename tests/fe/{component_mask_01/cmp/generic => component_mask_01.output} (100%) rename tests/fe/{component_mask_02/cmp/generic => component_mask_02.output} (100%) rename tests/fe/{component_mask_03/cmp/generic => component_mask_03.output} (100%) rename tests/fe/{component_mask_04/cmp/generic => component_mask_04.output} (100%) rename tests/fe/{component_mask_05/cmp/generic => component_mask_05.output} (100%) rename tests/fe/{component_mask_06/cmp/generic => component_mask_06.output} (100%) rename tests/fe/{component_mask_07/cmp/generic => component_mask_07.output} (100%) rename tests/fe/{component_mask_08/cmp/generic => component_mask_08.output} (100%) rename tests/fe/{component_mask_09/cmp/generic => component_mask_09.output} (100%) rename tests/fe/{component_mask_10/cmp/generic => component_mask_10.output} (100%) rename tests/fe/{component_mask_11/cmp/generic => component_mask_11.output} (100%) rename tests/fe/{component_mask_12/cmp/generic => component_mask_12.output} (100%) rename tests/fe/{component_mask_13/cmp/generic => component_mask_13.output} (100%) rename tests/fe/{component_mask_14/cmp/generic => component_mask_14.output} (100%) rename tests/fe/{copy_01/cmp/generic => copy_01.output} (100%) rename tests/fe/{copy_fe/cmp/generic => copy_fe.output} (100%) rename tests/fe/{derivatives/cmp/generic => derivatives.output} (100%) rename tests/fe/{derivatives_face/cmp/generic => derivatives_face.output} (100%) rename tests/fe/{dgp_01/cmp/generic => dgp_01.output} (100%) rename tests/fe/{dgp_monomial_1/cmp/generic => dgp_monomial_1.output} (100%) rename tests/fe/{dgp_monomial_2/cmp/generic => dgp_monomial_2.output} (100%) rename tests/fe/{dgq_1/cmp/generic => dgq_1.output} (100%) rename tests/fe/{face_to_cell_q1_2d/cmp/generic => face_to_cell_q1_2d.output} (100%) rename tests/fe/{face_to_cell_q2_2d/cmp/generic => face_to_cell_q2_2d.output} (100%) rename tests/fe/{face_to_cell_q2xq2_2d/cmp/generic => face_to_cell_q2xq2_2d.output} (100%) rename tests/fe/{face_to_cell_q3_2d/cmp/generic => face_to_cell_q3_2d.output} (100%) rename tests/fe/{face_to_cell_q3xq4_2d/cmp/generic => face_to_cell_q3xq4_2d.output} (100%) rename tests/fe/{face_to_cell_q4_2d/cmp/generic => face_to_cell_q4_2d.output} (100%) rename tests/fe/{fe_data_test/cmp/generic => fe_data_test.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_0/cmp/generic => fe_face_orientation_nedelec_0.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_000/cmp/generic => fe_face_orientation_nedelec_000.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_001/cmp/generic => fe_face_orientation_nedelec_001.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_010/cmp/generic => fe_face_orientation_nedelec_010.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_011/cmp/generic => fe_face_orientation_nedelec_011.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_100/cmp/generic => fe_face_orientation_nedelec_100.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_101/cmp/generic => fe_face_orientation_nedelec_101.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_110/cmp/generic => fe_face_orientation_nedelec_110.output} (100%) rename tests/fe/{fe_face_orientation_nedelec_111/cmp/generic => fe_face_orientation_nedelec_111.output} (100%) rename tests/fe/{fe_face_values_1d/cmp/generic => fe_face_values_1d.output} (100%) rename tests/fe/{fe_face_values_1d_mapping_cartesian/cmp/generic => fe_face_values_1d_mapping_cartesian.output} (100%) rename tests/fe/{fe_face_values_1d_mapping_q2/cmp/generic => fe_face_values_1d_mapping_q2.output} (100%) rename tests/fe/{fe_prolongation_bdm/cmp/generic => fe_prolongation_bdm.output} (100%) rename tests/fe/{fe_prolongation_dgp/cmp/generic => fe_prolongation_dgp.output} (100%) rename tests/fe/{fe_prolongation_dgq/cmp/generic => fe_prolongation_dgq.output} (100%) rename tests/fe/{fe_prolongation_nedelec/cmp/generic => fe_prolongation_nedelec.output} (100%) rename tests/fe/{fe_prolongation_q/cmp/generic => fe_prolongation_q.output} (100%) rename tests/fe/{fe_prolongation_q_dg0/cmp/generic => fe_prolongation_q_dg0.output} (100%) rename tests/fe/{fe_prolongation_q_hierarchical/cmp/generic => fe_prolongation_q_hierarchical.output} (100%) rename tests/fe/{fe_prolongation_q_iso_q1/cmp/generic => fe_prolongation_q_iso_q1.output} (100%) rename tests/fe/{fe_prolongation_rt/cmp/generic => fe_prolongation_rt.output} (100%) rename tests/fe/{fe_prolongation_sys_01/cmp/generic => fe_prolongation_sys_01.output} (100%) rename tests/fe/{fe_prolongation_sys_02/cmp/generic => fe_prolongation_sys_02.output} (100%) rename tests/fe/{fe_prolongation_sys_03/cmp/generic => fe_prolongation_sys_03.output} (100%) rename tests/fe/{fe_prolongation_sys_04/cmp/generic => fe_prolongation_sys_04.output} (100%) rename tests/fe/{fe_prolongation_sys_05/cmp/generic => fe_prolongation_sys_05.output} (100%) rename tests/fe/{fe_prolongation_sys_06/cmp/generic => fe_prolongation_sys_06.output} (100%) rename tests/fe/{fe_prolongation_sys_07/cmp/generic => fe_prolongation_sys_07.output} (100%) rename tests/fe/{fe_prolongation_sys_08/cmp/generic => fe_prolongation_sys_08.output} (100%) rename tests/fe/{fe_prolongation_sys_09/cmp/generic => fe_prolongation_sys_09.output} (100%) rename tests/fe/{fe_prolongation_sys_10/cmp/generic => fe_prolongation_sys_10.output} (100%) rename tests/fe/{fe_q_01/cmp/generic => fe_q_01.output} (100%) rename tests/fe/{fe_q_dg0/cmp/generic => fe_q_dg0.output} (100%) rename tests/fe/{fe_restriction_bdm/cmp/generic => fe_restriction_bdm.output} (100%) rename tests/fe/{fe_restriction_dgp/cmp/generic => fe_restriction_dgp.output} (100%) rename tests/fe/{fe_restriction_dgq/cmp/generic => fe_restriction_dgq.output} (100%) rename tests/fe/{fe_restriction_nedelec/cmp/generic => fe_restriction_nedelec.output} (100%) rename tests/fe/{fe_restriction_q/cmp/generic => fe_restriction_q.output} (100%) rename tests/fe/{fe_restriction_q_dg0/cmp/generic => fe_restriction_q_dg0.output} (100%) rename tests/fe/{fe_restriction_q_hierarchical/cmp/generic => fe_restriction_q_hierarchical.output} (100%) rename tests/fe/{fe_restriction_q_iso_q1/cmp/generic => fe_restriction_q_iso_q1.output} (100%) rename tests/fe/{fe_restriction_rt/cmp/generic => fe_restriction_rt.output} (100%) rename tests/fe/{fe_restriction_sys_01/cmp/generic => fe_restriction_sys_01.output} (100%) rename tests/fe/{fe_restriction_sys_02/cmp/generic => fe_restriction_sys_02.output} (100%) rename tests/fe/{fe_restriction_sys_03/cmp/generic => fe_restriction_sys_03.output} (100%) rename tests/fe/{fe_restriction_sys_04/cmp/generic => fe_restriction_sys_04.output} (100%) rename tests/fe/{fe_restriction_sys_05/cmp/generic => fe_restriction_sys_05.output} (100%) rename tests/fe/{fe_restriction_sys_06/cmp/generic => fe_restriction_sys_06.output} (100%) rename tests/fe/{fe_restriction_sys_07/cmp/generic => fe_restriction_sys_07.output} (100%) rename tests/fe/{fe_restriction_sys_08/cmp/generic => fe_restriction_sys_08.output} (100%) rename tests/fe/{fe_restriction_sys_09/cmp/generic => fe_restriction_sys_09.output} (100%) rename tests/fe/{fe_restriction_sys_10/cmp/generic => fe_restriction_sys_10.output} (100%) rename tests/fe/{fe_support_points_bdm/cmp/generic => fe_support_points_bdm.output} (100%) rename tests/fe/{fe_support_points_nedelec/cmp/generic => fe_support_points_nedelec.output} (100%) rename tests/fe/{fe_support_points_q/cmp/generic => fe_support_points_q.output} (100%) rename tests/fe/{fe_support_points_q_dg0/cmp/generic => fe_support_points_q_dg0.output} (100%) rename tests/fe/{fe_support_points_q_hierarchical/cmp/generic => fe_support_points_q_hierarchical.output} (100%) rename tests/fe/{fe_support_points_q_iso_q1/cmp/generic => fe_support_points_q_iso_q1.output} (100%) rename tests/fe/{fe_support_points_q_qg0/cmp/generic => fe_support_points_q_qg0.output} (100%) rename tests/fe/{fe_support_points_rt/cmp/generic => fe_support_points_rt.output} (100%) rename tests/fe/{fe_support_points_sys_01/cmp/generic => fe_support_points_sys_01.output} (100%) rename tests/fe/{fe_support_points_sys_02/cmp/generic => fe_support_points_sys_02.output} (100%) rename tests/fe/{fe_support_points_sys_03/cmp/generic => fe_support_points_sys_03.output} (100%) rename tests/fe/{fe_support_points_sys_04/cmp/generic => fe_support_points_sys_04.output} (100%) rename tests/fe/{fe_support_points_sys_05/cmp/generic => fe_support_points_sys_05.output} (100%) rename tests/fe/{fe_support_points_sys_06/cmp/generic => fe_support_points_sys_06.output} (100%) rename tests/fe/{fe_support_points_sys_07/cmp/generic => fe_support_points_sys_07.output} (100%) rename tests/fe/{fe_support_points_sys_08/cmp/generic => fe_support_points_sys_08.output} (100%) rename tests/fe/{fe_support_points_sys_09/cmp/generic => fe_support_points_sys_09.output} (100%) rename tests/fe/{fe_support_points_sys_10/cmp/generic => fe_support_points_sys_10.output} (100%) rename tests/fe/{fe_sys_projection_01/cmp/generic => fe_sys_projection_01.output} (100%) delete mode 100644 tests/fe/fe_sys_projection_01/rt.gpl rename tests/fe/{fe_tools/cmp/generic => fe_tools.output} (100%) rename tests/fe/{fe_tools_01/cmp/generic => fe_tools_01.output} (100%) rename tests/fe/{fe_tools_test/cmp/generic => fe_tools_test.output} (100%) rename tests/fe/{function/cmp/generic => function.output} (100%) rename tests/fe/{abf_projection_01 => grids}/rt.gpl (100%) rename tests/fe/{injection_dgp_monomial/cmp/generic => injection_dgp_monomial.output} (100%) rename tests/fe/{injection_dgq/cmp/generic => injection_dgq.output} (100%) rename tests/fe/{injection_q/cmp/generic => injection_q.output} (100%) rename tests/fe/{injection_q_dg0/cmp/generic => injection_q_dg0.output} (100%) rename tests/fe/{injection_q_iso_q1/cmp/generic => injection_q_iso_q1.output} (100%) rename tests/fe/{injection_q_system/cmp/generic => injection_q_system.output} (100%) rename tests/fe/{interpolate_q1/cmp/generic => interpolate_q1.output} (100%) rename tests/fe/{interpolate_q_dg0/cmp/generic => interpolate_q_dg0.output} (100%) rename tests/fe/{interpolate_q_iso_q1/cmp/generic => interpolate_q_iso_q1.output} (100%) rename tests/fe/{interpolate_rt/cmp/generic => interpolate_rt.output} (100%) rename tests/fe/{interpolate_rtn/cmp/generic => interpolate_rtn.output} (100%) rename tests/fe/{interpolate_system/cmp/generic => interpolate_system.output} (100%) rename tests/fe/{jacobians/cmp/generic => jacobians.output} (100%) rename tests/fe/{mapping/cmp/generic => mapping.output} (100%) rename tests/fe/{mapping_c1/cmp/generic => mapping_c1.output} (100%) rename tests/fe/{mapping_q1_eulerian/cmp/generic => mapping_q1_eulerian.output} (100%) rename tests/fe/{mapping_q_eulerian/cmp/generic => mapping_q_eulerian.output} (100%) rename tests/fe/{mapping_real_to_unit_02/cmp/generic => mapping_real_to_unit_02.output} (100%) rename tests/fe/{mapping_real_to_unit_q1/cmp/generic => mapping_real_to_unit_q1.output} (100%) rename tests/fe/{mapping_real_to_unit_q4_curved/cmp/generic => mapping_real_to_unit_q4_curved.output} (100%) rename tests/fe/{mapping_real_to_unit_q4_curved_codim/cmp/generic => mapping_real_to_unit_q4_curved_codim.output} (100%) rename tests/fe/{mapping_real_to_unit_q4_sphere/cmp/generic => mapping_real_to_unit_q4_sphere.output} (100%) rename tests/fe/{mapping_real_to_unit_q4_sphere_x/cmp/generic => mapping_real_to_unit_q4_sphere_x.output} (100%) rename tests/fe/{mapping_real_to_unit_q4_sphere_y/cmp/generic => mapping_real_to_unit_q4_sphere_y.output} (100%) rename tests/fe/{mapping_real_to_unit_q4_sphere_z/cmp/generic => mapping_real_to_unit_q4_sphere_z.output} (100%) rename tests/fe/{mapping_real_to_unit_q4_straight/cmp/generic => mapping_real_to_unit_q4_straight.output} (100%) rename tests/fe/{mass_matrix_arbitrary_nodes/cmp/generic => mass_matrix_arbitrary_nodes.output} (100%) rename tests/fe/{nedelec/cmp/generic => nedelec.output} (100%) rename tests/fe/{nedelec_2/cmp/generic => nedelec_2.output} (100%) rename tests/fe/{nedelec_3/cmp/generic => nedelec_3.output} (100%) rename tests/fe/{nedelec_crash_01/cmp/generic => nedelec_crash_01.output} (100%) rename tests/fe/{non_primitive_1/cmp/generic => non_primitive_1.output} (100%) rename tests/fe/{non_primitive_2/cmp/generic => non_primitive_2.output} (100%) rename tests/fe/{numbering/cmp/generic => numbering.output} (100%) rename tests/fe/{q_1/cmp/generic => q_1.output} (100%) rename tests/fe/{q_2/cmp/generic => q_2.output} (100%) rename tests/fe/{q_3/cmp/generic => q_3.output} (100%) rename tests/fe/{q_4/cmp/generic => q_4.output} (100%) rename tests/fe/{q_dg0_projection_01/cmp/generic => q_dg0_projection_01.output} (100%) delete mode 100644 tests/fe/q_dg0_projection_01/rt.gpl rename tests/fe/{q_iso_q1_projection_01/cmp/generic => q_iso_q1_projection_01.output} (100%) delete mode 100644 tests/fe/q_iso_q1_projection_01/rt.gpl rename tests/fe/{rt_1/cmp/generic => rt_1.output} (100%) delete mode 100644 tests/fe/rt_1/rt.gpl rename tests/fe/{rt_10/cmp/generic => rt_10.output} (100%) rename tests/fe/{rt_11/cmp/generic => rt_11.output} (100%) rename tests/fe/{rt_12/cmp/generic => rt_12.output} (100%) rename tests/fe/{rt_13/cmp/generic => rt_13.output} (100%) rename tests/fe/{rt_14/cmp/generic => rt_14.output} (100%) rename tests/fe/{rt_15/cmp/generic => rt_15.output} (100%) rename tests/fe/{rt_2/cmp/generic => rt_2.output} (100%) rename tests/fe/{rt_3/cmp/generic => rt_3.output} (100%) rename tests/fe/{rt_5/cmp/generic => rt_5.output} (100%) rename tests/fe/{rt_7/cmp/generic => rt_7.output} (100%) rename tests/fe/{rt_8/cmp/generic => rt_8.output} (100%) rename tests/fe/{rt_9/cmp/generic => rt_9.output} (100%) rename tests/fe/{rt_approximation_01/cmp/generic => rt_approximation_01.output} (100%) delete mode 100644 tests/fe/rt_approximation_01/rt.gpl rename tests/fe/{rt_normal_02/cmp/generic => rt_normal_02.output} (100%) delete mode 100644 tests/fe/rt_normal_02/rt.gpl rename tests/fe/{rt_projection_01/cmp/generic => rt_projection_01.output} (100%) delete mode 100644 tests/fe/rt_projection_01/rt.gpl rename tests/fe/{rtdiff/cmp/generic => rtdiff.output} (100%) rename tests/fe/{rtn_1/cmp/generic => rtn_1.output} (100%) rename tests/fe/{rtn_2/cmp/generic => rtn_2.output} (100%) rename tests/fe/{rtn_3/cmp/generic => rtn_3.output} (100%) rename tests/fe/{shapes_dgp/cmp/generic => shapes_dgp.output} (100%) rename tests/fe/{shapes_dgp_monomial/cmp/generic => shapes_dgp_monomial.output} (100%) rename tests/fe/{shapes_dgp_nonparametric/cmp/generic => shapes_dgp_nonparametric.output} (100%) rename tests/fe/{shapes_dgq/cmp/generic => shapes_dgq.output} (100%) rename tests/fe/{shapes_faceq/cmp/generic => shapes_faceq.output} (100%) rename tests/fe/{shapes_nedelec/cmp/generic => shapes_nedelec.output} (100%) rename tests/fe/{shapes_q/cmp/generic => shapes_q.output} (100%) rename tests/fe/{shapes_q_dg0/cmp/generic => shapes_q_dg0.output} (100%) rename tests/fe/{shapes_q_hierarchical/cmp/generic => shapes_q_hierarchical.output} (100%) rename tests/fe/{shapes_q_iso_q1/cmp/generic => shapes_q_iso_q1.output} (100%) rename tests/fe/{shapes_system/cmp/generic => shapes_system.output} (100%) rename tests/fe/{system_01/cmp/generic => system_01.output} (100%) rename tests/fe/{system_02/cmp/generic => system_02.output} (100%) rename tests/fe/{system_index/cmp/generic => system_index.output} (100%) rename tests/fe/{traits/cmp/generic => traits.output} (100%) rename tests/fe/{transfer/cmp/generic => transfer.output} (100%) rename tests/fe/{up_and_down/cmp/generic => up_and_down.output} (100%) diff --git a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake index 8b80bf7741..d25da5d0c9 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake @@ -52,41 +52,42 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) STRING(TOLOWER ${_build} _build_lowercase) SET(_test ${_test_name}.${_build_lowercase}) + SET(_full_test ${_category}-${_test_name}.${_build_lowercase}) - ADD_EXECUTABLE(${_test} EXCLUDE_FROM_ALL ${_test_name}.cc) + ADD_EXECUTABLE(${_full_test} EXCLUDE_FROM_ALL ${_test_name}.cc) - SET_TARGET_PROPERTIES(${_test} PROPERTIES + SET_TARGET_PROPERTIES(${_full_test} PROPERTIES LINK_FLAGS "${DEAL_II_LINKER_FLAGS} ${DEAL_II_LINKER_FLAGS_${_build}}" COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${_build}}" COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${_build}}" LINKER_LANGUAGE "CXX" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${_test}" ) - SET_PROPERTY(TARGET ${_test} APPEND PROPERTY + SET_PROPERTY(TARGET ${_full_test} APPEND PROPERTY INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/include" "${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/include/deal.II/" ) - SET_PROPERTY(TARGET ${_test} APPEND PROPERTY + SET_PROPERTY(TARGET ${_full_test} APPEND PROPERTY COMPILE_DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" ) - TARGET_LINK_LIBRARIES(${_test_name}.${_build_lowercase} + TARGET_LINK_LIBRARIES(${_full_test} ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX} ) ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output - COMMAND ${_test} + COMMAND ${_full_test} # TODO: Refactor: COMMAND ${PERL_EXECUTABLE} -pi ${CMAKE_SOURCE_DIR}/cmake/scripts/normalize.pl ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_test} - DEPENDS ${_test} ${CMAKE_SOURCE_DIR}/cmake/scripts/normalize.pl + DEPENDS ${_full_test} ${CMAKE_SOURCE_DIR}/cmake/scripts/normalize.pl ) - ADD_CUSTOM_TARGET(${_test}.run + ADD_CUSTOM_TARGET(${_full_test}.run DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output ) @@ -107,7 +108,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) ${CMAKE_CURRENT_BINARY_DIR}/${_test}/output ${_comparison} ) - ADD_CUSTOM_TARGET(${_test}.diff + ADD_CUSTOM_TARGET(${_full_test}.diff DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_test}/diff ) @@ -117,7 +118,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) ADD_TEST(NAME ${_category}/${_test} COMMAND ${CMAKE_COMMAND} - -DTEST=${_test} + -DTEST=${_full_test} -DTEST_SUFFIX=${_test_suffix} -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/scripts/run_test.cmake diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c171a61708..b94e7cf6bc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -81,7 +81,7 @@ ADD_SUBDIRECTORY(base) ADD_SUBDIRECTORY(codim_one) #deal.II #fail -#fe +ADD_SUBDIRECTORY(fe) #grid #hp #integrators diff --git a/tests/fe/CMakeLists.txt b/tests/fe/CMakeLists.txt index 34c42d8870..0efb828f2c 100644 --- a/tests/fe/CMakeLists.txt +++ b/tests/fe/CMakeLists.txt @@ -1,8 +1 @@ -GET_FILENAME_COMPONENT(_category ${CMAKE_CURRENT_SOURCE_DIR} NAME) - -FILE(GLOB _tests "*.cc") - -FOREACH(_test ${_tests}) - GET_FILENAME_COMPONENT(_test ${_test} NAME_WE) - DEAL_II_ADD_TEST(${_category} ${_test}) -ENDFOREACH() +DEAL_II_PICKUP_TESTS() diff --git a/tests/fe/Makefile b/tests/fe/Makefile deleted file mode 100644 index 3dc8d027c4..0000000000 --- a/tests/fe/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -############################################################ -# Makefile,v 1.15 2002/06/13 12:51:13 hartmann Exp -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors -############################################################ - -include ../Makefile.paths -include $D/common/Make.global_options -include ../Makefile.rules --include Makefile.depend --include Makefile.tests diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc index 8eaa4a15f7..74c345363b 100644 --- a/tests/fe/abf_01.cc +++ b/tests/fe/abf_01.cc @@ -586,7 +586,7 @@ int create_alternate_unitsquare (Triangulation<2> &tria) int main (int /*argc*/, char **/*argv*/) { - std::ofstream logfile ("abf_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; logfile << std::setprecision(PRECISION); diff --git a/tests/fe/abf_01/cmp/generic b/tests/fe/abf_01.output similarity index 100% rename from tests/fe/abf_01/cmp/generic rename to tests/fe/abf_01.output diff --git a/tests/fe/abf_projection_01.cc b/tests/fe/abf_projection_01.cc index 894cfd123b..614aa2c949 100644 --- a/tests/fe/abf_projection_01.cc +++ b/tests/fe/abf_projection_01.cc @@ -22,7 +22,7 @@ -char logname[] = "abf_projection_01/output"; +char logname[] = "output"; #include "deformed_projection.h" diff --git a/tests/fe/abf_projection_01/cmp/generic b/tests/fe/abf_projection_01.output similarity index 100% rename from tests/fe/abf_projection_01/cmp/generic rename to tests/fe/abf_projection_01.output diff --git a/tests/fe/block_mask_01.cc b/tests/fe/block_mask_01.cc index 3c90a97f38..c809830611 100644 --- a/tests/fe/block_mask_01.cc +++ b/tests/fe/block_mask_01.cc @@ -43,7 +43,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_01/cmp/generic b/tests/fe/block_mask_01.output similarity index 100% rename from tests/fe/block_mask_01/cmp/generic rename to tests/fe/block_mask_01.output diff --git a/tests/fe/block_mask_02.cc b/tests/fe/block_mask_02.cc index 3f17e34081..e7c6b9c173 100644 --- a/tests/fe/block_mask_02.cc +++ b/tests/fe/block_mask_02.cc @@ -60,7 +60,7 @@ int main() { deal_II_exceptions::disable_abort_on_exception(); - std::ofstream logfile ("block_mask_02/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_02/cmp/generic b/tests/fe/block_mask_02.output similarity index 100% rename from tests/fe/block_mask_02/cmp/generic rename to tests/fe/block_mask_02.output diff --git a/tests/fe/block_mask_03.cc b/tests/fe/block_mask_03.cc index 35e1d7557d..148bcabcf2 100644 --- a/tests/fe/block_mask_03.cc +++ b/tests/fe/block_mask_03.cc @@ -46,7 +46,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_03/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_03/cmp/generic b/tests/fe/block_mask_03.output similarity index 100% rename from tests/fe/block_mask_03/cmp/generic rename to tests/fe/block_mask_03.output diff --git a/tests/fe/block_mask_04.cc b/tests/fe/block_mask_04.cc index 1a511ab943..3ef9982183 100644 --- a/tests/fe/block_mask_04.cc +++ b/tests/fe/block_mask_04.cc @@ -41,7 +41,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_04/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_04/cmp/generic b/tests/fe/block_mask_04.output similarity index 100% rename from tests/fe/block_mask_04/cmp/generic rename to tests/fe/block_mask_04.output diff --git a/tests/fe/block_mask_05.cc b/tests/fe/block_mask_05.cc index 626f96fb3d..29b7fbd7d2 100644 --- a/tests/fe/block_mask_05.cc +++ b/tests/fe/block_mask_05.cc @@ -49,7 +49,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_05/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_05/cmp/generic b/tests/fe/block_mask_05.output similarity index 100% rename from tests/fe/block_mask_05/cmp/generic rename to tests/fe/block_mask_05.output diff --git a/tests/fe/block_mask_06.cc b/tests/fe/block_mask_06.cc index 879b210354..e49520699b 100644 --- a/tests/fe/block_mask_06.cc +++ b/tests/fe/block_mask_06.cc @@ -65,7 +65,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_06/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_06/cmp/generic b/tests/fe/block_mask_06.output similarity index 100% rename from tests/fe/block_mask_06/cmp/generic rename to tests/fe/block_mask_06.output diff --git a/tests/fe/block_mask_07.cc b/tests/fe/block_mask_07.cc index 5f220fddec..0d138ebc24 100644 --- a/tests/fe/block_mask_07.cc +++ b/tests/fe/block_mask_07.cc @@ -76,7 +76,7 @@ int main() { deal_II_exceptions::disable_abort_on_exception(); - std::ofstream logfile ("block_mask_07/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_07/cmp/generic b/tests/fe/block_mask_07.output similarity index 100% rename from tests/fe/block_mask_07/cmp/generic rename to tests/fe/block_mask_07.output diff --git a/tests/fe/block_mask_08.cc b/tests/fe/block_mask_08.cc index 3c063cdaa3..33dcaf68e4 100644 --- a/tests/fe/block_mask_08.cc +++ b/tests/fe/block_mask_08.cc @@ -49,7 +49,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_08/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_08/cmp/generic b/tests/fe/block_mask_08.output similarity index 100% rename from tests/fe/block_mask_08/cmp/generic rename to tests/fe/block_mask_08.output diff --git a/tests/fe/block_mask_09.cc b/tests/fe/block_mask_09.cc index 6c45d1d241..a949bc7644 100644 --- a/tests/fe/block_mask_09.cc +++ b/tests/fe/block_mask_09.cc @@ -53,7 +53,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_09/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_09/cmp/generic b/tests/fe/block_mask_09.output similarity index 100% rename from tests/fe/block_mask_09/cmp/generic rename to tests/fe/block_mask_09.output diff --git a/tests/fe/block_mask_10.cc b/tests/fe/block_mask_10.cc index f4ff500948..5d4a38ebe5 100644 --- a/tests/fe/block_mask_10.cc +++ b/tests/fe/block_mask_10.cc @@ -53,7 +53,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_10/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_10/cmp/generic b/tests/fe/block_mask_10.output similarity index 100% rename from tests/fe/block_mask_10/cmp/generic rename to tests/fe/block_mask_10.output diff --git a/tests/fe/block_mask_11.cc b/tests/fe/block_mask_11.cc index 0fbf79531c..12bd0839a3 100644 --- a/tests/fe/block_mask_11.cc +++ b/tests/fe/block_mask_11.cc @@ -63,7 +63,7 @@ void test () int main() { - std::ofstream logfile ("block_mask_11/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/block_mask_11/cmp/generic b/tests/fe/block_mask_11.output similarity index 100% rename from tests/fe/block_mask_11/cmp/generic rename to tests/fe/block_mask_11.output diff --git a/tests/fe/cell_similarity_01.cc b/tests/fe/cell_similarity_01.cc index 2413a869e8..a775f42e01 100644 --- a/tests/fe/cell_similarity_01.cc +++ b/tests/fe/cell_similarity_01.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_01/cmp/generic b/tests/fe/cell_similarity_01.output similarity index 100% rename from tests/fe/cell_similarity_01/cmp/generic rename to tests/fe/cell_similarity_01.output diff --git a/tests/fe/cell_similarity_02.cc b/tests/fe/cell_similarity_02.cc index 47e45915c1..f3abedbaa3 100644 --- a/tests/fe/cell_similarity_02.cc +++ b/tests/fe/cell_similarity_02.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_02/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_02/cmp/generic b/tests/fe/cell_similarity_02.output similarity index 100% rename from tests/fe/cell_similarity_02/cmp/generic rename to tests/fe/cell_similarity_02.output diff --git a/tests/fe/cell_similarity_03.cc b/tests/fe/cell_similarity_03.cc index 38811e0ecd..560e370884 100644 --- a/tests/fe/cell_similarity_03.cc +++ b/tests/fe/cell_similarity_03.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_03/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_03/cmp/generic b/tests/fe/cell_similarity_03.output similarity index 100% rename from tests/fe/cell_similarity_03/cmp/generic rename to tests/fe/cell_similarity_03.output diff --git a/tests/fe/cell_similarity_04.cc b/tests/fe/cell_similarity_04.cc index bf5b118060..06a44e2fa3 100644 --- a/tests/fe/cell_similarity_04.cc +++ b/tests/fe/cell_similarity_04.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_04/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_04/cmp/generic b/tests/fe/cell_similarity_04.output similarity index 100% rename from tests/fe/cell_similarity_04/cmp/generic rename to tests/fe/cell_similarity_04.output diff --git a/tests/fe/cell_similarity_05.cc b/tests/fe/cell_similarity_05.cc index 496e482ae3..92f3e798a9 100644 --- a/tests/fe/cell_similarity_05.cc +++ b/tests/fe/cell_similarity_05.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_05/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_05/cmp/generic b/tests/fe/cell_similarity_05.output similarity index 100% rename from tests/fe/cell_similarity_05/cmp/generic rename to tests/fe/cell_similarity_05.output diff --git a/tests/fe/cell_similarity_06.cc b/tests/fe/cell_similarity_06.cc index 85b697c4bd..ea25342768 100644 --- a/tests/fe/cell_similarity_06.cc +++ b/tests/fe/cell_similarity_06.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_06/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_06/cmp/generic b/tests/fe/cell_similarity_06.output similarity index 100% rename from tests/fe/cell_similarity_06/cmp/generic rename to tests/fe/cell_similarity_06.output diff --git a/tests/fe/cell_similarity_07.cc b/tests/fe/cell_similarity_07.cc index 4a2f4367ee..d68ce7406b 100644 --- a/tests/fe/cell_similarity_07.cc +++ b/tests/fe/cell_similarity_07.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_07/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_07/cmp/generic b/tests/fe/cell_similarity_07.output similarity index 100% rename from tests/fe/cell_similarity_07/cmp/generic rename to tests/fe/cell_similarity_07.output diff --git a/tests/fe/cell_similarity_08.cc b/tests/fe/cell_similarity_08.cc index bc4f3db8f3..5ec35b03d1 100644 --- a/tests/fe/cell_similarity_08.cc +++ b/tests/fe/cell_similarity_08.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_08/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_08/cmp/generic b/tests/fe/cell_similarity_08.output similarity index 100% rename from tests/fe/cell_similarity_08/cmp/generic rename to tests/fe/cell_similarity_08.output diff --git a/tests/fe/cell_similarity_09.cc b/tests/fe/cell_similarity_09.cc index 3e6bb4d4ed..f168c575ef 100644 --- a/tests/fe/cell_similarity_09.cc +++ b/tests/fe/cell_similarity_09.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_09/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_09/cmp/generic b/tests/fe/cell_similarity_09.output similarity index 100% rename from tests/fe/cell_similarity_09/cmp/generic rename to tests/fe/cell_similarity_09.output diff --git a/tests/fe/cell_similarity_10.cc b/tests/fe/cell_similarity_10.cc index 99ceda03ea..d595473a6d 100644 --- a/tests/fe/cell_similarity_10.cc +++ b/tests/fe/cell_similarity_10.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_10/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_10/cmp/generic b/tests/fe/cell_similarity_10.output similarity index 100% rename from tests/fe/cell_similarity_10/cmp/generic rename to tests/fe/cell_similarity_10.output diff --git a/tests/fe/cell_similarity_dgp_monomial_01.cc b/tests/fe/cell_similarity_dgp_monomial_01.cc index 1a6aed6f10..2d17109e8b 100644 --- a/tests/fe/cell_similarity_dgp_monomial_01.cc +++ b/tests/fe/cell_similarity_dgp_monomial_01.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_01/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_01.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_01/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_01.output diff --git a/tests/fe/cell_similarity_dgp_monomial_02.cc b/tests/fe/cell_similarity_dgp_monomial_02.cc index 827a55c94b..c92552b924 100644 --- a/tests/fe/cell_similarity_dgp_monomial_02.cc +++ b/tests/fe/cell_similarity_dgp_monomial_02.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_02/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_02/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_02.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_02/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_02.output diff --git a/tests/fe/cell_similarity_dgp_monomial_03.cc b/tests/fe/cell_similarity_dgp_monomial_03.cc index 8ee2f8377f..667829ef93 100644 --- a/tests/fe/cell_similarity_dgp_monomial_03.cc +++ b/tests/fe/cell_similarity_dgp_monomial_03.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_03/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_03/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_03.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_03/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_03.output diff --git a/tests/fe/cell_similarity_dgp_monomial_04.cc b/tests/fe/cell_similarity_dgp_monomial_04.cc index 1d866032f2..cc293f730e 100644 --- a/tests/fe/cell_similarity_dgp_monomial_04.cc +++ b/tests/fe/cell_similarity_dgp_monomial_04.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_04/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_04/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_04.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_04/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_04.output diff --git a/tests/fe/cell_similarity_dgp_monomial_05.cc b/tests/fe/cell_similarity_dgp_monomial_05.cc index 1354bedaf7..d0d8b7308d 100644 --- a/tests/fe/cell_similarity_dgp_monomial_05.cc +++ b/tests/fe/cell_similarity_dgp_monomial_05.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_05/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_05/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_05.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_05/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_05.output diff --git a/tests/fe/cell_similarity_dgp_monomial_06.cc b/tests/fe/cell_similarity_dgp_monomial_06.cc index d87f3d856b..320a751f4f 100644 --- a/tests/fe/cell_similarity_dgp_monomial_06.cc +++ b/tests/fe/cell_similarity_dgp_monomial_06.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_06/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_06/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_06.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_06/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_06.output diff --git a/tests/fe/cell_similarity_dgp_monomial_07.cc b/tests/fe/cell_similarity_dgp_monomial_07.cc index ff63963354..2e7ea87b06 100644 --- a/tests/fe/cell_similarity_dgp_monomial_07.cc +++ b/tests/fe/cell_similarity_dgp_monomial_07.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_07/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_07/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_07.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_07/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_07.output diff --git a/tests/fe/cell_similarity_dgp_monomial_08.cc b/tests/fe/cell_similarity_dgp_monomial_08.cc index a140e125c3..5a7a1c0241 100644 --- a/tests/fe/cell_similarity_dgp_monomial_08.cc +++ b/tests/fe/cell_similarity_dgp_monomial_08.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_08/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_08/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_08.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_08/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_08.output diff --git a/tests/fe/cell_similarity_dgp_monomial_09.cc b/tests/fe/cell_similarity_dgp_monomial_09.cc index 4a9b143273..70fc0c2cd2 100644 --- a/tests/fe/cell_similarity_dgp_monomial_09.cc +++ b/tests/fe/cell_similarity_dgp_monomial_09.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_09/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_09/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_09.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_09/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_09.output diff --git a/tests/fe/cell_similarity_dgp_monomial_10.cc b/tests/fe/cell_similarity_dgp_monomial_10.cc index 39818565a8..2674c78f07 100644 --- a/tests/fe/cell_similarity_dgp_monomial_10.cc +++ b/tests/fe/cell_similarity_dgp_monomial_10.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_monomial_10/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_monomial_10/cmp/generic b/tests/fe/cell_similarity_dgp_monomial_10.output similarity index 100% rename from tests/fe/cell_similarity_dgp_monomial_10/cmp/generic rename to tests/fe/cell_similarity_dgp_monomial_10.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_01.cc b/tests/fe/cell_similarity_dgp_nonparametric_01.cc index 9e90c6733a..9f8408ecf8 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_01.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_01.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_01/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_01.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_01/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_01.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_02.cc b/tests/fe/cell_similarity_dgp_nonparametric_02.cc index bc3aae1fa8..a0cedea1dc 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_02.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_02.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_02/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_02/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_02.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_02/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_02.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_03.cc b/tests/fe/cell_similarity_dgp_nonparametric_03.cc index 5f7c2f14c6..c9b5976413 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_03.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_03.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_03/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_03/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_03.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_03/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_03.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_04.cc b/tests/fe/cell_similarity_dgp_nonparametric_04.cc index 96734be13d..3a61ff3d76 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_04.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_04.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_04/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_04/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_04.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_04/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_04.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_05.cc b/tests/fe/cell_similarity_dgp_nonparametric_05.cc index c55a0a1f5d..0a97684c97 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_05.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_05.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_05/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_05/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_05.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_05/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_05.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_06.cc b/tests/fe/cell_similarity_dgp_nonparametric_06.cc index c0e6d25370..e8524ccbf4 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_06.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_06.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_06/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_06/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_06.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_06/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_06.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_07.cc b/tests/fe/cell_similarity_dgp_nonparametric_07.cc index 05cec04d67..956719459c 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_07.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_07.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_07/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_07/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_07.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_07/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_07.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_08.cc b/tests/fe/cell_similarity_dgp_nonparametric_08.cc index 9d16a82d83..75e708153b 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_08.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_08.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_08/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_08/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_08.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_08/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_08.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_09.cc b/tests/fe/cell_similarity_dgp_nonparametric_09.cc index 1514a16943..79262451cb 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_09.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_09.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_09/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_09/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_09.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_09/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_09.output diff --git a/tests/fe/cell_similarity_dgp_nonparametric_10.cc b/tests/fe/cell_similarity_dgp_nonparametric_10.cc index 6d9fa7b21f..73262ee965 100644 --- a/tests/fe/cell_similarity_dgp_nonparametric_10.cc +++ b/tests/fe/cell_similarity_dgp_nonparametric_10.cc @@ -166,7 +166,7 @@ void test() int main() { - std::ofstream logfile ("cell_similarity_dgp_nonparametric_10/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/cell_similarity_dgp_nonparametric_10/cmp/generic b/tests/fe/cell_similarity_dgp_nonparametric_10.output similarity index 100% rename from tests/fe/cell_similarity_dgp_nonparametric_10/cmp/generic rename to tests/fe/cell_similarity_dgp_nonparametric_10.output diff --git a/tests/fe/check_derivatives.cc b/tests/fe/check_derivatives.cc index ff87aacf57..ebe51611d4 100644 --- a/tests/fe/check_derivatives.cc +++ b/tests/fe/check_derivatives.cc @@ -144,7 +144,7 @@ void check1 (const unsigned int min_degree, int main() { - std::ofstream logfile ("check_derivatives/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(2); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/check_derivatives/cmp/generic b/tests/fe/check_derivatives.output similarity index 100% rename from tests/fe/check_derivatives/cmp/generic rename to tests/fe/check_derivatives.output diff --git a/tests/fe/component_mask_01.cc b/tests/fe/component_mask_01.cc index 06d2b1f253..1e0866bd55 100644 --- a/tests/fe/component_mask_01.cc +++ b/tests/fe/component_mask_01.cc @@ -43,7 +43,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_01/cmp/generic b/tests/fe/component_mask_01.output similarity index 100% rename from tests/fe/component_mask_01/cmp/generic rename to tests/fe/component_mask_01.output diff --git a/tests/fe/component_mask_02.cc b/tests/fe/component_mask_02.cc index a840c07cb0..661a543737 100644 --- a/tests/fe/component_mask_02.cc +++ b/tests/fe/component_mask_02.cc @@ -60,7 +60,7 @@ int main() { deal_II_exceptions::disable_abort_on_exception(); - std::ofstream logfile ("component_mask_02/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_02/cmp/generic b/tests/fe/component_mask_02.output similarity index 100% rename from tests/fe/component_mask_02/cmp/generic rename to tests/fe/component_mask_02.output diff --git a/tests/fe/component_mask_03.cc b/tests/fe/component_mask_03.cc index cf7698512e..872a68a045 100644 --- a/tests/fe/component_mask_03.cc +++ b/tests/fe/component_mask_03.cc @@ -46,7 +46,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_03/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_03/cmp/generic b/tests/fe/component_mask_03.output similarity index 100% rename from tests/fe/component_mask_03/cmp/generic rename to tests/fe/component_mask_03.output diff --git a/tests/fe/component_mask_04.cc b/tests/fe/component_mask_04.cc index e65028bb12..25b937f18b 100644 --- a/tests/fe/component_mask_04.cc +++ b/tests/fe/component_mask_04.cc @@ -41,7 +41,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_04/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_04/cmp/generic b/tests/fe/component_mask_04.output similarity index 100% rename from tests/fe/component_mask_04/cmp/generic rename to tests/fe/component_mask_04.output diff --git a/tests/fe/component_mask_05.cc b/tests/fe/component_mask_05.cc index 4bf8d7cfa0..15cf7b7eb2 100644 --- a/tests/fe/component_mask_05.cc +++ b/tests/fe/component_mask_05.cc @@ -49,7 +49,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_05/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_05/cmp/generic b/tests/fe/component_mask_05.output similarity index 100% rename from tests/fe/component_mask_05/cmp/generic rename to tests/fe/component_mask_05.output diff --git a/tests/fe/component_mask_06.cc b/tests/fe/component_mask_06.cc index f485bc1fb5..571c3c952f 100644 --- a/tests/fe/component_mask_06.cc +++ b/tests/fe/component_mask_06.cc @@ -65,7 +65,7 @@ int main() { deal_II_exceptions::disable_abort_on_exception(); - std::ofstream logfile ("component_mask_06/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_06/cmp/generic b/tests/fe/component_mask_06.output similarity index 100% rename from tests/fe/component_mask_06/cmp/generic rename to tests/fe/component_mask_06.output diff --git a/tests/fe/component_mask_07.cc b/tests/fe/component_mask_07.cc index f3c522dc02..dd026f0e23 100644 --- a/tests/fe/component_mask_07.cc +++ b/tests/fe/component_mask_07.cc @@ -76,7 +76,7 @@ int main() { deal_II_exceptions::disable_abort_on_exception(); - std::ofstream logfile ("component_mask_07/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_07/cmp/generic b/tests/fe/component_mask_07.output similarity index 100% rename from tests/fe/component_mask_07/cmp/generic rename to tests/fe/component_mask_07.output diff --git a/tests/fe/component_mask_08.cc b/tests/fe/component_mask_08.cc index 7f743d48d2..182a90da36 100644 --- a/tests/fe/component_mask_08.cc +++ b/tests/fe/component_mask_08.cc @@ -49,7 +49,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_08/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_08/cmp/generic b/tests/fe/component_mask_08.output similarity index 100% rename from tests/fe/component_mask_08/cmp/generic rename to tests/fe/component_mask_08.output diff --git a/tests/fe/component_mask_09.cc b/tests/fe/component_mask_09.cc index 2908f7c56b..b30c4fb802 100644 --- a/tests/fe/component_mask_09.cc +++ b/tests/fe/component_mask_09.cc @@ -53,7 +53,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_09/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_09/cmp/generic b/tests/fe/component_mask_09.output similarity index 100% rename from tests/fe/component_mask_09/cmp/generic rename to tests/fe/component_mask_09.output diff --git a/tests/fe/component_mask_10.cc b/tests/fe/component_mask_10.cc index c2d26947c8..24e68e0212 100644 --- a/tests/fe/component_mask_10.cc +++ b/tests/fe/component_mask_10.cc @@ -53,7 +53,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_10/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_10/cmp/generic b/tests/fe/component_mask_10.output similarity index 100% rename from tests/fe/component_mask_10/cmp/generic rename to tests/fe/component_mask_10.output diff --git a/tests/fe/component_mask_11.cc b/tests/fe/component_mask_11.cc index 16dc67dd00..0c36b15257 100644 --- a/tests/fe/component_mask_11.cc +++ b/tests/fe/component_mask_11.cc @@ -63,7 +63,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_11/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_11/cmp/generic b/tests/fe/component_mask_11.output similarity index 100% rename from tests/fe/component_mask_11/cmp/generic rename to tests/fe/component_mask_11.output diff --git a/tests/fe/component_mask_12.cc b/tests/fe/component_mask_12.cc index fb964e24e3..0e1c485340 100644 --- a/tests/fe/component_mask_12.cc +++ b/tests/fe/component_mask_12.cc @@ -73,7 +73,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_12/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_12/cmp/generic b/tests/fe/component_mask_12.output similarity index 100% rename from tests/fe/component_mask_12/cmp/generic rename to tests/fe/component_mask_12.output diff --git a/tests/fe/component_mask_13.cc b/tests/fe/component_mask_13.cc index 2e2f77439c..e009b56ebd 100644 --- a/tests/fe/component_mask_13.cc +++ b/tests/fe/component_mask_13.cc @@ -60,7 +60,7 @@ void test () int main() { - std::ofstream logfile ("component_mask_13/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_13/cmp/generic b/tests/fe/component_mask_13.output similarity index 100% rename from tests/fe/component_mask_13/cmp/generic rename to tests/fe/component_mask_13.output diff --git a/tests/fe/component_mask_14.cc b/tests/fe/component_mask_14.cc index a2117589f3..6212578b30 100644 --- a/tests/fe/component_mask_14.cc +++ b/tests/fe/component_mask_14.cc @@ -69,7 +69,7 @@ int main() { deal_II_exceptions::disable_abort_on_exception(); - std::ofstream logfile ("component_mask_14/output"); + std::ofstream logfile ("output"); deallog << std::setprecision (4); deallog.attach(logfile); diff --git a/tests/fe/component_mask_14/cmp/generic b/tests/fe/component_mask_14.output similarity index 100% rename from tests/fe/component_mask_14/cmp/generic rename to tests/fe/component_mask_14.output diff --git a/tests/fe/copy_01.cc b/tests/fe/copy_01.cc index fed37bb30b..9062e940f8 100644 --- a/tests/fe/copy_01.cc +++ b/tests/fe/copy_01.cc @@ -47,7 +47,7 @@ test(const unsigned int degree) int main() { - std::ofstream logfile ("copy_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/copy_01/cmp/generic b/tests/fe/copy_01.output similarity index 100% rename from tests/fe/copy_01/cmp/generic rename to tests/fe/copy_01.output diff --git a/tests/fe/copy_fe/cmp/generic b/tests/fe/copy_fe.output similarity index 100% rename from tests/fe/copy_fe/cmp/generic rename to tests/fe/copy_fe.output diff --git a/tests/fe/derivatives.cc b/tests/fe/derivatives.cc index a92615468a..bd32329ae3 100644 --- a/tests/fe/derivatives.cc +++ b/tests/fe/derivatives.cc @@ -144,7 +144,7 @@ void plot_FE_DGQ_shape_functions() int main() { - std::ofstream logfile ("derivatives/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(2); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/derivatives/cmp/generic b/tests/fe/derivatives.output similarity index 100% rename from tests/fe/derivatives/cmp/generic rename to tests/fe/derivatives.output diff --git a/tests/fe/derivatives_face.cc b/tests/fe/derivatives_face.cc index d5585ad702..7ba81c86a1 100644 --- a/tests/fe/derivatives_face.cc +++ b/tests/fe/derivatives_face.cc @@ -106,7 +106,7 @@ void plot_FE_DGQ_shape_functions() int main() { - std::ofstream logfile ("derivatives_face/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(2); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/derivatives_face/cmp/generic b/tests/fe/derivatives_face.output similarity index 100% rename from tests/fe/derivatives_face/cmp/generic rename to tests/fe/derivatives_face.output diff --git a/tests/fe/dgp_01.cc b/tests/fe/dgp_01.cc index 990aa8b744..42b63bbefb 100644 --- a/tests/fe/dgp_01.cc +++ b/tests/fe/dgp_01.cc @@ -67,7 +67,7 @@ test(const unsigned int degree) int main() { - std::ofstream logfile ("dgp_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/dgp_01/cmp/generic b/tests/fe/dgp_01.output similarity index 100% rename from tests/fe/dgp_01/cmp/generic rename to tests/fe/dgp_01.output diff --git a/tests/fe/dgp_monomial_1.cc b/tests/fe/dgp_monomial_1.cc index e76c1f5215..06fa543aca 100644 --- a/tests/fe/dgp_monomial_1.cc +++ b/tests/fe/dgp_monomial_1.cc @@ -62,7 +62,7 @@ test(const unsigned int degree) int main() { - std::ofstream logfile ("dgp_monomial_1/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/dgp_monomial_1/cmp/generic b/tests/fe/dgp_monomial_1.output similarity index 100% rename from tests/fe/dgp_monomial_1/cmp/generic rename to tests/fe/dgp_monomial_1.output diff --git a/tests/fe/dgp_monomial_2.cc b/tests/fe/dgp_monomial_2.cc index 3a72c8fb02..f909561f64 100644 --- a/tests/fe/dgp_monomial_2.cc +++ b/tests/fe/dgp_monomial_2.cc @@ -64,7 +64,7 @@ test(const unsigned int degree1, int main() { - std::ofstream logfile ("dgp_monomial_2/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/dgp_monomial_2/cmp/generic b/tests/fe/dgp_monomial_2.output similarity index 100% rename from tests/fe/dgp_monomial_2/cmp/generic rename to tests/fe/dgp_monomial_2.output diff --git a/tests/fe/dgq_1.cc b/tests/fe/dgq_1.cc index 849bfa689b..b7dc01dc5d 100644 --- a/tests/fe/dgq_1.cc +++ b/tests/fe/dgq_1.cc @@ -64,7 +64,7 @@ test(const unsigned int degree1, int main() { - std::ofstream logfile ("dgq_1/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/dgq_1/cmp/generic b/tests/fe/dgq_1.output similarity index 100% rename from tests/fe/dgq_1/cmp/generic rename to tests/fe/dgq_1.output diff --git a/tests/fe/face_to_cell_q1_2d.cc b/tests/fe/face_to_cell_q1_2d.cc index da4e1a7217..e43836a2e8 100644 --- a/tests/fe/face_to_cell_q1_2d.cc +++ b/tests/fe/face_to_cell_q1_2d.cc @@ -53,7 +53,7 @@ void test() int main() { - std::ofstream logfile("face_to_cell_q1_2d/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/face_to_cell_q1_2d/cmp/generic b/tests/fe/face_to_cell_q1_2d.output similarity index 100% rename from tests/fe/face_to_cell_q1_2d/cmp/generic rename to tests/fe/face_to_cell_q1_2d.output diff --git a/tests/fe/face_to_cell_q2_2d.cc b/tests/fe/face_to_cell_q2_2d.cc index c261b333c1..f4e3eb479b 100644 --- a/tests/fe/face_to_cell_q2_2d.cc +++ b/tests/fe/face_to_cell_q2_2d.cc @@ -53,7 +53,7 @@ void test() int main() { - std::ofstream logfile("face_to_cell_q2_2d/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/face_to_cell_q2_2d/cmp/generic b/tests/fe/face_to_cell_q2_2d.output similarity index 100% rename from tests/fe/face_to_cell_q2_2d/cmp/generic rename to tests/fe/face_to_cell_q2_2d.output diff --git a/tests/fe/face_to_cell_q2xq2_2d.cc b/tests/fe/face_to_cell_q2xq2_2d.cc index a515f9aff6..088a2d357e 100644 --- a/tests/fe/face_to_cell_q2xq2_2d.cc +++ b/tests/fe/face_to_cell_q2xq2_2d.cc @@ -55,7 +55,7 @@ void test() int main() { - std::ofstream logfile("face_to_cell_q2xq2_2d/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/face_to_cell_q2xq2_2d/cmp/generic b/tests/fe/face_to_cell_q2xq2_2d.output similarity index 100% rename from tests/fe/face_to_cell_q2xq2_2d/cmp/generic rename to tests/fe/face_to_cell_q2xq2_2d.output diff --git a/tests/fe/face_to_cell_q3_2d.cc b/tests/fe/face_to_cell_q3_2d.cc index cbbb5ffe75..9df5430abc 100644 --- a/tests/fe/face_to_cell_q3_2d.cc +++ b/tests/fe/face_to_cell_q3_2d.cc @@ -53,7 +53,7 @@ void test() int main() { - std::ofstream logfile("face_to_cell_q3_2d/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/face_to_cell_q3_2d/cmp/generic b/tests/fe/face_to_cell_q3_2d.output similarity index 100% rename from tests/fe/face_to_cell_q3_2d/cmp/generic rename to tests/fe/face_to_cell_q3_2d.output diff --git a/tests/fe/face_to_cell_q3xq4_2d.cc b/tests/fe/face_to_cell_q3xq4_2d.cc index 52c059e5ec..a69a2fd03b 100644 --- a/tests/fe/face_to_cell_q3xq4_2d.cc +++ b/tests/fe/face_to_cell_q3xq4_2d.cc @@ -55,7 +55,7 @@ void test() int main() { - std::ofstream logfile("face_to_cell_q3xq4_2d/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/face_to_cell_q3xq4_2d/cmp/generic b/tests/fe/face_to_cell_q3xq4_2d.output similarity index 100% rename from tests/fe/face_to_cell_q3xq4_2d/cmp/generic rename to tests/fe/face_to_cell_q3xq4_2d.output diff --git a/tests/fe/face_to_cell_q4_2d.cc b/tests/fe/face_to_cell_q4_2d.cc index f1e04c0b2f..d617d33753 100644 --- a/tests/fe/face_to_cell_q4_2d.cc +++ b/tests/fe/face_to_cell_q4_2d.cc @@ -53,7 +53,7 @@ void test() int main() { - std::ofstream logfile("face_to_cell_q4_2d/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/face_to_cell_q4_2d/cmp/generic b/tests/fe/face_to_cell_q4_2d.output similarity index 100% rename from tests/fe/face_to_cell_q4_2d/cmp/generic rename to tests/fe/face_to_cell_q4_2d.output diff --git a/tests/fe/fe_data_test.cc b/tests/fe/fe_data_test.cc index a6d48f1b3f..fd3857c342 100644 --- a/tests/fe/fe_data_test.cc +++ b/tests/fe/fe_data_test.cc @@ -247,7 +247,7 @@ void test_fe_datas() int main() { - std::ofstream logfile("fe_data_test/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/fe_data_test/cmp/generic b/tests/fe/fe_data_test.output similarity index 100% rename from tests/fe/fe_data_test/cmp/generic rename to tests/fe/fe_data_test.output diff --git a/tests/fe/fe_face_orientation_nedelec_0/cmp/generic b/tests/fe/fe_face_orientation_nedelec_0.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_0/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_0.output diff --git a/tests/fe/fe_face_orientation_nedelec_000/cmp/generic b/tests/fe/fe_face_orientation_nedelec_000.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_000/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_000.output diff --git a/tests/fe/fe_face_orientation_nedelec_001/cmp/generic b/tests/fe/fe_face_orientation_nedelec_001.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_001/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_001.output diff --git a/tests/fe/fe_face_orientation_nedelec_010/cmp/generic b/tests/fe/fe_face_orientation_nedelec_010.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_010/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_010.output diff --git a/tests/fe/fe_face_orientation_nedelec_011/cmp/generic b/tests/fe/fe_face_orientation_nedelec_011.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_011/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_011.output diff --git a/tests/fe/fe_face_orientation_nedelec_100/cmp/generic b/tests/fe/fe_face_orientation_nedelec_100.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_100/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_100.output diff --git a/tests/fe/fe_face_orientation_nedelec_101/cmp/generic b/tests/fe/fe_face_orientation_nedelec_101.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_101/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_101.output diff --git a/tests/fe/fe_face_orientation_nedelec_110/cmp/generic b/tests/fe/fe_face_orientation_nedelec_110.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_110/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_110.output diff --git a/tests/fe/fe_face_orientation_nedelec_111/cmp/generic b/tests/fe/fe_face_orientation_nedelec_111.output similarity index 100% rename from tests/fe/fe_face_orientation_nedelec_111/cmp/generic rename to tests/fe/fe_face_orientation_nedelec_111.output diff --git a/tests/fe/fe_face_values_1d.cc b/tests/fe/fe_face_values_1d.cc index f621b56b9f..01203ef104 100644 --- a/tests/fe/fe_face_values_1d.cc +++ b/tests/fe/fe_face_values_1d.cc @@ -179,7 +179,7 @@ void mapping_test() int main() { - std::ofstream logfile ("fe_face_values_1d/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/fe_face_values_1d/cmp/generic b/tests/fe/fe_face_values_1d.output similarity index 100% rename from tests/fe/fe_face_values_1d/cmp/generic rename to tests/fe/fe_face_values_1d.output diff --git a/tests/fe/fe_face_values_1d_mapping_cartesian.cc b/tests/fe/fe_face_values_1d_mapping_cartesian.cc index c72c8003db..45d4cb5483 100644 --- a/tests/fe/fe_face_values_1d_mapping_cartesian.cc +++ b/tests/fe/fe_face_values_1d_mapping_cartesian.cc @@ -178,7 +178,7 @@ void mapping_test() int main() { - std::ofstream logfile ("fe_face_values_1d_mapping_cartesian/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/fe_face_values_1d_mapping_cartesian/cmp/generic b/tests/fe/fe_face_values_1d_mapping_cartesian.output similarity index 100% rename from tests/fe/fe_face_values_1d_mapping_cartesian/cmp/generic rename to tests/fe/fe_face_values_1d_mapping_cartesian.output diff --git a/tests/fe/fe_face_values_1d_mapping_q2.cc b/tests/fe/fe_face_values_1d_mapping_q2.cc index ba1edc7d30..110f537e6e 100644 --- a/tests/fe/fe_face_values_1d_mapping_q2.cc +++ b/tests/fe/fe_face_values_1d_mapping_q2.cc @@ -178,7 +178,7 @@ void mapping_test() int main() { - std::ofstream logfile ("fe_face_values_1d_mapping_q2/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/fe_face_values_1d_mapping_q2/cmp/generic b/tests/fe/fe_face_values_1d_mapping_q2.output similarity index 100% rename from tests/fe/fe_face_values_1d_mapping_q2/cmp/generic rename to tests/fe/fe_face_values_1d_mapping_q2.output diff --git a/tests/fe/fe_prolongation_bdm/cmp/generic b/tests/fe/fe_prolongation_bdm.output similarity index 100% rename from tests/fe/fe_prolongation_bdm/cmp/generic rename to tests/fe/fe_prolongation_bdm.output diff --git a/tests/fe/fe_prolongation_dgp/cmp/generic b/tests/fe/fe_prolongation_dgp.output similarity index 100% rename from tests/fe/fe_prolongation_dgp/cmp/generic rename to tests/fe/fe_prolongation_dgp.output diff --git a/tests/fe/fe_prolongation_dgq/cmp/generic b/tests/fe/fe_prolongation_dgq.output similarity index 100% rename from tests/fe/fe_prolongation_dgq/cmp/generic rename to tests/fe/fe_prolongation_dgq.output diff --git a/tests/fe/fe_prolongation_nedelec/cmp/generic b/tests/fe/fe_prolongation_nedelec.output similarity index 100% rename from tests/fe/fe_prolongation_nedelec/cmp/generic rename to tests/fe/fe_prolongation_nedelec.output diff --git a/tests/fe/fe_prolongation_q/cmp/generic b/tests/fe/fe_prolongation_q.output similarity index 100% rename from tests/fe/fe_prolongation_q/cmp/generic rename to tests/fe/fe_prolongation_q.output diff --git a/tests/fe/fe_prolongation_q_dg0/cmp/generic b/tests/fe/fe_prolongation_q_dg0.output similarity index 100% rename from tests/fe/fe_prolongation_q_dg0/cmp/generic rename to tests/fe/fe_prolongation_q_dg0.output diff --git a/tests/fe/fe_prolongation_q_hierarchical/cmp/generic b/tests/fe/fe_prolongation_q_hierarchical.output similarity index 100% rename from tests/fe/fe_prolongation_q_hierarchical/cmp/generic rename to tests/fe/fe_prolongation_q_hierarchical.output diff --git a/tests/fe/fe_prolongation_q_iso_q1/cmp/generic b/tests/fe/fe_prolongation_q_iso_q1.output similarity index 100% rename from tests/fe/fe_prolongation_q_iso_q1/cmp/generic rename to tests/fe/fe_prolongation_q_iso_q1.output diff --git a/tests/fe/fe_prolongation_rt/cmp/generic b/tests/fe/fe_prolongation_rt.output similarity index 100% rename from tests/fe/fe_prolongation_rt/cmp/generic rename to tests/fe/fe_prolongation_rt.output diff --git a/tests/fe/fe_prolongation_sys_01/cmp/generic b/tests/fe/fe_prolongation_sys_01.output similarity index 100% rename from tests/fe/fe_prolongation_sys_01/cmp/generic rename to tests/fe/fe_prolongation_sys_01.output diff --git a/tests/fe/fe_prolongation_sys_02/cmp/generic b/tests/fe/fe_prolongation_sys_02.output similarity index 100% rename from tests/fe/fe_prolongation_sys_02/cmp/generic rename to tests/fe/fe_prolongation_sys_02.output diff --git a/tests/fe/fe_prolongation_sys_03/cmp/generic b/tests/fe/fe_prolongation_sys_03.output similarity index 100% rename from tests/fe/fe_prolongation_sys_03/cmp/generic rename to tests/fe/fe_prolongation_sys_03.output diff --git a/tests/fe/fe_prolongation_sys_04/cmp/generic b/tests/fe/fe_prolongation_sys_04.output similarity index 100% rename from tests/fe/fe_prolongation_sys_04/cmp/generic rename to tests/fe/fe_prolongation_sys_04.output diff --git a/tests/fe/fe_prolongation_sys_05/cmp/generic b/tests/fe/fe_prolongation_sys_05.output similarity index 100% rename from tests/fe/fe_prolongation_sys_05/cmp/generic rename to tests/fe/fe_prolongation_sys_05.output diff --git a/tests/fe/fe_prolongation_sys_06/cmp/generic b/tests/fe/fe_prolongation_sys_06.output similarity index 100% rename from tests/fe/fe_prolongation_sys_06/cmp/generic rename to tests/fe/fe_prolongation_sys_06.output diff --git a/tests/fe/fe_prolongation_sys_07/cmp/generic b/tests/fe/fe_prolongation_sys_07.output similarity index 100% rename from tests/fe/fe_prolongation_sys_07/cmp/generic rename to tests/fe/fe_prolongation_sys_07.output diff --git a/tests/fe/fe_prolongation_sys_08/cmp/generic b/tests/fe/fe_prolongation_sys_08.output similarity index 100% rename from tests/fe/fe_prolongation_sys_08/cmp/generic rename to tests/fe/fe_prolongation_sys_08.output diff --git a/tests/fe/fe_prolongation_sys_09/cmp/generic b/tests/fe/fe_prolongation_sys_09.output similarity index 100% rename from tests/fe/fe_prolongation_sys_09/cmp/generic rename to tests/fe/fe_prolongation_sys_09.output diff --git a/tests/fe/fe_prolongation_sys_10/cmp/generic b/tests/fe/fe_prolongation_sys_10.output similarity index 100% rename from tests/fe/fe_prolongation_sys_10/cmp/generic rename to tests/fe/fe_prolongation_sys_10.output diff --git a/tests/fe/fe_q_01.cc b/tests/fe/fe_q_01.cc index b4781c8f4f..fef6002e45 100644 --- a/tests/fe/fe_q_01.cc +++ b/tests/fe/fe_q_01.cc @@ -26,7 +26,7 @@ int main() { - std::ofstream logfile("fe_q_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deal_II_exceptions::disable_abort_on_exception(); diff --git a/tests/fe/fe_q_01/cmp/generic b/tests/fe/fe_q_01.output similarity index 100% rename from tests/fe/fe_q_01/cmp/generic rename to tests/fe/fe_q_01.output diff --git a/tests/fe/fe_q_dg0/cmp/generic b/tests/fe/fe_q_dg0.output similarity index 100% rename from tests/fe/fe_q_dg0/cmp/generic rename to tests/fe/fe_q_dg0.output diff --git a/tests/fe/fe_restriction_bdm/cmp/generic b/tests/fe/fe_restriction_bdm.output similarity index 100% rename from tests/fe/fe_restriction_bdm/cmp/generic rename to tests/fe/fe_restriction_bdm.output diff --git a/tests/fe/fe_restriction_dgp/cmp/generic b/tests/fe/fe_restriction_dgp.output similarity index 100% rename from tests/fe/fe_restriction_dgp/cmp/generic rename to tests/fe/fe_restriction_dgp.output diff --git a/tests/fe/fe_restriction_dgq/cmp/generic b/tests/fe/fe_restriction_dgq.output similarity index 100% rename from tests/fe/fe_restriction_dgq/cmp/generic rename to tests/fe/fe_restriction_dgq.output diff --git a/tests/fe/fe_restriction_nedelec/cmp/generic b/tests/fe/fe_restriction_nedelec.output similarity index 100% rename from tests/fe/fe_restriction_nedelec/cmp/generic rename to tests/fe/fe_restriction_nedelec.output diff --git a/tests/fe/fe_restriction_q/cmp/generic b/tests/fe/fe_restriction_q.output similarity index 100% rename from tests/fe/fe_restriction_q/cmp/generic rename to tests/fe/fe_restriction_q.output diff --git a/tests/fe/fe_restriction_q_dg0/cmp/generic b/tests/fe/fe_restriction_q_dg0.output similarity index 100% rename from tests/fe/fe_restriction_q_dg0/cmp/generic rename to tests/fe/fe_restriction_q_dg0.output diff --git a/tests/fe/fe_restriction_q_hierarchical/cmp/generic b/tests/fe/fe_restriction_q_hierarchical.output similarity index 100% rename from tests/fe/fe_restriction_q_hierarchical/cmp/generic rename to tests/fe/fe_restriction_q_hierarchical.output diff --git a/tests/fe/fe_restriction_q_iso_q1/cmp/generic b/tests/fe/fe_restriction_q_iso_q1.output similarity index 100% rename from tests/fe/fe_restriction_q_iso_q1/cmp/generic rename to tests/fe/fe_restriction_q_iso_q1.output diff --git a/tests/fe/fe_restriction_rt/cmp/generic b/tests/fe/fe_restriction_rt.output similarity index 100% rename from tests/fe/fe_restriction_rt/cmp/generic rename to tests/fe/fe_restriction_rt.output diff --git a/tests/fe/fe_restriction_sys_01/cmp/generic b/tests/fe/fe_restriction_sys_01.output similarity index 100% rename from tests/fe/fe_restriction_sys_01/cmp/generic rename to tests/fe/fe_restriction_sys_01.output diff --git a/tests/fe/fe_restriction_sys_02/cmp/generic b/tests/fe/fe_restriction_sys_02.output similarity index 100% rename from tests/fe/fe_restriction_sys_02/cmp/generic rename to tests/fe/fe_restriction_sys_02.output diff --git a/tests/fe/fe_restriction_sys_03/cmp/generic b/tests/fe/fe_restriction_sys_03.output similarity index 100% rename from tests/fe/fe_restriction_sys_03/cmp/generic rename to tests/fe/fe_restriction_sys_03.output diff --git a/tests/fe/fe_restriction_sys_04/cmp/generic b/tests/fe/fe_restriction_sys_04.output similarity index 100% rename from tests/fe/fe_restriction_sys_04/cmp/generic rename to tests/fe/fe_restriction_sys_04.output diff --git a/tests/fe/fe_restriction_sys_05/cmp/generic b/tests/fe/fe_restriction_sys_05.output similarity index 100% rename from tests/fe/fe_restriction_sys_05/cmp/generic rename to tests/fe/fe_restriction_sys_05.output diff --git a/tests/fe/fe_restriction_sys_06/cmp/generic b/tests/fe/fe_restriction_sys_06.output similarity index 100% rename from tests/fe/fe_restriction_sys_06/cmp/generic rename to tests/fe/fe_restriction_sys_06.output diff --git a/tests/fe/fe_restriction_sys_07/cmp/generic b/tests/fe/fe_restriction_sys_07.output similarity index 100% rename from tests/fe/fe_restriction_sys_07/cmp/generic rename to tests/fe/fe_restriction_sys_07.output diff --git a/tests/fe/fe_restriction_sys_08/cmp/generic b/tests/fe/fe_restriction_sys_08.output similarity index 100% rename from tests/fe/fe_restriction_sys_08/cmp/generic rename to tests/fe/fe_restriction_sys_08.output diff --git a/tests/fe/fe_restriction_sys_09/cmp/generic b/tests/fe/fe_restriction_sys_09.output similarity index 100% rename from tests/fe/fe_restriction_sys_09/cmp/generic rename to tests/fe/fe_restriction_sys_09.output diff --git a/tests/fe/fe_restriction_sys_10/cmp/generic b/tests/fe/fe_restriction_sys_10.output similarity index 100% rename from tests/fe/fe_restriction_sys_10/cmp/generic rename to tests/fe/fe_restriction_sys_10.output diff --git a/tests/fe/fe_support_points_bdm/cmp/generic b/tests/fe/fe_support_points_bdm.output similarity index 100% rename from tests/fe/fe_support_points_bdm/cmp/generic rename to tests/fe/fe_support_points_bdm.output diff --git a/tests/fe/fe_support_points_nedelec/cmp/generic b/tests/fe/fe_support_points_nedelec.output similarity index 100% rename from tests/fe/fe_support_points_nedelec/cmp/generic rename to tests/fe/fe_support_points_nedelec.output diff --git a/tests/fe/fe_support_points_q/cmp/generic b/tests/fe/fe_support_points_q.output similarity index 100% rename from tests/fe/fe_support_points_q/cmp/generic rename to tests/fe/fe_support_points_q.output diff --git a/tests/fe/fe_support_points_q_dg0/cmp/generic b/tests/fe/fe_support_points_q_dg0.output similarity index 100% rename from tests/fe/fe_support_points_q_dg0/cmp/generic rename to tests/fe/fe_support_points_q_dg0.output diff --git a/tests/fe/fe_support_points_q_hierarchical/cmp/generic b/tests/fe/fe_support_points_q_hierarchical.output similarity index 100% rename from tests/fe/fe_support_points_q_hierarchical/cmp/generic rename to tests/fe/fe_support_points_q_hierarchical.output diff --git a/tests/fe/fe_support_points_q_iso_q1/cmp/generic b/tests/fe/fe_support_points_q_iso_q1.output similarity index 100% rename from tests/fe/fe_support_points_q_iso_q1/cmp/generic rename to tests/fe/fe_support_points_q_iso_q1.output diff --git a/tests/fe/fe_support_points_q_qg0/cmp/generic b/tests/fe/fe_support_points_q_qg0.output similarity index 100% rename from tests/fe/fe_support_points_q_qg0/cmp/generic rename to tests/fe/fe_support_points_q_qg0.output diff --git a/tests/fe/fe_support_points_rt/cmp/generic b/tests/fe/fe_support_points_rt.output similarity index 100% rename from tests/fe/fe_support_points_rt/cmp/generic rename to tests/fe/fe_support_points_rt.output diff --git a/tests/fe/fe_support_points_sys_01/cmp/generic b/tests/fe/fe_support_points_sys_01.output similarity index 100% rename from tests/fe/fe_support_points_sys_01/cmp/generic rename to tests/fe/fe_support_points_sys_01.output diff --git a/tests/fe/fe_support_points_sys_02/cmp/generic b/tests/fe/fe_support_points_sys_02.output similarity index 100% rename from tests/fe/fe_support_points_sys_02/cmp/generic rename to tests/fe/fe_support_points_sys_02.output diff --git a/tests/fe/fe_support_points_sys_03/cmp/generic b/tests/fe/fe_support_points_sys_03.output similarity index 100% rename from tests/fe/fe_support_points_sys_03/cmp/generic rename to tests/fe/fe_support_points_sys_03.output diff --git a/tests/fe/fe_support_points_sys_04/cmp/generic b/tests/fe/fe_support_points_sys_04.output similarity index 100% rename from tests/fe/fe_support_points_sys_04/cmp/generic rename to tests/fe/fe_support_points_sys_04.output diff --git a/tests/fe/fe_support_points_sys_05/cmp/generic b/tests/fe/fe_support_points_sys_05.output similarity index 100% rename from tests/fe/fe_support_points_sys_05/cmp/generic rename to tests/fe/fe_support_points_sys_05.output diff --git a/tests/fe/fe_support_points_sys_06/cmp/generic b/tests/fe/fe_support_points_sys_06.output similarity index 100% rename from tests/fe/fe_support_points_sys_06/cmp/generic rename to tests/fe/fe_support_points_sys_06.output diff --git a/tests/fe/fe_support_points_sys_07/cmp/generic b/tests/fe/fe_support_points_sys_07.output similarity index 100% rename from tests/fe/fe_support_points_sys_07/cmp/generic rename to tests/fe/fe_support_points_sys_07.output diff --git a/tests/fe/fe_support_points_sys_08/cmp/generic b/tests/fe/fe_support_points_sys_08.output similarity index 100% rename from tests/fe/fe_support_points_sys_08/cmp/generic rename to tests/fe/fe_support_points_sys_08.output diff --git a/tests/fe/fe_support_points_sys_09/cmp/generic b/tests/fe/fe_support_points_sys_09.output similarity index 100% rename from tests/fe/fe_support_points_sys_09/cmp/generic rename to tests/fe/fe_support_points_sys_09.output diff --git a/tests/fe/fe_support_points_sys_10/cmp/generic b/tests/fe/fe_support_points_sys_10.output similarity index 100% rename from tests/fe/fe_support_points_sys_10/cmp/generic rename to tests/fe/fe_support_points_sys_10.output diff --git a/tests/fe/fe_sys_projection_01.cc b/tests/fe/fe_sys_projection_01.cc index ee47f2d36f..ba6fef305b 100644 --- a/tests/fe/fe_sys_projection_01.cc +++ b/tests/fe/fe_sys_projection_01.cc @@ -23,7 +23,7 @@ -char logname[] = "fe_sys_projection_01/output"; +char logname[] = "output"; #include "deformed_projection.h" diff --git a/tests/fe/fe_sys_projection_01/cmp/generic b/tests/fe/fe_sys_projection_01.output similarity index 100% rename from tests/fe/fe_sys_projection_01/cmp/generic rename to tests/fe/fe_sys_projection_01.output diff --git a/tests/fe/fe_sys_projection_01/rt.gpl b/tests/fe/fe_sys_projection_01/rt.gpl deleted file mode 100644 index 6a47c2f34e..0000000000 --- a/tests/fe/fe_sys_projection_01/rt.gpl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/gnuplot -persist -# -# -# G N U P L O T -# Version 4.0 patchlevel 0 -# last modified Thu Apr 15 14:44:22 CEST 2004 -# System: Linux 2.6.11.4-21.11-smp -# -# Copyright (C) 1986 - 1993, 1998, 2004, 2006 -# Thomas Williams, Colin Kelley and many others -# -# This is gnuplot version 4.0. Please refer to the documentation -# for command syntax changes. The old syntax will be accepted -# throughout the 4.0 series, but all save files use the new syntax. -# -# Type `help` to access the on-line reference manual. -# The gnuplot FAQ is available from -# http://www.gnuplot.info/faq/ -# -# Send comments and requests for help to -# -# Send bugs, suggestions and mods to -# -# -set terminal postscript eps color solid enhanced 20 -# set output -unset clip points -set clip one -unset clip two -set bar 1.000000 -set border 31 lt -1 lw 1.000 -set xdata -set ydata -set zdata -set x2data -set y2data -set timefmt x "%d/%m/%y,%H:%M" -set timefmt y "%d/%m/%y,%H:%M" -set timefmt z "%d/%m/%y,%H:%M" -set timefmt x2 "%d/%m/%y,%H:%M" -set timefmt y2 "%d/%m/%y,%H:%M" -set timefmt cb "%d/%m/%y,%H:%M" -set boxwidth -set style fill empty border -set dummy x,y -set format x "% g" -set format y "% g" -set format x2 "% g" -set format y2 "% g" -set format z "% g" -set format cb "% g" -set angles radians -unset grid -set key title "" -set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles -unset label -unset arrow -unset style line -unset style arrow -unset logscale -set offsets 0, 0, 0, 0 -set pointsize 1 -set encoding default -unset polar -unset parametric -unset decimalsign -set view 60, 20, 1, 1 -set samples 100, 100 -set isosamples 10, 10 -set surface -unset contour -set clabel '%8.3g' -set mapping cartesian -set datafile separator whitespace -set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover -set cntrparam order 4 -set cntrparam linear -set cntrparam levels auto 5 -set cntrparam points 5 -set size ratio 0 1,1 -set origin 0,0 -set style data lines -set style function lines -set xzeroaxis lt -2 lw 1.000 -set yzeroaxis lt -2 lw 1.000 -set x2zeroaxis lt -2 lw 1.000 -set y2zeroaxis lt -2 lw 1.000 -set tics in -set ticslevel 0.5 -set ticscale 1 0.5 -set mxtics default -set mytics default -set mztics default -set mx2tics default -set my2tics default -set mcbtics default -set xtics border mirror norotate autofreq -set ytics border mirror norotate autofreq -set ztics border nomirror norotate autofreq -set nox2tics -set noy2tics -set cbtics border mirror norotate autofreq -set title "" 0.000000,0.000000 font "" -set timestamp "" bottom norotate 0.000000,0.000000 "" -set rrange [ * : * ] noreverse nowriteback # (currently [0.00000:10.0000] ) -set trange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set urange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set vrange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set xlabel "x" 0.000000,0.000000 font "" -set x2label "" 0.000000,0.000000 font "" -set xrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set x2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set ylabel "y" 0.000000,0.000000 font "" -set y2label "" 0.000000,0.000000 font "" -set yrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set y2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zlabel "" 0.000000,0.000000 font "" -set zrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set cblabel "" 0.000000,0.000000 font "" -set cbrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zero 1e-08 -set lmargin -1 -set bmargin -1 -set rmargin -1 -set tmargin -1 -set locale "C" -set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean -unset pm3d -set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB -set palette rgbformulae 7, 5, 15 -set colorbox default -set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault -set loadpath -set fontpath -set fit noerrorvariables -set output "RT1_00_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x" -set output "RT1_00_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y" -set output "RT1_01_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x" -set output "RT1_01_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y" -set output "RT1_02_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x" -set output "RT1_02_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y" -set output "RT1_03_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x" -set output "RT1_03_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y" -set output "RT1_04_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x" -set output "RT1_04_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y" -set output "RT1_05_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x" -set output "RT1_05_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y" -set output "RT1_06_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x" -set output "RT1_06_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y" -set output "RT1_07_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x" -set output "RT1_07_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y" -set output "RT1_08_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x" -set output "RT1_08_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y" -set output "RT1_09_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x" -set output "RT1_09_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y" -set output "RT1_10_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x" -set output "RT1_10_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y" -set output "RT1_11_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x" -set output "RT1_11_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y" -# EOF diff --git a/tests/fe/fe_tools.cc b/tests/fe/fe_tools.cc index d342ebcb15..10d7c48f2f 100644 --- a/tests/fe/fe_tools.cc +++ b/tests/fe/fe_tools.cc @@ -198,7 +198,7 @@ void test_renumbering() int main() { - std::ofstream logfile("fe_tools/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/fe_tools/cmp/generic b/tests/fe/fe_tools.output similarity index 100% rename from tests/fe/fe_tools/cmp/generic rename to tests/fe/fe_tools.output diff --git a/tests/fe/fe_tools_01.cc b/tests/fe/fe_tools_01.cc index c6e0ac7a32..16006f1629 100644 --- a/tests/fe/fe_tools_01.cc +++ b/tests/fe/fe_tools_01.cc @@ -46,7 +46,7 @@ void test_fe(const char *name) int main() { - std::ofstream logfile("fe_tools_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/fe_tools_01/cmp/generic b/tests/fe/fe_tools_01.output similarity index 100% rename from tests/fe/fe_tools_01/cmp/generic rename to tests/fe/fe_tools_01.output diff --git a/tests/fe/fe_tools_test.cc b/tests/fe/fe_tools_test.cc index 741b3355df..8e3d999c95 100644 --- a/tests/fe/fe_tools_test.cc +++ b/tests/fe/fe_tools_test.cc @@ -192,7 +192,7 @@ void test(const Triangulation &tria, int main () { - std::ofstream logfile("fe_tools_test/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/fe_tools_test/cmp/generic b/tests/fe/fe_tools_test.output similarity index 100% rename from tests/fe/fe_tools_test/cmp/generic rename to tests/fe/fe_tools_test.output diff --git a/tests/fe/function.cc b/tests/fe/function.cc index 2e535eb849..c5491fe564 100644 --- a/tests/fe/function.cc +++ b/tests/fe/function.cc @@ -98,7 +98,7 @@ void test_vectors() int main() { - std::ofstream logfile("function/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/function/cmp/generic b/tests/fe/function.output similarity index 100% rename from tests/fe/function/cmp/generic rename to tests/fe/function.output diff --git a/tests/fe/abf_projection_01/rt.gpl b/tests/fe/grids/rt.gpl similarity index 100% rename from tests/fe/abf_projection_01/rt.gpl rename to tests/fe/grids/rt.gpl diff --git a/tests/fe/injection_dgp_monomial.cc b/tests/fe/injection_dgp_monomial.cc index 35c014f6dd..84d786ab89 100644 --- a/tests/fe/injection_dgp_monomial.cc +++ b/tests/fe/injection_dgp_monomial.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_dgp_monomial/output"; +char logname[] = "output"; #include "injection_common.h" diff --git a/tests/fe/injection_dgp_monomial/cmp/generic b/tests/fe/injection_dgp_monomial.output similarity index 100% rename from tests/fe/injection_dgp_monomial/cmp/generic rename to tests/fe/injection_dgp_monomial.output diff --git a/tests/fe/injection_dgq.cc b/tests/fe/injection_dgq.cc index 56f9edd4f2..4121077389 100644 --- a/tests/fe/injection_dgq.cc +++ b/tests/fe/injection_dgq.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_dgq/output"; +char logname[] = "output"; #include "injection_common.h" diff --git a/tests/fe/injection_dgq/cmp/generic b/tests/fe/injection_dgq.output similarity index 100% rename from tests/fe/injection_dgq/cmp/generic rename to tests/fe/injection_dgq.output diff --git a/tests/fe/injection_q.cc b/tests/fe/injection_q.cc index 514dfee724..fc26559344 100644 --- a/tests/fe/injection_q.cc +++ b/tests/fe/injection_q.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_q/output"; +char logname[] = "output"; #include "injection_common.h" diff --git a/tests/fe/injection_q/cmp/generic b/tests/fe/injection_q.output similarity index 100% rename from tests/fe/injection_q/cmp/generic rename to tests/fe/injection_q.output diff --git a/tests/fe/injection_q_dg0.cc b/tests/fe/injection_q_dg0.cc index 300c0bdb8e..e7984787d4 100644 --- a/tests/fe/injection_q_dg0.cc +++ b/tests/fe/injection_q_dg0.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_q_dg0/output"; +char logname[] = "output"; #include "injection_common.h" diff --git a/tests/fe/injection_q_dg0/cmp/generic b/tests/fe/injection_q_dg0.output similarity index 100% rename from tests/fe/injection_q_dg0/cmp/generic rename to tests/fe/injection_q_dg0.output diff --git a/tests/fe/injection_q_iso_q1.cc b/tests/fe/injection_q_iso_q1.cc index 849f54289b..7c8649d4e1 100644 --- a/tests/fe/injection_q_iso_q1.cc +++ b/tests/fe/injection_q_iso_q1.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_q_iso_q1/output"; +char logname[] = "output"; #include "injection_common.h" diff --git a/tests/fe/injection_q_iso_q1/cmp/generic b/tests/fe/injection_q_iso_q1.output similarity index 100% rename from tests/fe/injection_q_iso_q1/cmp/generic rename to tests/fe/injection_q_iso_q1.output diff --git a/tests/fe/injection_q_system.cc b/tests/fe/injection_q_system.cc index 8109aafcd7..1b781ee836 100644 --- a/tests/fe/injection_q_system.cc +++ b/tests/fe/injection_q_system.cc @@ -16,7 +16,7 @@ -char logname[] = "injection_q_system/output"; +char logname[] = "output"; #include "injection_common.h" diff --git a/tests/fe/injection_q_system/cmp/generic b/tests/fe/injection_q_system.output similarity index 100% rename from tests/fe/injection_q_system/cmp/generic rename to tests/fe/injection_q_system.output diff --git a/tests/fe/interpolate_q1.cc b/tests/fe/interpolate_q1.cc index 7f96f85452..493de99708 100644 --- a/tests/fe/interpolate_q1.cc +++ b/tests/fe/interpolate_q1.cc @@ -102,7 +102,7 @@ void check_dg_lobatto(const Function &f, int main() { - std::ofstream logfile ("interpolate_q1/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(2.e-15); diff --git a/tests/fe/interpolate_q1/cmp/generic b/tests/fe/interpolate_q1.output similarity index 100% rename from tests/fe/interpolate_q1/cmp/generic rename to tests/fe/interpolate_q1.output diff --git a/tests/fe/interpolate_q_dg0.cc b/tests/fe/interpolate_q_dg0.cc index a0e6dcef92..fd6f0fb970 100644 --- a/tests/fe/interpolate_q_dg0.cc +++ b/tests/fe/interpolate_q_dg0.cc @@ -49,7 +49,7 @@ void check_q_dg0(const Function &f, int main() { - std::ofstream logfile ("interpolate_q_dg0/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(2.e-15); diff --git a/tests/fe/interpolate_q_dg0/cmp/generic b/tests/fe/interpolate_q_dg0.output similarity index 100% rename from tests/fe/interpolate_q_dg0/cmp/generic rename to tests/fe/interpolate_q_dg0.output diff --git a/tests/fe/interpolate_q_iso_q1.cc b/tests/fe/interpolate_q_iso_q1.cc index afdb76e61d..b566213b37 100644 --- a/tests/fe/interpolate_q_iso_q1.cc +++ b/tests/fe/interpolate_q_iso_q1.cc @@ -51,7 +51,7 @@ void check(const Function &f, int main() { - std::ofstream logfile ("interpolate_q_iso_q1/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(2.e-15); diff --git a/tests/fe/interpolate_q_iso_q1/cmp/generic b/tests/fe/interpolate_q_iso_q1.output similarity index 100% rename from tests/fe/interpolate_q_iso_q1/cmp/generic rename to tests/fe/interpolate_q_iso_q1.output diff --git a/tests/fe/interpolate_rt.cc b/tests/fe/interpolate_rt.cc index 0d72e6386d..84942c469c 100644 --- a/tests/fe/interpolate_rt.cc +++ b/tests/fe/interpolate_rt.cc @@ -55,7 +55,7 @@ void check1(const Function &f, int main() { - std::ofstream logfile ("interpolate_rt/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-15); diff --git a/tests/fe/interpolate_rt/cmp/generic b/tests/fe/interpolate_rt.output similarity index 100% rename from tests/fe/interpolate_rt/cmp/generic rename to tests/fe/interpolate_rt.output diff --git a/tests/fe/interpolate_rtn.cc b/tests/fe/interpolate_rtn.cc index 6f4059555a..c231acc837 100644 --- a/tests/fe/interpolate_rtn.cc +++ b/tests/fe/interpolate_rtn.cc @@ -55,7 +55,7 @@ void check1(const Function &f, int main() { - std::ofstream logfile ("interpolate_rtn/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-13); diff --git a/tests/fe/interpolate_rtn/cmp/generic b/tests/fe/interpolate_rtn.output similarity index 100% rename from tests/fe/interpolate_rtn/cmp/generic rename to tests/fe/interpolate_rtn.output diff --git a/tests/fe/interpolate_system.cc b/tests/fe/interpolate_system.cc index 4b4671d8c0..866c1906a2 100644 --- a/tests/fe/interpolate_system.cc +++ b/tests/fe/interpolate_system.cc @@ -89,7 +89,7 @@ void check3(const Function &f, int main() { - std::ofstream logfile ("interpolate_system/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-15); diff --git a/tests/fe/interpolate_system/cmp/generic b/tests/fe/interpolate_system.output similarity index 100% rename from tests/fe/interpolate_system/cmp/generic rename to tests/fe/interpolate_system.output diff --git a/tests/fe/jacobians.cc b/tests/fe/jacobians.cc index a5db1da27c..4351b19054 100644 --- a/tests/fe/jacobians.cc +++ b/tests/fe/jacobians.cc @@ -79,7 +79,7 @@ void test() int main() { - std::ofstream logfile ("jacobians/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(4) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/jacobians/cmp/generic b/tests/fe/jacobians.output similarity index 100% rename from tests/fe/jacobians/cmp/generic rename to tests/fe/jacobians.output diff --git a/tests/fe/mapping.cc b/tests/fe/mapping.cc index c5bb235830..d646edf3aa 100644 --- a/tests/fe/mapping.cc +++ b/tests/fe/mapping.cc @@ -551,7 +551,7 @@ void mapping_test() int main() { - std::ofstream logfile ("mapping/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/mapping/cmp/generic b/tests/fe/mapping.output similarity index 100% rename from tests/fe/mapping/cmp/generic rename to tests/fe/mapping.output diff --git a/tests/fe/mapping_c1.cc b/tests/fe/mapping_c1.cc index c68ce89937..fdcfa070c5 100644 --- a/tests/fe/mapping_c1.cc +++ b/tests/fe/mapping_c1.cc @@ -34,7 +34,7 @@ int main () { - std::ofstream logfile ("mapping_c1/output"); + std::ofstream logfile ("output"); deallog << std::fixed; deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/mapping_c1/cmp/generic b/tests/fe/mapping_c1.output similarity index 100% rename from tests/fe/mapping_c1/cmp/generic rename to tests/fe/mapping_c1.output diff --git a/tests/fe/mapping_q1_eulerian.cc b/tests/fe/mapping_q1_eulerian.cc index 28f716cb59..e4252ddd5b 100644 --- a/tests/fe/mapping_q1_eulerian.cc +++ b/tests/fe/mapping_q1_eulerian.cc @@ -102,7 +102,7 @@ void show_values() int main() { - std::ofstream logfile ("mapping_q1_eulerian/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(2); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/mapping_q1_eulerian/cmp/generic b/tests/fe/mapping_q1_eulerian.output similarity index 100% rename from tests/fe/mapping_q1_eulerian/cmp/generic rename to tests/fe/mapping_q1_eulerian.output diff --git a/tests/fe/mapping_q_eulerian.cc b/tests/fe/mapping_q_eulerian.cc index 2bffbb0822..ff18ec68c0 100644 --- a/tests/fe/mapping_q_eulerian.cc +++ b/tests/fe/mapping_q_eulerian.cc @@ -243,7 +243,7 @@ void MappingTest::graphical_output () int main () { - std::ofstream logfile ("mapping_q_eulerian/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(2); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/mapping_q_eulerian/cmp/generic b/tests/fe/mapping_q_eulerian.output similarity index 100% rename from tests/fe/mapping_q_eulerian/cmp/generic rename to tests/fe/mapping_q_eulerian.output diff --git a/tests/fe/mapping_real_to_unit_02.cc b/tests/fe/mapping_real_to_unit_02.cc index 3cc33e2bae..9c9af6b097 100644 --- a/tests/fe/mapping_real_to_unit_02.cc +++ b/tests/fe/mapping_real_to_unit_02.cc @@ -79,7 +79,7 @@ void test2() int main() { - std::ofstream logfile ("mapping_real_to_unit_02/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_02/cmp/generic b/tests/fe/mapping_real_to_unit_02.output similarity index 100% rename from tests/fe/mapping_real_to_unit_02/cmp/generic rename to tests/fe/mapping_real_to_unit_02.output diff --git a/tests/fe/mapping_real_to_unit_q1.cc b/tests/fe/mapping_real_to_unit_q1.cc index b766bbb24f..8ee4408b98 100644 --- a/tests/fe/mapping_real_to_unit_q1.cc +++ b/tests/fe/mapping_real_to_unit_q1.cc @@ -108,7 +108,7 @@ void test_real_to_unit_cell() int main() { - std::ofstream logfile ("mapping_real_to_unit_q1/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_q1/cmp/generic b/tests/fe/mapping_real_to_unit_q1.output similarity index 100% rename from tests/fe/mapping_real_to_unit_q1/cmp/generic rename to tests/fe/mapping_real_to_unit_q1.output diff --git a/tests/fe/mapping_real_to_unit_q4_curved.cc b/tests/fe/mapping_real_to_unit_q4_curved.cc index f8a90094ad..3eb7e558cf 100644 --- a/tests/fe/mapping_real_to_unit_q4_curved.cc +++ b/tests/fe/mapping_real_to_unit_q4_curved.cc @@ -110,7 +110,7 @@ void test_real_to_unit_cell() int main() { - std::ofstream logfile ("mapping_real_to_unit_q4_curved/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_q4_curved/cmp/generic b/tests/fe/mapping_real_to_unit_q4_curved.output similarity index 100% rename from tests/fe/mapping_real_to_unit_q4_curved/cmp/generic rename to tests/fe/mapping_real_to_unit_q4_curved.output diff --git a/tests/fe/mapping_real_to_unit_q4_curved_codim.cc b/tests/fe/mapping_real_to_unit_q4_curved_codim.cc index 58dc655361..fd2c553cf4 100644 --- a/tests/fe/mapping_real_to_unit_q4_curved_codim.cc +++ b/tests/fe/mapping_real_to_unit_q4_curved_codim.cc @@ -110,7 +110,7 @@ void test_real_to_unit_cell() int main() { - std::ofstream logfile ("mapping_real_to_unit_q4_curved_codim/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_q4_curved_codim/cmp/generic b/tests/fe/mapping_real_to_unit_q4_curved_codim.output similarity index 100% rename from tests/fe/mapping_real_to_unit_q4_curved_codim/cmp/generic rename to tests/fe/mapping_real_to_unit_q4_curved_codim.output diff --git a/tests/fe/mapping_real_to_unit_q4_sphere.cc b/tests/fe/mapping_real_to_unit_q4_sphere.cc index 8a46c0b5aa..047e15a769 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere.cc @@ -100,7 +100,7 @@ void test_real_to_unit_cell() int main() { - std::ofstream logfile ("mapping_real_to_unit_q4_sphere/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_q4_sphere/cmp/generic b/tests/fe/mapping_real_to_unit_q4_sphere.output similarity index 100% rename from tests/fe/mapping_real_to_unit_q4_sphere/cmp/generic rename to tests/fe/mapping_real_to_unit_q4_sphere.output diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_x.cc b/tests/fe/mapping_real_to_unit_q4_sphere_x.cc index 2760cfcd73..8af5d89bc9 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_x.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_x.cc @@ -92,7 +92,7 @@ void test_real_to_unit_cell() int main() { - std::ofstream logfile ("mapping_real_to_unit_q4_sphere_x/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_x/cmp/generic b/tests/fe/mapping_real_to_unit_q4_sphere_x.output similarity index 100% rename from tests/fe/mapping_real_to_unit_q4_sphere_x/cmp/generic rename to tests/fe/mapping_real_to_unit_q4_sphere_x.output diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_y.cc b/tests/fe/mapping_real_to_unit_q4_sphere_y.cc index 3c0a1b5f08..a96c6bc26c 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_y.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_y.cc @@ -101,7 +101,7 @@ void test_real_to_unit_cell() int main() { - std::ofstream logfile ("mapping_real_to_unit_q4_sphere_y/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_y/cmp/generic b/tests/fe/mapping_real_to_unit_q4_sphere_y.output similarity index 100% rename from tests/fe/mapping_real_to_unit_q4_sphere_y/cmp/generic rename to tests/fe/mapping_real_to_unit_q4_sphere_y.output diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_z.cc b/tests/fe/mapping_real_to_unit_q4_sphere_z.cc index 462e278c17..3a839f6764 100644 --- a/tests/fe/mapping_real_to_unit_q4_sphere_z.cc +++ b/tests/fe/mapping_real_to_unit_q4_sphere_z.cc @@ -83,7 +83,7 @@ void test_real_to_unit_cell() int main() { - std::ofstream logfile ("mapping_real_to_unit_q4_sphere_z/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_q4_sphere_z/cmp/generic b/tests/fe/mapping_real_to_unit_q4_sphere_z.output similarity index 100% rename from tests/fe/mapping_real_to_unit_q4_sphere_z/cmp/generic rename to tests/fe/mapping_real_to_unit_q4_sphere_z.output diff --git a/tests/fe/mapping_real_to_unit_q4_straight.cc b/tests/fe/mapping_real_to_unit_q4_straight.cc index fd46ff276e..a9330614f0 100644 --- a/tests/fe/mapping_real_to_unit_q4_straight.cc +++ b/tests/fe/mapping_real_to_unit_q4_straight.cc @@ -113,7 +113,7 @@ void test_real_to_unit_cell() int main() { - std::ofstream logfile ("mapping_real_to_unit_q4_straight/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mapping_real_to_unit_q4_straight/cmp/generic b/tests/fe/mapping_real_to_unit_q4_straight.output similarity index 100% rename from tests/fe/mapping_real_to_unit_q4_straight/cmp/generic rename to tests/fe/mapping_real_to_unit_q4_straight.output diff --git a/tests/fe/mass_matrix_arbitrary_nodes.cc b/tests/fe/mass_matrix_arbitrary_nodes.cc index 39f044ab4d..b60ed6d0a0 100644 --- a/tests/fe/mass_matrix_arbitrary_nodes.cc +++ b/tests/fe/mass_matrix_arbitrary_nodes.cc @@ -81,7 +81,7 @@ void check () int main () { - std::ofstream logfile("mass_matrix_arbitrary_nodes/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/mass_matrix_arbitrary_nodes/cmp/generic b/tests/fe/mass_matrix_arbitrary_nodes.output similarity index 100% rename from tests/fe/mass_matrix_arbitrary_nodes/cmp/generic rename to tests/fe/mass_matrix_arbitrary_nodes.output diff --git a/tests/fe/nedelec.cc b/tests/fe/nedelec.cc index 74c53dd4b4..97bc32e522 100644 --- a/tests/fe/nedelec.cc +++ b/tests/fe/nedelec.cc @@ -24,7 +24,7 @@ // gnuplot file for the values of functions of degree K with // transformation N, do -// perl -n -e 'print if s/DEAL:NedelecK-TransformN::value//' nedelec/output +// perl -n -e 'print if s/DEAL:NedelecK-TransformN::value//' output #include "../tests.h" #include @@ -171,7 +171,7 @@ plot_shape_functions(const unsigned int degree) int main() { - std::ofstream logfile ("nedelec/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/nedelec/cmp/generic b/tests/fe/nedelec.output similarity index 100% rename from tests/fe/nedelec/cmp/generic rename to tests/fe/nedelec.output diff --git a/tests/fe/nedelec_2.cc b/tests/fe/nedelec_2.cc index 2c69476b54..2f9fdfff5e 100644 --- a/tests/fe/nedelec_2.cc +++ b/tests/fe/nedelec_2.cc @@ -198,7 +198,7 @@ check (const unsigned int p) int main() { - std::ofstream logfile ("nedelec_2/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/nedelec_2/cmp/generic b/tests/fe/nedelec_2.output similarity index 100% rename from tests/fe/nedelec_2/cmp/generic rename to tests/fe/nedelec_2.output diff --git a/tests/fe/nedelec_3.cc b/tests/fe/nedelec_3.cc index 65e0e039a7..d42754bec0 100644 --- a/tests/fe/nedelec_3.cc +++ b/tests/fe/nedelec_3.cc @@ -112,7 +112,7 @@ check (const unsigned int p) int main() { - std::ofstream logfile ("nedelec_3/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/nedelec_3/cmp/generic b/tests/fe/nedelec_3.output similarity index 100% rename from tests/fe/nedelec_3/cmp/generic rename to tests/fe/nedelec_3.output diff --git a/tests/fe/nedelec_crash_01.cc b/tests/fe/nedelec_crash_01.cc index 592827b9f6..ec2f7c20cd 100644 --- a/tests/fe/nedelec_crash_01.cc +++ b/tests/fe/nedelec_crash_01.cc @@ -31,7 +31,7 @@ int main() { - const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output"); + const std::string logname = "/output"; std::ofstream logfile(logname.c_str()); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/nedelec_crash_01/cmp/generic b/tests/fe/nedelec_crash_01.output similarity index 100% rename from tests/fe/nedelec_crash_01/cmp/generic rename to tests/fe/nedelec_crash_01.output diff --git a/tests/fe/non_primitive_1.cc b/tests/fe/non_primitive_1.cc index 1e390f682c..2a53b760c7 100644 --- a/tests/fe/non_primitive_1.cc +++ b/tests/fe/non_primitive_1.cc @@ -331,7 +331,7 @@ test () int main () { - std::ofstream logfile("non_primitive_1/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/non_primitive_1/cmp/generic b/tests/fe/non_primitive_1.output similarity index 100% rename from tests/fe/non_primitive_1/cmp/generic rename to tests/fe/non_primitive_1.output diff --git a/tests/fe/non_primitive_2.cc b/tests/fe/non_primitive_2.cc index 25421270c4..43cc95d65f 100644 --- a/tests/fe/non_primitive_2.cc +++ b/tests/fe/non_primitive_2.cc @@ -257,7 +257,7 @@ test (const unsigned int p) int main () { - std::ofstream logfile("non_primitive_2/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/non_primitive_2/cmp/generic b/tests/fe/non_primitive_2.output similarity index 100% rename from tests/fe/non_primitive_2/cmp/generic rename to tests/fe/non_primitive_2.output diff --git a/tests/fe/numbering.cc b/tests/fe/numbering.cc index 41c9a0be4b..2233e703cb 100644 --- a/tests/fe/numbering.cc +++ b/tests/fe/numbering.cc @@ -23,7 +23,7 @@ #include -std::ofstream logfile ("numbering/output"); +std::ofstream logfile ("output"); template diff --git a/tests/fe/numbering/cmp/generic b/tests/fe/numbering.output similarity index 100% rename from tests/fe/numbering/cmp/generic rename to tests/fe/numbering.output diff --git a/tests/fe/q_1.cc b/tests/fe/q_1.cc index abd00ab3f3..ba63d1102f 100644 --- a/tests/fe/q_1.cc +++ b/tests/fe/q_1.cc @@ -57,7 +57,7 @@ test(const FE_Q &fe_q) int main() { - std::ofstream logfile ("q_1/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/q_1/cmp/generic b/tests/fe/q_1.output similarity index 100% rename from tests/fe/q_1/cmp/generic rename to tests/fe/q_1.output diff --git a/tests/fe/q_2.cc b/tests/fe/q_2.cc index e6cb098fa6..2cc31a01be 100644 --- a/tests/fe/q_2.cc +++ b/tests/fe/q_2.cc @@ -62,7 +62,7 @@ test(const FE_Q &fe_q) int main() { - std::ofstream logfile ("q_2/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/q_2/cmp/generic b/tests/fe/q_2.output similarity index 100% rename from tests/fe/q_2/cmp/generic rename to tests/fe/q_2.output diff --git a/tests/fe/q_3.cc b/tests/fe/q_3.cc index 73a971ba98..ad2382d8c3 100644 --- a/tests/fe/q_3.cc +++ b/tests/fe/q_3.cc @@ -59,7 +59,7 @@ test(const FE_Q &fe_q) int main() { - std::ofstream logfile ("q_3/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/q_3/cmp/generic b/tests/fe/q_3.output similarity index 100% rename from tests/fe/q_3/cmp/generic rename to tests/fe/q_3.output diff --git a/tests/fe/q_4.cc b/tests/fe/q_4.cc index 3ba36d3345..d28a7032fa 100644 --- a/tests/fe/q_4.cc +++ b/tests/fe/q_4.cc @@ -62,7 +62,7 @@ test(const FE_Q fe1, int main() { - std::ofstream logfile ("q_4/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/q_4/cmp/generic b/tests/fe/q_4.output similarity index 100% rename from tests/fe/q_4/cmp/generic rename to tests/fe/q_4.output diff --git a/tests/fe/q_dg0_projection_01.cc b/tests/fe/q_dg0_projection_01.cc index 5a7cbda0c7..d9bc484611 100644 --- a/tests/fe/q_dg0_projection_01.cc +++ b/tests/fe/q_dg0_projection_01.cc @@ -23,7 +23,7 @@ -char logname[] = "q_dg0_projection_01/output"; +char logname[] = "output"; #include "deformed_projection.h" diff --git a/tests/fe/q_dg0_projection_01/cmp/generic b/tests/fe/q_dg0_projection_01.output similarity index 100% rename from tests/fe/q_dg0_projection_01/cmp/generic rename to tests/fe/q_dg0_projection_01.output diff --git a/tests/fe/q_dg0_projection_01/rt.gpl b/tests/fe/q_dg0_projection_01/rt.gpl deleted file mode 100644 index 6a47c2f34e..0000000000 --- a/tests/fe/q_dg0_projection_01/rt.gpl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/gnuplot -persist -# -# -# G N U P L O T -# Version 4.0 patchlevel 0 -# last modified Thu Apr 15 14:44:22 CEST 2004 -# System: Linux 2.6.11.4-21.11-smp -# -# Copyright (C) 1986 - 1993, 1998, 2004, 2006 -# Thomas Williams, Colin Kelley and many others -# -# This is gnuplot version 4.0. Please refer to the documentation -# for command syntax changes. The old syntax will be accepted -# throughout the 4.0 series, but all save files use the new syntax. -# -# Type `help` to access the on-line reference manual. -# The gnuplot FAQ is available from -# http://www.gnuplot.info/faq/ -# -# Send comments and requests for help to -# -# Send bugs, suggestions and mods to -# -# -set terminal postscript eps color solid enhanced 20 -# set output -unset clip points -set clip one -unset clip two -set bar 1.000000 -set border 31 lt -1 lw 1.000 -set xdata -set ydata -set zdata -set x2data -set y2data -set timefmt x "%d/%m/%y,%H:%M" -set timefmt y "%d/%m/%y,%H:%M" -set timefmt z "%d/%m/%y,%H:%M" -set timefmt x2 "%d/%m/%y,%H:%M" -set timefmt y2 "%d/%m/%y,%H:%M" -set timefmt cb "%d/%m/%y,%H:%M" -set boxwidth -set style fill empty border -set dummy x,y -set format x "% g" -set format y "% g" -set format x2 "% g" -set format y2 "% g" -set format z "% g" -set format cb "% g" -set angles radians -unset grid -set key title "" -set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles -unset label -unset arrow -unset style line -unset style arrow -unset logscale -set offsets 0, 0, 0, 0 -set pointsize 1 -set encoding default -unset polar -unset parametric -unset decimalsign -set view 60, 20, 1, 1 -set samples 100, 100 -set isosamples 10, 10 -set surface -unset contour -set clabel '%8.3g' -set mapping cartesian -set datafile separator whitespace -set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover -set cntrparam order 4 -set cntrparam linear -set cntrparam levels auto 5 -set cntrparam points 5 -set size ratio 0 1,1 -set origin 0,0 -set style data lines -set style function lines -set xzeroaxis lt -2 lw 1.000 -set yzeroaxis lt -2 lw 1.000 -set x2zeroaxis lt -2 lw 1.000 -set y2zeroaxis lt -2 lw 1.000 -set tics in -set ticslevel 0.5 -set ticscale 1 0.5 -set mxtics default -set mytics default -set mztics default -set mx2tics default -set my2tics default -set mcbtics default -set xtics border mirror norotate autofreq -set ytics border mirror norotate autofreq -set ztics border nomirror norotate autofreq -set nox2tics -set noy2tics -set cbtics border mirror norotate autofreq -set title "" 0.000000,0.000000 font "" -set timestamp "" bottom norotate 0.000000,0.000000 "" -set rrange [ * : * ] noreverse nowriteback # (currently [0.00000:10.0000] ) -set trange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set urange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set vrange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set xlabel "x" 0.000000,0.000000 font "" -set x2label "" 0.000000,0.000000 font "" -set xrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set x2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set ylabel "y" 0.000000,0.000000 font "" -set y2label "" 0.000000,0.000000 font "" -set yrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set y2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zlabel "" 0.000000,0.000000 font "" -set zrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set cblabel "" 0.000000,0.000000 font "" -set cbrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zero 1e-08 -set lmargin -1 -set bmargin -1 -set rmargin -1 -set tmargin -1 -set locale "C" -set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean -unset pm3d -set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB -set palette rgbformulae 7, 5, 15 -set colorbox default -set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault -set loadpath -set fontpath -set fit noerrorvariables -set output "RT1_00_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x" -set output "RT1_00_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y" -set output "RT1_01_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x" -set output "RT1_01_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y" -set output "RT1_02_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x" -set output "RT1_02_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y" -set output "RT1_03_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x" -set output "RT1_03_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y" -set output "RT1_04_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x" -set output "RT1_04_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y" -set output "RT1_05_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x" -set output "RT1_05_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y" -set output "RT1_06_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x" -set output "RT1_06_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y" -set output "RT1_07_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x" -set output "RT1_07_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y" -set output "RT1_08_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x" -set output "RT1_08_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y" -set output "RT1_09_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x" -set output "RT1_09_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y" -set output "RT1_10_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x" -set output "RT1_10_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y" -set output "RT1_11_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x" -set output "RT1_11_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y" -# EOF diff --git a/tests/fe/q_iso_q1_projection_01.cc b/tests/fe/q_iso_q1_projection_01.cc index 10afe96f3a..65c448ae6e 100644 --- a/tests/fe/q_iso_q1_projection_01.cc +++ b/tests/fe/q_iso_q1_projection_01.cc @@ -23,7 +23,7 @@ -char logname[] = "q_iso_q1_projection_01/output"; +char logname[] = "output"; #include "deformed_projection.h" #include diff --git a/tests/fe/q_iso_q1_projection_01/cmp/generic b/tests/fe/q_iso_q1_projection_01.output similarity index 100% rename from tests/fe/q_iso_q1_projection_01/cmp/generic rename to tests/fe/q_iso_q1_projection_01.output diff --git a/tests/fe/q_iso_q1_projection_01/rt.gpl b/tests/fe/q_iso_q1_projection_01/rt.gpl deleted file mode 100644 index 6a47c2f34e..0000000000 --- a/tests/fe/q_iso_q1_projection_01/rt.gpl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/gnuplot -persist -# -# -# G N U P L O T -# Version 4.0 patchlevel 0 -# last modified Thu Apr 15 14:44:22 CEST 2004 -# System: Linux 2.6.11.4-21.11-smp -# -# Copyright (C) 1986 - 1993, 1998, 2004, 2006 -# Thomas Williams, Colin Kelley and many others -# -# This is gnuplot version 4.0. Please refer to the documentation -# for command syntax changes. The old syntax will be accepted -# throughout the 4.0 series, but all save files use the new syntax. -# -# Type `help` to access the on-line reference manual. -# The gnuplot FAQ is available from -# http://www.gnuplot.info/faq/ -# -# Send comments and requests for help to -# -# Send bugs, suggestions and mods to -# -# -set terminal postscript eps color solid enhanced 20 -# set output -unset clip points -set clip one -unset clip two -set bar 1.000000 -set border 31 lt -1 lw 1.000 -set xdata -set ydata -set zdata -set x2data -set y2data -set timefmt x "%d/%m/%y,%H:%M" -set timefmt y "%d/%m/%y,%H:%M" -set timefmt z "%d/%m/%y,%H:%M" -set timefmt x2 "%d/%m/%y,%H:%M" -set timefmt y2 "%d/%m/%y,%H:%M" -set timefmt cb "%d/%m/%y,%H:%M" -set boxwidth -set style fill empty border -set dummy x,y -set format x "% g" -set format y "% g" -set format x2 "% g" -set format y2 "% g" -set format z "% g" -set format cb "% g" -set angles radians -unset grid -set key title "" -set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles -unset label -unset arrow -unset style line -unset style arrow -unset logscale -set offsets 0, 0, 0, 0 -set pointsize 1 -set encoding default -unset polar -unset parametric -unset decimalsign -set view 60, 20, 1, 1 -set samples 100, 100 -set isosamples 10, 10 -set surface -unset contour -set clabel '%8.3g' -set mapping cartesian -set datafile separator whitespace -set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover -set cntrparam order 4 -set cntrparam linear -set cntrparam levels auto 5 -set cntrparam points 5 -set size ratio 0 1,1 -set origin 0,0 -set style data lines -set style function lines -set xzeroaxis lt -2 lw 1.000 -set yzeroaxis lt -2 lw 1.000 -set x2zeroaxis lt -2 lw 1.000 -set y2zeroaxis lt -2 lw 1.000 -set tics in -set ticslevel 0.5 -set ticscale 1 0.5 -set mxtics default -set mytics default -set mztics default -set mx2tics default -set my2tics default -set mcbtics default -set xtics border mirror norotate autofreq -set ytics border mirror norotate autofreq -set ztics border nomirror norotate autofreq -set nox2tics -set noy2tics -set cbtics border mirror norotate autofreq -set title "" 0.000000,0.000000 font "" -set timestamp "" bottom norotate 0.000000,0.000000 "" -set rrange [ * : * ] noreverse nowriteback # (currently [0.00000:10.0000] ) -set trange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set urange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set vrange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set xlabel "x" 0.000000,0.000000 font "" -set x2label "" 0.000000,0.000000 font "" -set xrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set x2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set ylabel "y" 0.000000,0.000000 font "" -set y2label "" 0.000000,0.000000 font "" -set yrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set y2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zlabel "" 0.000000,0.000000 font "" -set zrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set cblabel "" 0.000000,0.000000 font "" -set cbrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zero 1e-08 -set lmargin -1 -set bmargin -1 -set rmargin -1 -set tmargin -1 -set locale "C" -set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean -unset pm3d -set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB -set palette rgbformulae 7, 5, 15 -set colorbox default -set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault -set loadpath -set fontpath -set fit noerrorvariables -set output "RT1_00_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x" -set output "RT1_00_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y" -set output "RT1_01_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x" -set output "RT1_01_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y" -set output "RT1_02_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x" -set output "RT1_02_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y" -set output "RT1_03_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x" -set output "RT1_03_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y" -set output "RT1_04_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x" -set output "RT1_04_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y" -set output "RT1_05_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x" -set output "RT1_05_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y" -set output "RT1_06_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x" -set output "RT1_06_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y" -set output "RT1_07_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x" -set output "RT1_07_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y" -set output "RT1_08_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x" -set output "RT1_08_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y" -set output "RT1_09_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x" -set output "RT1_09_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y" -set output "RT1_10_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x" -set output "RT1_10_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y" -set output "RT1_11_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x" -set output "RT1_11_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y" -# EOF diff --git a/tests/fe/rt_1.cc b/tests/fe/rt_1.cc index 10b0ef9854..b1593b4308 100644 --- a/tests/fe/rt_1.cc +++ b/tests/fe/rt_1.cc @@ -87,7 +87,7 @@ plot_shape_functions(const unsigned int degree) int main() { - std::ofstream logfile ("rt_1/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/rt_1/cmp/generic b/tests/fe/rt_1.output similarity index 100% rename from tests/fe/rt_1/cmp/generic rename to tests/fe/rt_1.output diff --git a/tests/fe/rt_1/rt.gpl b/tests/fe/rt_1/rt.gpl deleted file mode 100644 index 6a47c2f34e..0000000000 --- a/tests/fe/rt_1/rt.gpl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/gnuplot -persist -# -# -# G N U P L O T -# Version 4.0 patchlevel 0 -# last modified Thu Apr 15 14:44:22 CEST 2004 -# System: Linux 2.6.11.4-21.11-smp -# -# Copyright (C) 1986 - 1993, 1998, 2004, 2006 -# Thomas Williams, Colin Kelley and many others -# -# This is gnuplot version 4.0. Please refer to the documentation -# for command syntax changes. The old syntax will be accepted -# throughout the 4.0 series, but all save files use the new syntax. -# -# Type `help` to access the on-line reference manual. -# The gnuplot FAQ is available from -# http://www.gnuplot.info/faq/ -# -# Send comments and requests for help to -# -# Send bugs, suggestions and mods to -# -# -set terminal postscript eps color solid enhanced 20 -# set output -unset clip points -set clip one -unset clip two -set bar 1.000000 -set border 31 lt -1 lw 1.000 -set xdata -set ydata -set zdata -set x2data -set y2data -set timefmt x "%d/%m/%y,%H:%M" -set timefmt y "%d/%m/%y,%H:%M" -set timefmt z "%d/%m/%y,%H:%M" -set timefmt x2 "%d/%m/%y,%H:%M" -set timefmt y2 "%d/%m/%y,%H:%M" -set timefmt cb "%d/%m/%y,%H:%M" -set boxwidth -set style fill empty border -set dummy x,y -set format x "% g" -set format y "% g" -set format x2 "% g" -set format y2 "% g" -set format z "% g" -set format cb "% g" -set angles radians -unset grid -set key title "" -set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles -unset label -unset arrow -unset style line -unset style arrow -unset logscale -set offsets 0, 0, 0, 0 -set pointsize 1 -set encoding default -unset polar -unset parametric -unset decimalsign -set view 60, 20, 1, 1 -set samples 100, 100 -set isosamples 10, 10 -set surface -unset contour -set clabel '%8.3g' -set mapping cartesian -set datafile separator whitespace -set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover -set cntrparam order 4 -set cntrparam linear -set cntrparam levels auto 5 -set cntrparam points 5 -set size ratio 0 1,1 -set origin 0,0 -set style data lines -set style function lines -set xzeroaxis lt -2 lw 1.000 -set yzeroaxis lt -2 lw 1.000 -set x2zeroaxis lt -2 lw 1.000 -set y2zeroaxis lt -2 lw 1.000 -set tics in -set ticslevel 0.5 -set ticscale 1 0.5 -set mxtics default -set mytics default -set mztics default -set mx2tics default -set my2tics default -set mcbtics default -set xtics border mirror norotate autofreq -set ytics border mirror norotate autofreq -set ztics border nomirror norotate autofreq -set nox2tics -set noy2tics -set cbtics border mirror norotate autofreq -set title "" 0.000000,0.000000 font "" -set timestamp "" bottom norotate 0.000000,0.000000 "" -set rrange [ * : * ] noreverse nowriteback # (currently [0.00000:10.0000] ) -set trange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set urange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set vrange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set xlabel "x" 0.000000,0.000000 font "" -set x2label "" 0.000000,0.000000 font "" -set xrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set x2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set ylabel "y" 0.000000,0.000000 font "" -set y2label "" 0.000000,0.000000 font "" -set yrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set y2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zlabel "" 0.000000,0.000000 font "" -set zrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set cblabel "" 0.000000,0.000000 font "" -set cbrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zero 1e-08 -set lmargin -1 -set bmargin -1 -set rmargin -1 -set tmargin -1 -set locale "C" -set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean -unset pm3d -set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB -set palette rgbformulae 7, 5, 15 -set colorbox default -set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault -set loadpath -set fontpath -set fit noerrorvariables -set output "RT1_00_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x" -set output "RT1_00_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y" -set output "RT1_01_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x" -set output "RT1_01_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y" -set output "RT1_02_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x" -set output "RT1_02_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y" -set output "RT1_03_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x" -set output "RT1_03_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y" -set output "RT1_04_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x" -set output "RT1_04_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y" -set output "RT1_05_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x" -set output "RT1_05_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y" -set output "RT1_06_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x" -set output "RT1_06_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y" -set output "RT1_07_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x" -set output "RT1_07_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y" -set output "RT1_08_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x" -set output "RT1_08_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y" -set output "RT1_09_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x" -set output "RT1_09_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y" -set output "RT1_10_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x" -set output "RT1_10_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y" -set output "RT1_11_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x" -set output "RT1_11_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y" -# EOF diff --git a/tests/fe/rt_10.cc b/tests/fe/rt_10.cc index 824fedded0..037bab1305 100644 --- a/tests/fe/rt_10.cc +++ b/tests/fe/rt_10.cc @@ -42,7 +42,7 @@ #define PRECISION 2 -std::ofstream logfile ("rt_10/output"); +std::ofstream logfile ("output"); template void diff --git a/tests/fe/rt_10/cmp/generic b/tests/fe/rt_10.output similarity index 100% rename from tests/fe/rt_10/cmp/generic rename to tests/fe/rt_10.output diff --git a/tests/fe/rt_11.cc b/tests/fe/rt_11.cc index c18447fae7..c4e104a2b1 100644 --- a/tests/fe/rt_11.cc +++ b/tests/fe/rt_11.cc @@ -48,7 +48,7 @@ #define PRECISION 2 -std::ofstream logfile ("rt_11/output"); +std::ofstream logfile ("output"); template void diff --git a/tests/fe/rt_11/cmp/generic b/tests/fe/rt_11.output similarity index 100% rename from tests/fe/rt_11/cmp/generic rename to tests/fe/rt_11.output diff --git a/tests/fe/rt_12.cc b/tests/fe/rt_12.cc index 37ab404b85..fccf8b7470 100644 --- a/tests/fe/rt_12.cc +++ b/tests/fe/rt_12.cc @@ -41,7 +41,7 @@ #define PRECISION 2 -std::ofstream logfile ("rt_12/output"); +std::ofstream logfile ("output"); template void diff --git a/tests/fe/rt_12/cmp/generic b/tests/fe/rt_12.output similarity index 100% rename from tests/fe/rt_12/cmp/generic rename to tests/fe/rt_12.output diff --git a/tests/fe/rt_13.cc b/tests/fe/rt_13.cc index 270b8c0160..c6d7f95c42 100644 --- a/tests/fe/rt_13.cc +++ b/tests/fe/rt_13.cc @@ -46,7 +46,7 @@ #define PRECISION 2 -std::ofstream logfile ("rt_13/output"); +std::ofstream logfile ("output"); template void diff --git a/tests/fe/rt_13/cmp/generic b/tests/fe/rt_13.output similarity index 100% rename from tests/fe/rt_13/cmp/generic rename to tests/fe/rt_13.output diff --git a/tests/fe/rt_14.cc b/tests/fe/rt_14.cc index 8ce23c551e..08366afcad 100644 --- a/tests/fe/rt_14.cc +++ b/tests/fe/rt_14.cc @@ -46,7 +46,7 @@ #define PRECISION 2 -std::ofstream logfile ("rt_14/output"); +std::ofstream logfile ("output"); template void diff --git a/tests/fe/rt_14/cmp/generic b/tests/fe/rt_14.output similarity index 100% rename from tests/fe/rt_14/cmp/generic rename to tests/fe/rt_14.output diff --git a/tests/fe/rt_15.cc b/tests/fe/rt_15.cc index 7449608c43..31f406d37e 100644 --- a/tests/fe/rt_15.cc +++ b/tests/fe/rt_15.cc @@ -46,7 +46,7 @@ #define PRECISION 2 -std::ofstream logfile ("rt_15/output"); +std::ofstream logfile ("output"); template void diff --git a/tests/fe/rt_15/cmp/generic b/tests/fe/rt_15.output similarity index 100% rename from tests/fe/rt_15/cmp/generic rename to tests/fe/rt_15.output diff --git a/tests/fe/rt_2.cc b/tests/fe/rt_2.cc index 77291a03bc..fdc8894943 100644 --- a/tests/fe/rt_2.cc +++ b/tests/fe/rt_2.cc @@ -165,7 +165,7 @@ plot_shape_functions(const unsigned int degree) int main() { - std::ofstream logfile ("rt_2/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/rt_2/cmp/generic b/tests/fe/rt_2.output similarity index 100% rename from tests/fe/rt_2/cmp/generic rename to tests/fe/rt_2.output diff --git a/tests/fe/rt_3.cc b/tests/fe/rt_3.cc index 7cb73e914e..bef43867d7 100644 --- a/tests/fe/rt_3.cc +++ b/tests/fe/rt_3.cc @@ -53,7 +53,7 @@ test(const unsigned int degree) int main() { - std::ofstream logfile ("rt_3/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/rt_3/cmp/generic b/tests/fe/rt_3.output similarity index 100% rename from tests/fe/rt_3/cmp/generic rename to tests/fe/rt_3.output diff --git a/tests/fe/rt_5.cc b/tests/fe/rt_5.cc index 68fcd8d6bc..a57a44b27d 100644 --- a/tests/fe/rt_5.cc +++ b/tests/fe/rt_5.cc @@ -57,7 +57,7 @@ test(const unsigned int degree) int main() { - std::ofstream logfile ("rt_5/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/rt_5/cmp/generic b/tests/fe/rt_5.output similarity index 100% rename from tests/fe/rt_5/cmp/generic rename to tests/fe/rt_5.output diff --git a/tests/fe/rt_7.cc b/tests/fe/rt_7.cc index b54162b3db..051e5cf2f4 100644 --- a/tests/fe/rt_7.cc +++ b/tests/fe/rt_7.cc @@ -76,7 +76,7 @@ plot_shape_functions(const unsigned int degree) int main() { - std::ofstream logfile ("rt_7/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/rt_7/cmp/generic b/tests/fe/rt_7.output similarity index 100% rename from tests/fe/rt_7/cmp/generic rename to tests/fe/rt_7.output diff --git a/tests/fe/rt_8.cc b/tests/fe/rt_8.cc index d4564a8549..4dae74d52d 100644 --- a/tests/fe/rt_8.cc +++ b/tests/fe/rt_8.cc @@ -40,7 +40,7 @@ #define PRECISION 5 -std::ofstream logfile ("rt_8/output"); +std::ofstream logfile ("output"); template void diff --git a/tests/fe/rt_8/cmp/generic b/tests/fe/rt_8.output similarity index 100% rename from tests/fe/rt_8/cmp/generic rename to tests/fe/rt_8.output diff --git a/tests/fe/rt_9.cc b/tests/fe/rt_9.cc index 669ea69ffc..909192d499 100644 --- a/tests/fe/rt_9.cc +++ b/tests/fe/rt_9.cc @@ -42,7 +42,7 @@ #define PRECISION 2 -std::ofstream logfile ("rt_9/output"); +std::ofstream logfile ("output"); template void diff --git a/tests/fe/rt_9/cmp/generic b/tests/fe/rt_9.output similarity index 100% rename from tests/fe/rt_9/cmp/generic rename to tests/fe/rt_9.output diff --git a/tests/fe/rt_approximation_01.cc b/tests/fe/rt_approximation_01.cc index 0300b08797..8cd27d1632 100644 --- a/tests/fe/rt_approximation_01.cc +++ b/tests/fe/rt_approximation_01.cc @@ -32,7 +32,7 @@ #include -std::ofstream logfile ("rt_approximation_01/output"); +std::ofstream logfile ("output"); char buf[1000]; diff --git a/tests/fe/rt_approximation_01/cmp/generic b/tests/fe/rt_approximation_01.output similarity index 100% rename from tests/fe/rt_approximation_01/cmp/generic rename to tests/fe/rt_approximation_01.output diff --git a/tests/fe/rt_approximation_01/rt.gpl b/tests/fe/rt_approximation_01/rt.gpl deleted file mode 100644 index 6a47c2f34e..0000000000 --- a/tests/fe/rt_approximation_01/rt.gpl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/gnuplot -persist -# -# -# G N U P L O T -# Version 4.0 patchlevel 0 -# last modified Thu Apr 15 14:44:22 CEST 2004 -# System: Linux 2.6.11.4-21.11-smp -# -# Copyright (C) 1986 - 1993, 1998, 2004, 2006 -# Thomas Williams, Colin Kelley and many others -# -# This is gnuplot version 4.0. Please refer to the documentation -# for command syntax changes. The old syntax will be accepted -# throughout the 4.0 series, but all save files use the new syntax. -# -# Type `help` to access the on-line reference manual. -# The gnuplot FAQ is available from -# http://www.gnuplot.info/faq/ -# -# Send comments and requests for help to -# -# Send bugs, suggestions and mods to -# -# -set terminal postscript eps color solid enhanced 20 -# set output -unset clip points -set clip one -unset clip two -set bar 1.000000 -set border 31 lt -1 lw 1.000 -set xdata -set ydata -set zdata -set x2data -set y2data -set timefmt x "%d/%m/%y,%H:%M" -set timefmt y "%d/%m/%y,%H:%M" -set timefmt z "%d/%m/%y,%H:%M" -set timefmt x2 "%d/%m/%y,%H:%M" -set timefmt y2 "%d/%m/%y,%H:%M" -set timefmt cb "%d/%m/%y,%H:%M" -set boxwidth -set style fill empty border -set dummy x,y -set format x "% g" -set format y "% g" -set format x2 "% g" -set format y2 "% g" -set format z "% g" -set format cb "% g" -set angles radians -unset grid -set key title "" -set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles -unset label -unset arrow -unset style line -unset style arrow -unset logscale -set offsets 0, 0, 0, 0 -set pointsize 1 -set encoding default -unset polar -unset parametric -unset decimalsign -set view 60, 20, 1, 1 -set samples 100, 100 -set isosamples 10, 10 -set surface -unset contour -set clabel '%8.3g' -set mapping cartesian -set datafile separator whitespace -set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover -set cntrparam order 4 -set cntrparam linear -set cntrparam levels auto 5 -set cntrparam points 5 -set size ratio 0 1,1 -set origin 0,0 -set style data lines -set style function lines -set xzeroaxis lt -2 lw 1.000 -set yzeroaxis lt -2 lw 1.000 -set x2zeroaxis lt -2 lw 1.000 -set y2zeroaxis lt -2 lw 1.000 -set tics in -set ticslevel 0.5 -set ticscale 1 0.5 -set mxtics default -set mytics default -set mztics default -set mx2tics default -set my2tics default -set mcbtics default -set xtics border mirror norotate autofreq -set ytics border mirror norotate autofreq -set ztics border nomirror norotate autofreq -set nox2tics -set noy2tics -set cbtics border mirror norotate autofreq -set title "" 0.000000,0.000000 font "" -set timestamp "" bottom norotate 0.000000,0.000000 "" -set rrange [ * : * ] noreverse nowriteback # (currently [0.00000:10.0000] ) -set trange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set urange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set vrange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set xlabel "x" 0.000000,0.000000 font "" -set x2label "" 0.000000,0.000000 font "" -set xrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set x2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set ylabel "y" 0.000000,0.000000 font "" -set y2label "" 0.000000,0.000000 font "" -set yrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set y2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zlabel "" 0.000000,0.000000 font "" -set zrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set cblabel "" 0.000000,0.000000 font "" -set cbrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zero 1e-08 -set lmargin -1 -set bmargin -1 -set rmargin -1 -set tmargin -1 -set locale "C" -set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean -unset pm3d -set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB -set palette rgbformulae 7, 5, 15 -set colorbox default -set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault -set loadpath -set fontpath -set fit noerrorvariables -set output "RT1_00_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x" -set output "RT1_00_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y" -set output "RT1_01_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x" -set output "RT1_01_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y" -set output "RT1_02_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x" -set output "RT1_02_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y" -set output "RT1_03_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x" -set output "RT1_03_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y" -set output "RT1_04_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x" -set output "RT1_04_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y" -set output "RT1_05_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x" -set output "RT1_05_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y" -set output "RT1_06_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x" -set output "RT1_06_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y" -set output "RT1_07_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x" -set output "RT1_07_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y" -set output "RT1_08_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x" -set output "RT1_08_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y" -set output "RT1_09_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x" -set output "RT1_09_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y" -set output "RT1_10_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x" -set output "RT1_10_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y" -set output "RT1_11_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x" -set output "RT1_11_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y" -# EOF diff --git a/tests/fe/rt_normal_02.cc b/tests/fe/rt_normal_02.cc index 7111e6c6d9..154aa4bc2b 100644 --- a/tests/fe/rt_normal_02.cc +++ b/tests/fe/rt_normal_02.cc @@ -50,7 +50,7 @@ #include #include -std::ofstream logfile ("rt_normal_02/output"); +std::ofstream logfile ("output"); /* diff --git a/tests/fe/rt_normal_02/cmp/generic b/tests/fe/rt_normal_02.output similarity index 100% rename from tests/fe/rt_normal_02/cmp/generic rename to tests/fe/rt_normal_02.output diff --git a/tests/fe/rt_normal_02/rt.gpl b/tests/fe/rt_normal_02/rt.gpl deleted file mode 100644 index 6a47c2f34e..0000000000 --- a/tests/fe/rt_normal_02/rt.gpl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/gnuplot -persist -# -# -# G N U P L O T -# Version 4.0 patchlevel 0 -# last modified Thu Apr 15 14:44:22 CEST 2004 -# System: Linux 2.6.11.4-21.11-smp -# -# Copyright (C) 1986 - 1993, 1998, 2004, 2006 -# Thomas Williams, Colin Kelley and many others -# -# This is gnuplot version 4.0. Please refer to the documentation -# for command syntax changes. The old syntax will be accepted -# throughout the 4.0 series, but all save files use the new syntax. -# -# Type `help` to access the on-line reference manual. -# The gnuplot FAQ is available from -# http://www.gnuplot.info/faq/ -# -# Send comments and requests for help to -# -# Send bugs, suggestions and mods to -# -# -set terminal postscript eps color solid enhanced 20 -# set output -unset clip points -set clip one -unset clip two -set bar 1.000000 -set border 31 lt -1 lw 1.000 -set xdata -set ydata -set zdata -set x2data -set y2data -set timefmt x "%d/%m/%y,%H:%M" -set timefmt y "%d/%m/%y,%H:%M" -set timefmt z "%d/%m/%y,%H:%M" -set timefmt x2 "%d/%m/%y,%H:%M" -set timefmt y2 "%d/%m/%y,%H:%M" -set timefmt cb "%d/%m/%y,%H:%M" -set boxwidth -set style fill empty border -set dummy x,y -set format x "% g" -set format y "% g" -set format x2 "% g" -set format y2 "% g" -set format z "% g" -set format cb "% g" -set angles radians -unset grid -set key title "" -set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles -unset label -unset arrow -unset style line -unset style arrow -unset logscale -set offsets 0, 0, 0, 0 -set pointsize 1 -set encoding default -unset polar -unset parametric -unset decimalsign -set view 60, 20, 1, 1 -set samples 100, 100 -set isosamples 10, 10 -set surface -unset contour -set clabel '%8.3g' -set mapping cartesian -set datafile separator whitespace -set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover -set cntrparam order 4 -set cntrparam linear -set cntrparam levels auto 5 -set cntrparam points 5 -set size ratio 0 1,1 -set origin 0,0 -set style data lines -set style function lines -set xzeroaxis lt -2 lw 1.000 -set yzeroaxis lt -2 lw 1.000 -set x2zeroaxis lt -2 lw 1.000 -set y2zeroaxis lt -2 lw 1.000 -set tics in -set ticslevel 0.5 -set ticscale 1 0.5 -set mxtics default -set mytics default -set mztics default -set mx2tics default -set my2tics default -set mcbtics default -set xtics border mirror norotate autofreq -set ytics border mirror norotate autofreq -set ztics border nomirror norotate autofreq -set nox2tics -set noy2tics -set cbtics border mirror norotate autofreq -set title "" 0.000000,0.000000 font "" -set timestamp "" bottom norotate 0.000000,0.000000 "" -set rrange [ * : * ] noreverse nowriteback # (currently [0.00000:10.0000] ) -set trange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set urange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set vrange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set xlabel "x" 0.000000,0.000000 font "" -set x2label "" 0.000000,0.000000 font "" -set xrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set x2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set ylabel "y" 0.000000,0.000000 font "" -set y2label "" 0.000000,0.000000 font "" -set yrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set y2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zlabel "" 0.000000,0.000000 font "" -set zrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set cblabel "" 0.000000,0.000000 font "" -set cbrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zero 1e-08 -set lmargin -1 -set bmargin -1 -set rmargin -1 -set tmargin -1 -set locale "C" -set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean -unset pm3d -set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB -set palette rgbformulae 7, 5, 15 -set colorbox default -set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault -set loadpath -set fontpath -set fit noerrorvariables -set output "RT1_00_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x" -set output "RT1_00_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y" -set output "RT1_01_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x" -set output "RT1_01_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y" -set output "RT1_02_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x" -set output "RT1_02_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y" -set output "RT1_03_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x" -set output "RT1_03_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y" -set output "RT1_04_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x" -set output "RT1_04_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y" -set output "RT1_05_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x" -set output "RT1_05_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y" -set output "RT1_06_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x" -set output "RT1_06_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y" -set output "RT1_07_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x" -set output "RT1_07_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y" -set output "RT1_08_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x" -set output "RT1_08_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y" -set output "RT1_09_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x" -set output "RT1_09_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y" -set output "RT1_10_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x" -set output "RT1_10_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y" -set output "RT1_11_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x" -set output "RT1_11_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y" -# EOF diff --git a/tests/fe/rt_projection_01.cc b/tests/fe/rt_projection_01.cc index 0a703ffd10..b2a0ec50ff 100644 --- a/tests/fe/rt_projection_01.cc +++ b/tests/fe/rt_projection_01.cc @@ -22,7 +22,7 @@ -char logname[] = "rt_projection_01/output"; +char logname[] = "output"; #include "deformed_projection.h" diff --git a/tests/fe/rt_projection_01/cmp/generic b/tests/fe/rt_projection_01.output similarity index 100% rename from tests/fe/rt_projection_01/cmp/generic rename to tests/fe/rt_projection_01.output diff --git a/tests/fe/rt_projection_01/rt.gpl b/tests/fe/rt_projection_01/rt.gpl deleted file mode 100644 index 6a47c2f34e..0000000000 --- a/tests/fe/rt_projection_01/rt.gpl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/gnuplot -persist -# -# -# G N U P L O T -# Version 4.0 patchlevel 0 -# last modified Thu Apr 15 14:44:22 CEST 2004 -# System: Linux 2.6.11.4-21.11-smp -# -# Copyright (C) 1986 - 1993, 1998, 2004, 2006 -# Thomas Williams, Colin Kelley and many others -# -# This is gnuplot version 4.0. Please refer to the documentation -# for command syntax changes. The old syntax will be accepted -# throughout the 4.0 series, but all save files use the new syntax. -# -# Type `help` to access the on-line reference manual. -# The gnuplot FAQ is available from -# http://www.gnuplot.info/faq/ -# -# Send comments and requests for help to -# -# Send bugs, suggestions and mods to -# -# -set terminal postscript eps color solid enhanced 20 -# set output -unset clip points -set clip one -unset clip two -set bar 1.000000 -set border 31 lt -1 lw 1.000 -set xdata -set ydata -set zdata -set x2data -set y2data -set timefmt x "%d/%m/%y,%H:%M" -set timefmt y "%d/%m/%y,%H:%M" -set timefmt z "%d/%m/%y,%H:%M" -set timefmt x2 "%d/%m/%y,%H:%M" -set timefmt y2 "%d/%m/%y,%H:%M" -set timefmt cb "%d/%m/%y,%H:%M" -set boxwidth -set style fill empty border -set dummy x,y -set format x "% g" -set format y "% g" -set format x2 "% g" -set format y2 "% g" -set format z "% g" -set format cb "% g" -set angles radians -unset grid -set key title "" -set key right top Right noreverse enhanced box linetype -2 linewidth 1.000 samplen 4 spacing 1 width 0 height 0 autotitles -unset label -unset arrow -unset style line -unset style arrow -unset logscale -set offsets 0, 0, 0, 0 -set pointsize 1 -set encoding default -unset polar -unset parametric -unset decimalsign -set view 60, 20, 1, 1 -set samples 100, 100 -set isosamples 10, 10 -set surface -unset contour -set clabel '%8.3g' -set mapping cartesian -set datafile separator whitespace -set hidden3d offset 1 trianglepattern 3 undefined 1 altdiagonal bentover -set cntrparam order 4 -set cntrparam linear -set cntrparam levels auto 5 -set cntrparam points 5 -set size ratio 0 1,1 -set origin 0,0 -set style data lines -set style function lines -set xzeroaxis lt -2 lw 1.000 -set yzeroaxis lt -2 lw 1.000 -set x2zeroaxis lt -2 lw 1.000 -set y2zeroaxis lt -2 lw 1.000 -set tics in -set ticslevel 0.5 -set ticscale 1 0.5 -set mxtics default -set mytics default -set mztics default -set mx2tics default -set my2tics default -set mcbtics default -set xtics border mirror norotate autofreq -set ytics border mirror norotate autofreq -set ztics border nomirror norotate autofreq -set nox2tics -set noy2tics -set cbtics border mirror norotate autofreq -set title "" 0.000000,0.000000 font "" -set timestamp "" bottom norotate 0.000000,0.000000 "" -set rrange [ * : * ] noreverse nowriteback # (currently [0.00000:10.0000] ) -set trange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set urange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set vrange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set xlabel "x" 0.000000,0.000000 font "" -set x2label "" 0.000000,0.000000 font "" -set xrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set x2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set ylabel "y" 0.000000,0.000000 font "" -set y2label "" 0.000000,0.000000 font "" -set yrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set y2range [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zlabel "" 0.000000,0.000000 font "" -set zrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set cblabel "" 0.000000,0.000000 font "" -set cbrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set zero 1e-08 -set lmargin -1 -set bmargin -1 -set rmargin -1 -set tmargin -1 -set locale "C" -set pm3d scansautomatic flush begin noftriangles nohidden3d implicit corners2color mean -unset pm3d -set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB -set palette rgbformulae 7, 5, 15 -set colorbox default -set colorbox vertical origin 0.9,0.2 size 0.1,0.63 bdefault -set loadpath -set fontpath -set fit noerrorvariables -set output "RT1_00_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:3 title "v0_x" -set output "RT1_00_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:4 title "v0_y" -set output "RT1_01_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:5 title "v1_x" -set output "RT1_01_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:6 title "v1_y" -set output "RT1_02_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:7 title "v2_x" -set output "RT1_02_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:8 title "v2_y" -set output "RT1_03_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:9 title "v3_x" -set output "RT1_03_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:10 title "v3_y" -set output "RT1_04_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:11 title "v4_x" -set output "RT1_04_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:12 title "v4_y" -set output "RT1_05_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:13 title "v5_x" -set output "RT1_05_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:14 title "v5_y" -set output "RT1_06_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:15 title "v6_x" -set output "RT1_06_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:16 title "v6_y" -set output "RT1_07_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:17 title "v7_x" -set output "RT1_07_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:18 title "v7_y" -set output "RT1_08_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:19 title "v8_x" -set output "RT1_08_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:20 title "v8_y" -set output "RT1_09_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:21 title "v9_x" -set output "RT1_09_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:22 title "v9_y" -set output "RT1_10_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:23 title "v10_x" -set output "RT1_10_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:24 title "v10_y" -set output "RT1_11_x.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:25 title "v11_x" -set output "RT1_11_y.eps" -splot "< perl -ne \'print if s/DEAL:RT<2>.1.::value//;\' output" using 1:2:26 title "v11_y" -# EOF diff --git a/tests/fe/rtdiff.cc b/tests/fe/rtdiff.cc index 2a6698cfbe..2dcae6f043 100644 --- a/tests/fe/rtdiff.cc +++ b/tests/fe/rtdiff.cc @@ -143,7 +143,7 @@ test (unsigned int degree) int main() { - std::ofstream logfile ("rtdiff/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/rtdiff/cmp/generic b/tests/fe/rtdiff.output similarity index 100% rename from tests/fe/rtdiff/cmp/generic rename to tests/fe/rtdiff.output diff --git a/tests/fe/rtn_1.cc b/tests/fe/rtn_1.cc index 3e92040375..02a7d6a5b4 100644 --- a/tests/fe/rtn_1.cc +++ b/tests/fe/rtn_1.cc @@ -138,7 +138,7 @@ check_face_support_points (const FiniteElement &fe) int main() { - std::ofstream logfile ("rtn_1/output"); + std::ofstream logfile ("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/rtn_1/cmp/generic b/tests/fe/rtn_1.output similarity index 100% rename from tests/fe/rtn_1/cmp/generic rename to tests/fe/rtn_1.output diff --git a/tests/fe/rtn_2.cc b/tests/fe/rtn_2.cc index 68f87da9f9..c5c32766f6 100644 --- a/tests/fe/rtn_2.cc +++ b/tests/fe/rtn_2.cc @@ -75,7 +75,7 @@ plot_shape_functions(const unsigned int degree) int main() { - std::ofstream logfile ("rtn_2/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/rtn_2/cmp/generic b/tests/fe/rtn_2.output similarity index 100% rename from tests/fe/rtn_2/cmp/generic rename to tests/fe/rtn_2.output diff --git a/tests/fe/rtn_3.cc b/tests/fe/rtn_3.cc index 5c59c0d514..dd31d1f545 100644 --- a/tests/fe/rtn_3.cc +++ b/tests/fe/rtn_3.cc @@ -50,7 +50,7 @@ void test () int main() { - std::ofstream logfile ("rtn_3/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/rtn_3/cmp/generic b/tests/fe/rtn_3.output similarity index 100% rename from tests/fe/rtn_3/cmp/generic rename to tests/fe/rtn_3.output diff --git a/tests/fe/shapes_dgp.cc b/tests/fe/shapes_dgp.cc index 7a884ea3b7..e2c2ac7cc1 100644 --- a/tests/fe/shapes_dgp.cc +++ b/tests/fe/shapes_dgp.cc @@ -68,7 +68,7 @@ void plot_FE_DGP_shape_functions() int main() { - std::ofstream logfile ("shapes_dgp/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_dgp/cmp/generic b/tests/fe/shapes_dgp.output similarity index 100% rename from tests/fe/shapes_dgp/cmp/generic rename to tests/fe/shapes_dgp.output diff --git a/tests/fe/shapes_dgp_monomial.cc b/tests/fe/shapes_dgp_monomial.cc index 6cdc44c337..bbb1070884 100644 --- a/tests/fe/shapes_dgp_monomial.cc +++ b/tests/fe/shapes_dgp_monomial.cc @@ -53,7 +53,7 @@ void plot_FE_DGPMonomial_shape_functions() int main() { - std::ofstream logfile ("shapes_dgp_monomial/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_dgp_monomial/cmp/generic b/tests/fe/shapes_dgp_monomial.output similarity index 100% rename from tests/fe/shapes_dgp_monomial/cmp/generic rename to tests/fe/shapes_dgp_monomial.output diff --git a/tests/fe/shapes_dgp_nonparametric.cc b/tests/fe/shapes_dgp_nonparametric.cc index b1b5cc3c5d..74887ef740 100644 --- a/tests/fe/shapes_dgp_nonparametric.cc +++ b/tests/fe/shapes_dgp_nonparametric.cc @@ -55,7 +55,7 @@ void plot_FE_DGPNonparametric_shape_functions() int main() { - std::ofstream logfile ("shapes_dgp_nonparametric/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_dgp_nonparametric/cmp/generic b/tests/fe/shapes_dgp_nonparametric.output similarity index 100% rename from tests/fe/shapes_dgp_nonparametric/cmp/generic rename to tests/fe/shapes_dgp_nonparametric.output diff --git a/tests/fe/shapes_dgq.cc b/tests/fe/shapes_dgq.cc index fcd8f99203..240251f201 100644 --- a/tests/fe/shapes_dgq.cc +++ b/tests/fe/shapes_dgq.cc @@ -80,7 +80,7 @@ void plot_FE_DGQ_shape_functions() int main() { - std::ofstream logfile ("shapes_dgq/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_dgq/cmp/generic b/tests/fe/shapes_dgq.output similarity index 100% rename from tests/fe/shapes_dgq/cmp/generic rename to tests/fe/shapes_dgq.output diff --git a/tests/fe/shapes_faceq.cc b/tests/fe/shapes_faceq.cc index fdbe409ee5..6aa0d1fdd6 100644 --- a/tests/fe/shapes_faceq.cc +++ b/tests/fe/shapes_faceq.cc @@ -56,7 +56,7 @@ void plot_FE_FaceQ_shape_functions() int main() { - const std::string logname = JobIdentifier::base_name(__FILE__) + std::string("/output"); + const std::string logname = "/output"; std::ofstream logfile(logname.c_str()); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/shapes_faceq/cmp/generic b/tests/fe/shapes_faceq.output similarity index 100% rename from tests/fe/shapes_faceq/cmp/generic rename to tests/fe/shapes_faceq.output diff --git a/tests/fe/shapes_nedelec.cc b/tests/fe/shapes_nedelec.cc index 986199e833..5683f28163 100644 --- a/tests/fe/shapes_nedelec.cc +++ b/tests/fe/shapes_nedelec.cc @@ -41,7 +41,7 @@ void plot_FE_Nedelec_shape_functions() int main() { - std::ofstream logfile ("shapes_nedelec/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_nedelec/cmp/generic b/tests/fe/shapes_nedelec.output similarity index 100% rename from tests/fe/shapes_nedelec/cmp/generic rename to tests/fe/shapes_nedelec.output diff --git a/tests/fe/shapes_q.cc b/tests/fe/shapes_q.cc index 027729e873..47889ffbd0 100644 --- a/tests/fe/shapes_q.cc +++ b/tests/fe/shapes_q.cc @@ -73,7 +73,7 @@ void plot_FE_Q_shape_functions() int main() { - std::ofstream logfile ("shapes_q/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_q/cmp/generic b/tests/fe/shapes_q.output similarity index 100% rename from tests/fe/shapes_q/cmp/generic rename to tests/fe/shapes_q.output diff --git a/tests/fe/shapes_q_dg0.cc b/tests/fe/shapes_q_dg0.cc index 05092ee3ef..5890abd0f7 100644 --- a/tests/fe/shapes_q_dg0.cc +++ b/tests/fe/shapes_q_dg0.cc @@ -73,7 +73,7 @@ void plot_FE_Q_DG0_shape_functions() int main() { - std::ofstream logfile ("shapes_q_dg0/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_q_dg0/cmp/generic b/tests/fe/shapes_q_dg0.output similarity index 100% rename from tests/fe/shapes_q_dg0/cmp/generic rename to tests/fe/shapes_q_dg0.output diff --git a/tests/fe/shapes_q_hierarchical.cc b/tests/fe/shapes_q_hierarchical.cc index c545685810..701b0a6ed1 100644 --- a/tests/fe/shapes_q_hierarchical.cc +++ b/tests/fe/shapes_q_hierarchical.cc @@ -60,7 +60,7 @@ void plot_FE_Q_Hierarchical_shape_functions() int main() { - std::ofstream logfile ("shapes_q_hierarchical/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_q_hierarchical/cmp/generic b/tests/fe/shapes_q_hierarchical.output similarity index 100% rename from tests/fe/shapes_q_hierarchical/cmp/generic rename to tests/fe/shapes_q_hierarchical.output diff --git a/tests/fe/shapes_q_iso_q1.cc b/tests/fe/shapes_q_iso_q1.cc index b5c489f44b..aa1f43b308 100644 --- a/tests/fe/shapes_q_iso_q1.cc +++ b/tests/fe/shapes_q_iso_q1.cc @@ -61,7 +61,7 @@ void plot_FE_Q_shape_functions() int main() { - std::ofstream logfile ("shapes_q_iso_q1/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_q_iso_q1/cmp/generic b/tests/fe/shapes_q_iso_q1.output similarity index 100% rename from tests/fe/shapes_q_iso_q1/cmp/generic rename to tests/fe/shapes_q_iso_q1.output diff --git a/tests/fe/shapes_system.cc b/tests/fe/shapes_system.cc index 842f28097b..b8c61427a2 100644 --- a/tests/fe/shapes_system.cc +++ b/tests/fe/shapes_system.cc @@ -84,7 +84,7 @@ void plot_FE_System_shape_functions() int main() { - std::ofstream logfile ("shapes_system/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION) << std::fixed; deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/fe/shapes_system/cmp/generic b/tests/fe/shapes_system.output similarity index 100% rename from tests/fe/shapes_system/cmp/generic rename to tests/fe/shapes_system.output diff --git a/tests/fe/system_01.cc b/tests/fe/system_01.cc index 7122153e80..5948e9e1f5 100644 --- a/tests/fe/system_01.cc +++ b/tests/fe/system_01.cc @@ -78,7 +78,7 @@ check(const FiniteElement &fe1, int main() { - std::ofstream logfile ("system_01/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/system_01/cmp/generic b/tests/fe/system_01.output similarity index 100% rename from tests/fe/system_01/cmp/generic rename to tests/fe/system_01.output diff --git a/tests/fe/system_02.cc b/tests/fe/system_02.cc index 3ada616a31..1f01cd4e97 100644 --- a/tests/fe/system_02.cc +++ b/tests/fe/system_02.cc @@ -47,7 +47,7 @@ check(FESystem &fe) int main() { - std::ofstream logfile ("system_02/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/system_02/cmp/generic b/tests/fe/system_02.output similarity index 100% rename from tests/fe/system_02/cmp/generic rename to tests/fe/system_02.output diff --git a/tests/fe/system_index.cc b/tests/fe/system_index.cc index f9e8465bdd..f844865dfb 100644 --- a/tests/fe/system_index.cc +++ b/tests/fe/system_index.cc @@ -150,7 +150,7 @@ void check() int main() { - std::ofstream logfile ("system_index/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/system_index/cmp/generic b/tests/fe/system_index.output similarity index 100% rename from tests/fe/system_index/cmp/generic rename to tests/fe/system_index.output diff --git a/tests/fe/traits.cc b/tests/fe/traits.cc index 7d36faae7d..499f31b3dd 100644 --- a/tests/fe/traits.cc +++ b/tests/fe/traits.cc @@ -122,7 +122,7 @@ void check () int main () { - std::ofstream logfile("traits/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/fe/traits/cmp/generic b/tests/fe/traits.output similarity index 100% rename from tests/fe/traits/cmp/generic rename to tests/fe/traits.output diff --git a/tests/fe/transfer.cc b/tests/fe/transfer.cc index e78c091611..9f6fb615d8 100644 --- a/tests/fe/transfer.cc +++ b/tests/fe/transfer.cc @@ -75,7 +75,7 @@ print_matrix(Triangulation &tr, int main() { - std::ofstream logfile("transfer/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog << std::setprecision(3); deallog.depth_console(0); diff --git a/tests/fe/transfer/cmp/generic b/tests/fe/transfer.output similarity index 100% rename from tests/fe/transfer/cmp/generic rename to tests/fe/transfer.output diff --git a/tests/fe/up_and_down.cc b/tests/fe/up_and_down.cc index cfe9f4211e..2c412fb93b 100644 --- a/tests/fe/up_and_down.cc +++ b/tests/fe/up_and_down.cc @@ -243,7 +243,7 @@ void test () int main() { - std::ofstream logfile ("up_and_down/output"); + std::ofstream logfile ("output"); deallog << std::setprecision(PRECISION); deallog << std::fixed; deallog.attach(logfile); diff --git a/tests/fe/up_and_down/cmp/generic b/tests/fe/up_and_down.output similarity index 100% rename from tests/fe/up_and_down/cmp/generic rename to tests/fe/up_and_down.output -- 2.39.5