From a3047b92a96d2bfbaf258d056713526b90db6c99 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 5 Sep 2013 04:26:08 +0000 Subject: [PATCH] distributed_grid: Append SOURCE_DIR to actually find the grid to read in git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30606 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/distributed_grids/2d_coarse_grid_02.cc | 2 +- tests/distributed_grids/2d_coarse_grid_03.cc | 2 +- tests/distributed_grids/2d_coarsening_03.cc | 4 ++-- tests/distributed_grids/2d_refinement_03.cc | 4 ++-- tests/distributed_grids/3d_coarse_grid_02.cc | 20 ++++++++++---------- tests/distributed_grids/3d_coarse_grid_06.cc | 2 +- tests/distributed_grids/3d_coarsening_03.cc | 4 ++-- tests/distributed_grids/3d_coarsening_04.cc | 4 ++-- tests/distributed_grids/3d_refinement_03.cc | 4 ++-- tests/distributed_grids/3d_refinement_08.cc | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/distributed_grids/2d_coarse_grid_02.cc b/tests/distributed_grids/2d_coarse_grid_02.cc index 026d2f8c81..ecfdb5ecc7 100644 --- a/tests/distributed_grids/2d_coarse_grid_02.cc +++ b/tests/distributed_grids/2d_coarse_grid_02.cc @@ -39,7 +39,7 @@ void test(std::ostream & /*out*/) GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../deal.II/grid_in_02/2d.xda"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda"); try { gi.read_xda (in); diff --git a/tests/distributed_grids/2d_coarse_grid_03.cc b/tests/distributed_grids/2d_coarse_grid_03.cc index bbe607ef8c..1428c08c16 100644 --- a/tests/distributed_grids/2d_coarse_grid_03.cc +++ b/tests/distributed_grids/2d_coarse_grid_03.cc @@ -37,7 +37,7 @@ void test(std::ostream & /*out*/) GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../deal.II/grid_in/2d.inp"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in/2d.inp"); gi.read_ucd (in); write_vtk (tr, "2d_coarse_grid_03", "1"); diff --git a/tests/distributed_grids/2d_coarsening_03.cc b/tests/distributed_grids/2d_coarsening_03.cc index 98bfa2072f..2c560adf10 100644 --- a/tests/distributed_grids/2d_coarsening_03.cc +++ b/tests/distributed_grids/2d_coarsening_03.cc @@ -44,7 +44,7 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../deal.II/grid_in_02/2d.xda"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda"); try { gi.read_xda (in); @@ -61,7 +61,7 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr2); - std::ifstream in ("../deal.II/grid_in_02/2d.xda"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda"); try { gi.read_xda (in); diff --git a/tests/distributed_grids/2d_refinement_03.cc b/tests/distributed_grids/2d_refinement_03.cc index 647c202964..bd195cf4d0 100644 --- a/tests/distributed_grids/2d_refinement_03.cc +++ b/tests/distributed_grids/2d_refinement_03.cc @@ -44,7 +44,7 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../deal.II/grid_in_02/2d.xda"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda"); try { gi.read_xda (in); @@ -61,7 +61,7 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr2); - std::ifstream in ("../deal.II/grid_in_02/2d.xda"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda"); try { gi.read_xda (in); diff --git a/tests/distributed_grids/3d_coarse_grid_02.cc b/tests/distributed_grids/3d_coarse_grid_02.cc index b591d0aa7f..80191cab06 100644 --- a/tests/distributed_grids/3d_coarse_grid_02.cc +++ b/tests/distributed_grids/3d_coarse_grid_02.cc @@ -61,16 +61,16 @@ int main(int argc, char *argv[]) deallog.push("3d"); - test<3> ("../deal.II/grid_in_3d/1.in"); - test<3> ("../deal.II/grid_in_3d/2.in"); - test<3> ("../deal.II/grid_in_3d/3.in"); - test<3> ("../deal.II/grid_in_3d/4.in"); - - test<3> ("../deal.II/grid_in_3d/evil_0.in"); - test<3> ("../deal.II/grid_in_3d/evil_1.in"); - test<3> ("../deal.II/grid_in_3d/evil_2.in"); - test<3> ("../deal.II/grid_in_3d/evil_3.in"); - test<3> ("../deal.II/grid_in_3d/evil_4.in"); + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/1.in"); + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/2.in"); + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/3.in"); + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/4.in"); + + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/evil_0.in"); + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/evil_1.in"); + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/evil_2.in"); + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/evil_3.in"); + test<3> (SOURCE_DIR "/../deal.II/grid_in_3d/evil_4.in"); deallog.pop(); diff --git a/tests/distributed_grids/3d_coarse_grid_06.cc b/tests/distributed_grids/3d_coarse_grid_06.cc index 5bb8018bae..cb9f25fcc6 100644 --- a/tests/distributed_grids/3d_coarse_grid_06.cc +++ b/tests/distributed_grids/3d_coarse_grid_06.cc @@ -37,7 +37,7 @@ void test(std::ostream & /*out*/) GridIn gi; gi.attach_triangulation (tr); - gi.read ("../deal.II/grid_in_3d_02/747.ucd"); + gi.read (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd"); deallog << "Checksum: " << tr.get_checksum () diff --git a/tests/distributed_grids/3d_coarsening_03.cc b/tests/distributed_grids/3d_coarsening_03.cc index a5696697cd..f9428c145b 100644 --- a/tests/distributed_grids/3d_coarsening_03.cc +++ b/tests/distributed_grids/3d_coarsening_03.cc @@ -44,7 +44,7 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../deal.II/grid_in_3d/4.in"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d/4.in"); gi.read_xda (in); tr.refine_global (1); } @@ -52,7 +52,7 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr2); - std::ifstream in ("../deal.II/grid_in_3d/4.in"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d/4.in"); gi.read_xda (in); tr2.refine_global (1); } diff --git a/tests/distributed_grids/3d_coarsening_04.cc b/tests/distributed_grids/3d_coarsening_04.cc index 2b356084f2..ef15527c94 100644 --- a/tests/distributed_grids/3d_coarsening_04.cc +++ b/tests/distributed_grids/3d_coarsening_04.cc @@ -44,7 +44,7 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../deal.II/grid_in_3d_02/747.ucd"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd"); gi.read (in); //tr.refine_global (1); } @@ -52,7 +52,7 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr2); - std::ifstream in ("../deal.II/grid_in_3d_02/747.ucd"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd"); gi.read (in); //tr2.refine_global (1); } diff --git a/tests/distributed_grids/3d_refinement_03.cc b/tests/distributed_grids/3d_refinement_03.cc index 5582944a47..d6a96ee56a 100644 --- a/tests/distributed_grids/3d_refinement_03.cc +++ b/tests/distributed_grids/3d_refinement_03.cc @@ -44,14 +44,14 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../deal.II/grid_in_3d/4.in"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d/4.in"); gi.read_xda (in); } { GridIn gi; gi.attach_triangulation (tr2); - std::ifstream in ("../deal.II/grid_in_3d/4.in"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d/4.in"); gi.read_xda (in); } diff --git a/tests/distributed_grids/3d_refinement_08.cc b/tests/distributed_grids/3d_refinement_08.cc index 88676c5c31..3824ea066a 100644 --- a/tests/distributed_grids/3d_refinement_08.cc +++ b/tests/distributed_grids/3d_refinement_08.cc @@ -44,14 +44,14 @@ void test(std::ostream & /*out*/) { GridIn gi; gi.attach_triangulation (tr); - std::ifstream in ("../deal.II/grid_in_3d_02/747.ucd"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd"); gi.read (in); } { GridIn gi; gi.attach_triangulation (tr2); - std::ifstream in ("../deal.II/grid_in_3d_02/747.ucd"); + std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd"); gi.read (in); } -- 2.39.5