From: Matthias Maier Date: Thu, 5 Sep 2013 15:35:13 +0000 (+0000) Subject: Port coarse_grid_common.h X-Git-Tag: v8.1.0~570^2~375 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13617e08c5c74aa9bd19e1fcc8bc5b25b66a4bf2;p=dealii.git Port coarse_grid_common.h git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30608 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/distributed_grids/2d_coarse_grid_01.cc b/tests/distributed_grids/2d_coarse_grid_01.cc index b8e3572e31..f97c749b74 100644 --- a/tests/distributed_grids/2d_coarse_grid_01.cc +++ b/tests/distributed_grids/2d_coarse_grid_01.cc @@ -40,7 +40,7 @@ void test(std::ostream & /*out*/) parallel::distributed::Triangulation tr(MPI_COMM_WORLD); GridGenerator::hyper_cube(tr); - write_vtk (tr, "2d_coarse_grid_01", "1"); + write_vtk(tr, "1"); } @@ -51,7 +51,7 @@ void test(std::ostream & /*out*/) parallel::distributed::Triangulation tr(MPI_COMM_WORLD); GridGenerator::hyper_ball(tr, Point(), 3.); - write_vtk (tr, "2d_coarse_grid_01", "2"); + write_vtk(tr, "2"); } if (true) @@ -61,7 +61,7 @@ void test(std::ostream & /*out*/) parallel::distributed::Triangulation tr(MPI_COMM_WORLD); GridGenerator::half_hyper_ball(tr, Point(), 3.); - write_vtk (tr, "2d_coarse_grid_01", "3"); + write_vtk(tr, "3"); } } diff --git a/tests/distributed_grids/2d_coarse_grid_02.cc b/tests/distributed_grids/2d_coarse_grid_02.cc index ecfdb5ecc7..01c71e48fc 100644 --- a/tests/distributed_grids/2d_coarse_grid_02.cc +++ b/tests/distributed_grids/2d_coarse_grid_02.cc @@ -52,7 +52,7 @@ void test(std::ostream & /*out*/) << std::endl; } - write_vtk (tr, "2d_coarse_grid_02", "1"); + write_vtk(tr, "1"); } diff --git a/tests/distributed_grids/2d_coarse_grid_03.cc b/tests/distributed_grids/2d_coarse_grid_03.cc index 1428c08c16..740f2392e3 100644 --- a/tests/distributed_grids/2d_coarse_grid_03.cc +++ b/tests/distributed_grids/2d_coarse_grid_03.cc @@ -40,7 +40,7 @@ void test(std::ostream & /*out*/) std::ifstream in (SOURCE_DIR "/../deal.II/grid_in/2d.inp"); gi.read_ucd (in); - write_vtk (tr, "2d_coarse_grid_03", "1"); + write_vtk(tr, "1"); } diff --git a/tests/distributed_grids/2d_coarse_grid_04.cc b/tests/distributed_grids/2d_coarse_grid_04.cc index 1a53a61d21..66c4ada1dc 100644 --- a/tests/distributed_grids/2d_coarse_grid_04.cc +++ b/tests/distributed_grids/2d_coarse_grid_04.cc @@ -38,7 +38,7 @@ void test(std::ostream & /*out*/) gi.attach_triangulation (tr); gi.read ("../bits/step-5/circle-grid.inp"); - write_vtk (tr, "2d_coarse_grid_04", "1"); + write_vtk(tr, "1"); } diff --git a/tests/distributed_grids/2d_coarsening_01.cc b/tests/distributed_grids/2d_coarsening_01.cc index 8dab24c414..6b12535c93 100644 --- a/tests/distributed_grids/2d_coarsening_01.cc +++ b/tests/distributed_grids/2d_coarsening_01.cc @@ -44,7 +44,7 @@ void test(std::ostream & /*out*/) tr.begin(1)->child(c)->set_coarsen_flag(); tr.execute_coarsening_and_refinement (); - write_vtk (tr, "2d_coarsening_01", "2"); + write_vtk(tr, "2"); } diff --git a/tests/distributed_grids/2d_coarsening_02.cc b/tests/distributed_grids/2d_coarsening_02.cc index 4b090cb7b1..47d8cd5a7d 100644 --- a/tests/distributed_grids/2d_coarsening_02.cc +++ b/tests/distributed_grids/2d_coarsening_02.cc @@ -106,14 +106,14 @@ void test(std::ostream & /*out*/) tr.execute_coarsening_and_refinement (); tr2.execute_coarsening_and_refinement (); - write_vtk (tr, "2d_coarsening_02", "1"); + write_vtk(tr, "1"); deallog << std::endl; deallog << i << " Number of cells: " << tr.n_active_cells() << ' ' << tr2.n_active_cells() << std::endl; - assert_tria_equal("2d_coarsening_02", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/2d_coarsening_03.cc b/tests/distributed_grids/2d_coarsening_03.cc index 2c560adf10..f70ae0d303 100644 --- a/tests/distributed_grids/2d_coarsening_03.cc +++ b/tests/distributed_grids/2d_coarsening_03.cc @@ -104,7 +104,7 @@ void test(std::ostream & /*out*/) } deallog << tr.n_active_cells() << ' ' << tr2.n_active_cells() << std::endl; - assert_tria_equal("2d_coarsening_03", tr, tr2); + assert_tria_equal(tr, tr2); for (unsigned int i=0; i<1; ++i) { @@ -174,7 +174,7 @@ void test(std::ostream & /*out*/) << tr.n_active_cells() << ' ' << tr2.n_active_cells() << std::endl; - assert_tria_equal("2d_coarsening_03", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/2d_coarsening_05.cc b/tests/distributed_grids/2d_coarsening_05.cc index 3b5374b6f1..c700b92bf6 100644 --- a/tests/distributed_grids/2d_coarsening_05.cc +++ b/tests/distributed_grids/2d_coarsening_05.cc @@ -101,7 +101,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("2d_coarsening_05", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/2d_refinement_01.cc b/tests/distributed_grids/2d_refinement_01.cc index 05e7adeab6..881a735f67 100644 --- a/tests/distributed_grids/2d_refinement_01.cc +++ b/tests/distributed_grids/2d_refinement_01.cc @@ -42,7 +42,7 @@ void test(std::ostream & /*out*/) tr.begin_active()->set_refine_flag(); tr.execute_coarsening_and_refinement (); - write_vtk (tr, "2d_refinement_01", "2"); + write_vtk(tr, "2"); } diff --git a/tests/distributed_grids/2d_refinement_02.cc b/tests/distributed_grids/2d_refinement_02.cc index 6e43150188..6162921d86 100644 --- a/tests/distributed_grids/2d_refinement_02.cc +++ b/tests/distributed_grids/2d_refinement_02.cc @@ -93,7 +93,7 @@ void test(std::ostream & /*out*/) tr.execute_coarsening_and_refinement (); tr2.execute_coarsening_and_refinement (); - write_vtk (tr, "2d_refinement_02", "1"); + write_vtk(tr, "1"); deallog << std::endl; deallog << i << " Number of cells: " @@ -101,7 +101,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("2d_refinement_02", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/2d_refinement_03.cc b/tests/distributed_grids/2d_refinement_03.cc index bd195cf4d0..a7cc481cdc 100644 --- a/tests/distributed_grids/2d_refinement_03.cc +++ b/tests/distributed_grids/2d_refinement_03.cc @@ -123,7 +123,7 @@ void test(std::ostream & /*out*/) << std::endl; } -// write_vtk (tr, "2d_refinement_03", "1"); +// write_vtk(tr, "1"); deallog << std::endl; deallog << i << " Number of cells: " @@ -131,7 +131,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("2d_refinement_03", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/2d_refinement_05.cc b/tests/distributed_grids/2d_refinement_05.cc index 80ac7fb7fd..013ed860b2 100644 --- a/tests/distributed_grids/2d_refinement_05.cc +++ b/tests/distributed_grids/2d_refinement_05.cc @@ -51,7 +51,7 @@ void test(std::ostream & /*out*/) GridGenerator::hyper_cube(tr2); tr2.refine_global (1); - assert_tria_equal("2d_refinement_05", tr, tr2); + assert_tria_equal(tr, tr2); while (tr.n_active_cells() < 50000) { @@ -88,7 +88,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("2d_refinement_05", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/2d_refinement_06.cc b/tests/distributed_grids/2d_refinement_06.cc index 5b0e24d066..f877e4f83a 100644 --- a/tests/distributed_grids/2d_refinement_06.cc +++ b/tests/distributed_grids/2d_refinement_06.cc @@ -49,7 +49,7 @@ void test(std::ostream & /*out*/) tr.begin(1)->child(3)->set_refine_flag(); tr.execute_coarsening_and_refinement (); -// write_vtk (tr, "2d_refinement_06", "1"); +// write_vtk(tr, "1"); deallog << "cells test1: " << tr.n_active_cells() << std::endl; } { @@ -61,7 +61,7 @@ void test(std::ostream & /*out*/) tr.begin(0)->child(3)->set_refine_flag(); tr.execute_coarsening_and_refinement (); -// write_vtk (tr, "2d_refinement_06", "2"); +// write_vtk(tr, "2"); deallog << "cells test2: " << tr.n_active_cells() << std::endl; } diff --git a/tests/distributed_grids/3d_coarse_grid_01.cc b/tests/distributed_grids/3d_coarse_grid_01.cc index 9e6e8a8c6c..61b4979ecd 100644 --- a/tests/distributed_grids/3d_coarse_grid_01.cc +++ b/tests/distributed_grids/3d_coarse_grid_01.cc @@ -40,7 +40,7 @@ void test(std::ostream & /*out*/) parallel::distributed::Triangulation tr(MPI_COMM_WORLD); GridGenerator::hyper_cube(tr); - write_vtk (tr, "3d_coarse_grid_01", "1"); + write_vtk(tr, "1"); } @@ -51,7 +51,7 @@ void test(std::ostream & /*out*/) parallel::distributed::Triangulation tr(MPI_COMM_WORLD); GridGenerator::hyper_ball(tr, Point(), 3.); - write_vtk (tr, "3d_coarse_grid_01", "2"); + write_vtk(tr, "2"); } if (true) @@ -61,7 +61,7 @@ void test(std::ostream & /*out*/) parallel::distributed::Triangulation tr(MPI_COMM_WORLD); GridGenerator::half_hyper_ball(tr, Point(), 3.); - write_vtk (tr, "3d_coarse_grid_01", "3"); + write_vtk(tr, "3"); } } diff --git a/tests/distributed_grids/3d_coarse_grid_02.cc b/tests/distributed_grids/3d_coarse_grid_02.cc index 80191cab06..c3d1abd922 100644 --- a/tests/distributed_grids/3d_coarse_grid_02.cc +++ b/tests/distributed_grids/3d_coarse_grid_02.cc @@ -44,7 +44,7 @@ void test(const char *filename) std::ifstream in (filename); gi.read_xda (in); - write_vtk (tr, "3d_coarse_grid_02", "1"); + write_vtk(tr, "1"); deallog.pop (); } diff --git a/tests/distributed_grids/3d_coarse_grid_03.cc b/tests/distributed_grids/3d_coarse_grid_03.cc index 996c529876..272f0ca1fb 100644 --- a/tests/distributed_grids/3d_coarse_grid_03.cc +++ b/tests/distributed_grids/3d_coarse_grid_03.cc @@ -40,7 +40,7 @@ void test(std::ostream & /*out*/) std::ifstream in ("../bits/gerold_1.inp"); gi.read_ucd (in); - write_vtk (tr, "3d_coarse_grid_03", "1"); + write_vtk(tr, "1"); } diff --git a/tests/distributed_grids/3d_coarse_grid_04.cc b/tests/distributed_grids/3d_coarse_grid_04.cc index 2f45b18236..0d2bf946ad 100644 --- a/tests/distributed_grids/3d_coarse_grid_04.cc +++ b/tests/distributed_grids/3d_coarse_grid_04.cc @@ -38,7 +38,7 @@ void test(std::ostream & /*out*/) gi.attach_triangulation (tr); gi.read ("../bits/two_cubes.inp"); - write_vtk (tr, "3d_coarse_grid_04", "1"); + write_vtk(tr, "1"); } diff --git a/tests/distributed_grids/3d_coarse_grid_05.cc b/tests/distributed_grids/3d_coarse_grid_05.cc index 420d62b8e3..1057112fb7 100644 --- a/tests/distributed_grids/3d_coarse_grid_05.cc +++ b/tests/distributed_grids/3d_coarse_grid_05.cc @@ -139,7 +139,7 @@ void test(std::ostream & /*out*/) create_disconnected_mesh (tr); - write_vtk (tr, "3d_coarse_grid_05", "1"); + write_vtk(tr, "1"); } diff --git a/tests/distributed_grids/3d_coarsening_01.cc b/tests/distributed_grids/3d_coarsening_01.cc index c7ef9acc95..fcc635e637 100644 --- a/tests/distributed_grids/3d_coarsening_01.cc +++ b/tests/distributed_grids/3d_coarsening_01.cc @@ -44,7 +44,7 @@ void test(std::ostream & /*out*/) tr.begin(1)->child(c)->set_coarsen_flag(); tr.execute_coarsening_and_refinement (); - write_vtk (tr, "3d_coarsening_01", "2"); + write_vtk(tr, "2"); } diff --git a/tests/distributed_grids/3d_coarsening_02.cc b/tests/distributed_grids/3d_coarsening_02.cc index b74ea13b74..2fb86d4f5e 100644 --- a/tests/distributed_grids/3d_coarsening_02.cc +++ b/tests/distributed_grids/3d_coarsening_02.cc @@ -106,7 +106,7 @@ void test(std::ostream & /*out*/) tr.execute_coarsening_and_refinement (); tr2.execute_coarsening_and_refinement (); - write_vtk (tr, "3d_coarsening_02", "1"); + write_vtk(tr, "1"); deallog << std::endl; deallog << i << " Number of cells: " @@ -114,7 +114,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("3d_coarsening_02", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/3d_coarsening_03.cc b/tests/distributed_grids/3d_coarsening_03.cc index f9428c145b..b1f2b811f2 100644 --- a/tests/distributed_grids/3d_coarsening_03.cc +++ b/tests/distributed_grids/3d_coarsening_03.cc @@ -103,7 +103,7 @@ void test(std::ostream & /*out*/) tr.execute_coarsening_and_refinement (); tr2.execute_coarsening_and_refinement (); -//write_vtk (tr, "3d_coarsening_02", "1"); +//write_vtk(tr, "1"); deallog << std::endl; deallog << i << " Number of cells: " @@ -111,7 +111,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("3d_coarsening_03", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/3d_coarsening_04.cc b/tests/distributed_grids/3d_coarsening_04.cc index ef15527c94..fc48d22fee 100644 --- a/tests/distributed_grids/3d_coarsening_04.cc +++ b/tests/distributed_grids/3d_coarsening_04.cc @@ -112,7 +112,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("3d_coarsening_04", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/3d_coarsening_05.cc b/tests/distributed_grids/3d_coarsening_05.cc index 5ba688788a..b067cc3288 100644 --- a/tests/distributed_grids/3d_coarsening_05.cc +++ b/tests/distributed_grids/3d_coarsening_05.cc @@ -101,7 +101,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("3d_coarsening_05", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/3d_refinement_01.cc b/tests/distributed_grids/3d_refinement_01.cc index 6571b41bdb..d287132a19 100644 --- a/tests/distributed_grids/3d_refinement_01.cc +++ b/tests/distributed_grids/3d_refinement_01.cc @@ -42,7 +42,7 @@ void test(std::ostream & /*out*/) tr.begin_active()->set_refine_flag(); tr.execute_coarsening_and_refinement (); - write_vtk (tr, "3d_refinement_01", "2"); + write_vtk(tr, "2"); } diff --git a/tests/distributed_grids/3d_refinement_02.cc b/tests/distributed_grids/3d_refinement_02.cc index b126caa0c8..19e01a0634 100644 --- a/tests/distributed_grids/3d_refinement_02.cc +++ b/tests/distributed_grids/3d_refinement_02.cc @@ -93,7 +93,7 @@ void test(std::ostream & /*out*/) tr.execute_coarsening_and_refinement (); tr2.execute_coarsening_and_refinement (); - write_vtk (tr, "3d_refinement_02", "1"); + write_vtk(tr, "1"); deallog << std::endl; deallog << i << " Number of cells: " @@ -101,7 +101,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("3d_refinement_02", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/3d_refinement_03.cc b/tests/distributed_grids/3d_refinement_03.cc index d6a96ee56a..f5cbabe031 100644 --- a/tests/distributed_grids/3d_refinement_03.cc +++ b/tests/distributed_grids/3d_refinement_03.cc @@ -82,7 +82,7 @@ void test(std::ostream & /*out*/) tr.execute_coarsening_and_refinement (); tr2.execute_coarsening_and_refinement (); - write_vtk (tr, "3d_refinement_03", "1"); + write_vtk(tr, "1"); deallog << std::endl; deallog << i << " Number of cells: " @@ -90,7 +90,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("3d_refinement_03", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/3d_refinement_05.cc b/tests/distributed_grids/3d_refinement_05.cc index 25e94326d6..83b046570a 100644 --- a/tests/distributed_grids/3d_refinement_05.cc +++ b/tests/distributed_grids/3d_refinement_05.cc @@ -89,7 +89,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("3d_refinement_05", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/3d_refinement_06.cc b/tests/distributed_grids/3d_refinement_06.cc index d0e6e4d570..20465863de 100644 --- a/tests/distributed_grids/3d_refinement_06.cc +++ b/tests/distributed_grids/3d_refinement_06.cc @@ -59,7 +59,7 @@ void test(std::ostream & /*out*/) tr.begin(1)->child(c)->set_refine_flag(); tr.execute_coarsening_and_refinement (); -// write_vtk (tr, "3d_refinement_06", "1"); +// write_vtk(tr, "1"); deallog << "cells test1: " << tr.n_active_cells() << std::endl; Assert (tr.n_active_cells() == 120, ExcInternalError()); @@ -74,7 +74,7 @@ void test(std::ostream & /*out*/) tr.begin(0)->child(c)->set_refine_flag(); tr.execute_coarsening_and_refinement (); -// write_vtk (tr, "3d_refinement_06", "2"); +// write_vtk(tr, "2"); deallog << "cells test2: " << tr.n_active_cells() << std::endl; Assert (tr.n_active_cells() == 120, ExcInternalError()); diff --git a/tests/distributed_grids/3d_refinement_07.cc b/tests/distributed_grids/3d_refinement_07.cc index b3c9c84cae..3dd43826f8 100644 --- a/tests/distributed_grids/3d_refinement_07.cc +++ b/tests/distributed_grids/3d_refinement_07.cc @@ -50,7 +50,7 @@ void test(std::ostream & /*out*/) tr.begin(0)->child(c)->set_refine_flag(); tr.execute_coarsening_and_refinement (); -// write_vtk (tr, "3d_refinement_07", "2"); +// write_vtk(tr, "2"); deallog << "cells test2: " << tr.n_active_cells() << std::endl; Assert (tr.n_active_cells() == 88, ExcInternalError()); diff --git a/tests/distributed_grids/3d_refinement_08.cc b/tests/distributed_grids/3d_refinement_08.cc index 3824ea066a..d0c7502a41 100644 --- a/tests/distributed_grids/3d_refinement_08.cc +++ b/tests/distributed_grids/3d_refinement_08.cc @@ -91,7 +91,7 @@ void test(std::ostream & /*out*/) << tr2.n_active_cells() << std::endl; - assert_tria_equal("3d_refinement_08", tr, tr2); + assert_tria_equal(tr, tr2); } } diff --git a/tests/distributed_grids/coarse_grid_common.h b/tests/distributed_grids/coarse_grid_common.h index d724c5c905..deda5c05b1 100644 --- a/tests/distributed_grids/coarse_grid_common.h +++ b/tests/distributed_grids/coarse_grid_common.h @@ -28,14 +28,12 @@ template void write_vtk (const parallel::distributed::Triangulation &tria, - const char *dirname, const char *filename) { deallog << "Checksum: " << tria.get_checksum () << std::endl; - chdir (dirname); tria.write_mesh_vtk (filename); // copy the .pvtu and .vtu files @@ -59,19 +57,17 @@ void write_vtk (const parallel::distributed::Triangulation &tria, deallog.get_file_stream() << s << "\n"; } } - - chdir (".."); } template -void assert_tria_equal(const char *testdir, const Triangulation &a, const Triangulation &b) +void assert_tria_equal(const Triangulation &a, const Triangulation &b) { Assert (a.n_active_cells() == b.n_active_cells(), ExcInternalError()); - std::string file1=std::string(testdir)+"/tmp_grid1"; - std::string file2=std::string(testdir)+"/tmp_grid2"; + std::string file1 = "tmp_grid1"; + std::string file2 = "tmp_grid2"; std::ofstream out1(file1.c_str()); GridOut().write_gnuplot (a, out1);