From: Matthias Maier Date: Thu, 22 Aug 2013 19:04:59 +0000 (+0000) Subject: Port tests/grid X-Git-Tag: v8.1.0~570^2~421 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc98c51e37b15512ac83f9503c38a25e452d6f40;p=dealii.git Port tests/grid git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30434 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b94e7cf6bc..1b60cdef60 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -82,7 +82,7 @@ ADD_SUBDIRECTORY(codim_one) #deal.II #fail ADD_SUBDIRECTORY(fe) -#grid +ADD_SUBDIRECTORY(grid) #hp #integrators #lac diff --git a/tests/grid/CMakeLists.txt b/tests/grid/CMakeLists.txt new file mode 100644 index 0000000000..0efb828f2c --- /dev/null +++ b/tests/grid/CMakeLists.txt @@ -0,0 +1 @@ +DEAL_II_PICKUP_TESTS() diff --git a/tests/grid/Makefile b/tests/grid/Makefile deleted file mode 100644 index 3dc8d027c4..0000000000 --- a/tests/grid/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/grid/cell_id_01.cc b/tests/grid/cell_id_01.cc index 9524e85560..0f8cdc4f42 100644 --- a/tests/grid/cell_id_01.cc +++ b/tests/grid/cell_id_01.cc @@ -54,7 +54,7 @@ int main (int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); - initlog(__FILE__); + initlog(); deal_II_exceptions::disable_abort_on_exception(); { diff --git a/tests/grid/cell_id_01/cmp/generic b/tests/grid/cell_id_01.output similarity index 100% rename from tests/grid/cell_id_01/cmp/generic rename to tests/grid/cell_id_01.output diff --git a/tests/grid/cell_id_02.cc b/tests/grid/cell_id_02.cc index d99492882b..c5c32a4e9e 100644 --- a/tests/grid/cell_id_02.cc +++ b/tests/grid/cell_id_02.cc @@ -66,7 +66,7 @@ int main (int argc, char *argv[]) { Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); - initlog(__FILE__); + initlog(); deal_II_exceptions::disable_abort_on_exception(); Triangulation<2> tria; diff --git a/tests/grid/cell_id_02/cmp/generic b/tests/grid/cell_id_02.output similarity index 100% rename from tests/grid/cell_id_02/cmp/generic rename to tests/grid/cell_id_02.output diff --git a/tests/grid/grid_out_svg_01.cc b/tests/grid/grid_out_svg_01.cc index f9fd3b373f..99875086f5 100644 --- a/tests/grid/grid_out_svg_01.cc +++ b/tests/grid/grid_out_svg_01.cc @@ -66,7 +66,7 @@ Triangulation<2,2> create_grid() int main() { - initlog(__FILE__); + initlog(); GridOut grid_out; GridOutFlags::Svg svg_flags; diff --git a/tests/grid/grid_out_svg_01/cmp/generic b/tests/grid/grid_out_svg_01.output similarity index 100% rename from tests/grid/grid_out_svg_01/cmp/generic rename to tests/grid/grid_out_svg_01.output diff --git a/tests/grid/grid_out_svg_02.cc b/tests/grid/grid_out_svg_02.cc index 0a5881a35f..a743a65ecf 100644 --- a/tests/grid/grid_out_svg_02.cc +++ b/tests/grid/grid_out_svg_02.cc @@ -66,7 +66,7 @@ Triangulation<2,2> create_grid() int main() { - initlog(__FILE__); + initlog(); GridOut grid_out; GridOutFlags::Svg svg_flags; diff --git a/tests/grid/grid_out_svg_02/cmp/generic b/tests/grid/grid_out_svg_02.output similarity index 100% rename from tests/grid/grid_out_svg_02/cmp/generic rename to tests/grid/grid_out_svg_02.output diff --git a/tests/grid/ordering_01.cc b/tests/grid/ordering_01.cc index 9aec827dca..593b2e2ac0 100644 --- a/tests/grid/ordering_01.cc +++ b/tests/grid/ordering_01.cc @@ -82,7 +82,7 @@ void test1() int main() { - initlog(__FILE__); + initlog(); test1<2>(); return 0; diff --git a/tests/grid/ordering_01/cmp/generic b/tests/grid/ordering_01.output similarity index 100% rename from tests/grid/ordering_01/cmp/generic rename to tests/grid/ordering_01.output diff --git a/tests/grid/refine_and_coarsen_01.cc b/tests/grid/refine_and_coarsen_01.cc index 8b49adb5a2..3f2754682d 100644 --- a/tests/grid/refine_and_coarsen_01.cc +++ b/tests/grid/refine_and_coarsen_01.cc @@ -63,7 +63,7 @@ void check () int main () { - std::ofstream logfile("refine_and_coarsen_01/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); diff --git a/tests/grid/refine_and_coarsen_01/cmp/generic b/tests/grid/refine_and_coarsen_01.output similarity index 100% rename from tests/grid/refine_and_coarsen_01/cmp/generic rename to tests/grid/refine_and_coarsen_01.output