From: maier Date: Wed, 21 Aug 2013 14:38:23 +0000 (+0000) Subject: Rearrange output X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=084469f73719328a48f564477595305dfa1873ff;p=dealii-svn.git Rearrange output git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30373 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5734afae9f..244bc326b1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -60,8 +60,9 @@ ENDIF() # # Set a default time limit of 60 seconds: # -SET_IF_EMPTY(DEAL_II_TEST_TIME_LIMIT 60) +SET_IF_EMPTY(DEAL_II_TEST_TIME_LIMIT 120) MESSAGE(STATUS "Proceed to test definitions") +ADD_SUBDIRECTORY(aniso) ADD_SUBDIRECTORY(base) diff --git a/tests/aniso/CMakeLists.txt b/tests/aniso/CMakeLists.txt new file mode 100644 index 0000000000..b901b9ed18 --- /dev/null +++ b/tests/aniso/CMakeLists.txt @@ -0,0 +1,8 @@ +GET_FILENAME_COMPONENT(_category ${CMAKE_CURRENT_SOURCE_DIR} NAME) + +FILE(GLOB _tests "*.output") + +FOREACH(_test ${_tests}) + GET_FILENAME_COMPONENT(_test ${_test} NAME_WE) + DEAL_II_ADD_TEST(${_category} ${_test}) +ENDFOREACH() diff --git a/tests/aniso/Makefile b/tests/aniso/Makefile deleted file mode 100644 index 3685d2473b..0000000000 --- a/tests/aniso/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -############################################################ -# $Id$ -# Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 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/aniso/anisotropic_crash/cmp/generic b/tests/aniso/anisotropic_crash.output similarity index 100% rename from tests/aniso/anisotropic_crash/cmp/generic rename to tests/aniso/anisotropic_crash.output diff --git a/tests/aniso/fe_tools/cmp/generic b/tests/aniso/fe_tools.output similarity index 100% rename from tests/aniso/fe_tools/cmp/generic rename to tests/aniso/fe_tools.output diff --git a/tests/aniso/hp_constraints_dgp_08/cmp/generic b/tests/aniso/hp_constraints_dgp_08.output similarity index 100% rename from tests/aniso/hp_constraints_dgp_08/cmp/generic rename to tests/aniso/hp_constraints_dgp_08.output diff --git a/tests/aniso/hp_constraints_dgp_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 b/tests/aniso/hp_constraints_dgp_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 deleted file mode 100644 index b5f363abfe..0000000000 --- a/tests/aniso/hp_constraints_dgp_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 +++ /dev/null @@ -1,4 +0,0 @@ - -DEAL::n_dofs=15 -DEAL::n_dofs=136 -DEAL::n_dofs=961 diff --git a/tests/aniso/hp_constraints_dgp_08/project_dgp_02/cmp/generic b/tests/aniso/hp_constraints_dgp_08/project_dgp_02/cmp/generic deleted file mode 100644 index 2be2d0d5f5..0000000000 --- a/tests/aniso/hp_constraints_dgp_08/project_dgp_02/cmp/generic +++ /dev/null @@ -1,178 +0,0 @@ - -DEAL::n_dofs=6 -DEAL:cg::Starting value 0.433 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(0), P_0, rel. error=0 -DEAL:cg::Starting value 0.967 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(0), P_1, rel. error=0.0244 -DEAL:cg::Starting value 1.60 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(0), P_2, rel. error=0.0487 -DEAL::n_dofs=12 -DEAL:cg::Starting value 0.433 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(1), P_0, rel. error=0 -DEAL:cg::Starting value 0.968 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(1), P_1, rel. error=0 -DEAL:cg::Starting value 1.60 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(1), P_2, rel. error=0.00142 -DEAL:cg::Starting value 2.33 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(1), P_3, rel. error=0.00405 -DEAL::n_dofs=18 -DEAL:cg::Starting value 0.433 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(2), P_0, rel. error=0 -DEAL:cg::Starting value 0.968 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(2), P_1, rel. error=0 -DEAL:cg::Starting value 1.60 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(2), P_2, rel. error=0 -DEAL:cg::Starting value 2.33 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(2), P_3, rel. error=8.49e-05 -DEAL:cg::Starting value 3.12 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(2), P_4, rel. error=0.000309 -DEAL::n_dofs=24 -DEAL:cg::Starting value 0.433 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(3), P_0, rel. error=0 -DEAL:cg::Starting value 0.968 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(3), P_1, rel. error=0 -DEAL:cg::Starting value 1.60 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(3), P_2, rel. error=0 -DEAL:cg::Starting value 2.33 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(3), P_3, rel. error=0 -DEAL:cg::Starting value 3.12 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(3), P_4, rel. error=5.07e-06 -DEAL:cg::Starting value 3.98 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(3), P_5, rel. error=2.23e-05 -DEAL::n_dofs=30 -DEAL:cg::Starting value 0.433 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(4), P_0, rel. error=0 -DEAL:cg::Starting value 0.968 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(4), P_1, rel. error=0 -DEAL:cg::Starting value 1.60 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(4), P_2, rel. error=0 -DEAL:cg::Starting value 2.33 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(4), P_3, rel. error=0 -DEAL:cg::Starting value 3.12 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(4), P_4, rel. error=0 -DEAL:cg::Starting value 3.98 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(4), P_5, rel. error=3.03e-07 -DEAL:cg::Starting value 4.91 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<1>(4), P_6, rel. error=1.57e-06 -DEAL::n_dofs=28 -DEAL:cg::Starting value 0.676 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(0), P_0, rel. error=0 -DEAL:cg::Starting value 1.45 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(0), P_1, rel. error=0.00998 -DEAL:cg::Starting value 2.31 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(0), P_2, rel. error=0.0192 -DEAL::n_dofs=84 -DEAL:cg::Starting value 0.676 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(1), P_0, rel. error=0 -DEAL:cg::Starting value 1.45 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(1), P_1, rel. error=0 -DEAL:cg::Starting value 2.32 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(1), P_2, rel. error=0.000642 -DEAL:cg::Starting value 3.27 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(1), P_3, rel. error=0.00167 -DEAL::n_dofs=168 -DEAL:cg::Starting value 0.676 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(2), P_0, rel. error=0 -DEAL:cg::Starting value 1.45 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(2), P_1, rel. error=0 -DEAL:cg::Starting value 2.32 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(2), P_2, rel. error=0 -DEAL:cg::Starting value 3.27 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(2), P_3, rel. error=4.03e-05 -DEAL:cg::Starting value 4.28 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(2), P_4, rel. error=0.000131 -DEAL::n_dofs=280 -DEAL:cg::Starting value 0.676 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(3), P_0, rel. error=0 -DEAL:cg::Starting value 1.45 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(3), P_1, rel. error=0 -DEAL:cg::Starting value 2.32 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(3), P_2, rel. error=0 -DEAL:cg::Starting value 3.27 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(3), P_3, rel. error=0 -DEAL:cg::Starting value 4.28 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(3), P_4, rel. error=2.49e-06 -DEAL:cg::Starting value 5.36 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<2>(3), P_5, rel. error=9.67e-06 -DEAL::n_dofs=120 -DEAL:cg::Starting value 0.708 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(0), P_0, rel. error=0 -DEAL:cg::Starting value 1.48 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(0), P_1, rel. error=0.00433 -DEAL:cg::Starting value 2.30 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(0), P_2, rel. error=0.00820 -DEAL::n_dofs=480 -DEAL:cg::Starting value 0.708 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(1), P_0, rel. error=0 -DEAL:cg::Starting value 1.48 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(1), P_1, rel. error=0 -DEAL:cg::Starting value 2.31 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(1), P_2, rel. error=0.000288 -DEAL:cg::Starting value 3.20 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(1), P_3, rel. error=0.000729 -DEAL::n_dofs=1200 -DEAL:cg::Starting value 0.708 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(2), P_0, rel. error=0 -DEAL:cg::Starting value 1.48 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(2), P_1, rel. error=0 -DEAL:cg::Starting value 2.31 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(2), P_2, rel. error=0 -DEAL:cg::Starting value 3.20 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(2), P_3, rel. error=1.85e-05 -DEAL:cg::Starting value 4.14 -DEAL:cg::Convergence step 1 value 0 -DEAL::FE_DGP<3>(2), P_4, rel. error=5.78e-05 diff --git a/tests/aniso/hp_constraints_dgp_monomial_08/cmp/generic b/tests/aniso/hp_constraints_dgp_monomial_08.output similarity index 100% rename from tests/aniso/hp_constraints_dgp_monomial_08/cmp/generic rename to tests/aniso/hp_constraints_dgp_monomial_08.output diff --git a/tests/aniso/hp_constraints_dgp_monomial_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 b/tests/aniso/hp_constraints_dgp_monomial_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 deleted file mode 100644 index b5f363abfe..0000000000 --- a/tests/aniso/hp_constraints_dgp_monomial_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 +++ /dev/null @@ -1,4 +0,0 @@ - -DEAL::n_dofs=15 -DEAL::n_dofs=136 -DEAL::n_dofs=961 diff --git a/tests/aniso/hp_constraints_dgp_nonparametric_08/cmp/generic b/tests/aniso/hp_constraints_dgp_nonparametric_08.output similarity index 100% rename from tests/aniso/hp_constraints_dgp_nonparametric_08/cmp/generic rename to tests/aniso/hp_constraints_dgp_nonparametric_08.output diff --git a/tests/aniso/hp_constraints_dgp_nonparametric_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 b/tests/aniso/hp_constraints_dgp_nonparametric_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 deleted file mode 100644 index b5f363abfe..0000000000 --- a/tests/aniso/hp_constraints_dgp_nonparametric_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 +++ /dev/null @@ -1,4 +0,0 @@ - -DEAL::n_dofs=15 -DEAL::n_dofs=136 -DEAL::n_dofs=961 diff --git a/tests/aniso/hp_constraints_dgq_08/cmp/generic b/tests/aniso/hp_constraints_dgq_08.output similarity index 100% rename from tests/aniso/hp_constraints_dgq_08/cmp/generic rename to tests/aniso/hp_constraints_dgq_08.output diff --git a/tests/aniso/hp_constraints_dgq_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 b/tests/aniso/hp_constraints_dgq_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 deleted file mode 100644 index 9ce91baeba..0000000000 --- a/tests/aniso/hp_constraints_dgq_08/cmp/powerpc-apple-darwin8.10.0+gcc4.0 +++ /dev/null @@ -1,4 +0,0 @@ - -DEAL::n_dofs=15 -DEAL::n_dofs=204 -DEAL::n_dofs=2689 diff --git a/tests/aniso/mesh_3d_21/cmp/generic b/tests/aniso/mesh_3d_21.output similarity index 100% rename from tests/aniso/mesh_3d_21/cmp/generic rename to tests/aniso/mesh_3d_21.output diff --git a/tests/aniso/refine_and_coarsen_anisotropic/cmp/generic b/tests/aniso/refine_and_coarsen_anisotropic.output similarity index 100% rename from tests/aniso/refine_and_coarsen_anisotropic/cmp/generic rename to tests/aniso/refine_and_coarsen_anisotropic.output diff --git a/tests/aniso/solution_transfer/cmp/generic b/tests/aniso/solution_transfer.output similarity index 100% rename from tests/aniso/solution_transfer/cmp/generic rename to tests/aniso/solution_transfer.output diff --git a/tests/aniso/up_and_down/cmp/generic b/tests/aniso/up_and_down.output similarity index 100% rename from tests/aniso/up_and_down/cmp/generic rename to tests/aniso/up_and_down.output