]> https://gitweb.dealii.org/ - dealii.git/commitdiff
distributed_grid: Append SOURCE_DIR to actually find the grid to read in
authorMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 5 Sep 2013 04:26:08 +0000 (04:26 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Thu, 5 Sep 2013 04:26:08 +0000 (04:26 +0000)
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
tests/distributed_grids/2d_coarse_grid_03.cc
tests/distributed_grids/2d_coarsening_03.cc
tests/distributed_grids/2d_refinement_03.cc
tests/distributed_grids/3d_coarse_grid_02.cc
tests/distributed_grids/3d_coarse_grid_06.cc
tests/distributed_grids/3d_coarsening_03.cc
tests/distributed_grids/3d_coarsening_04.cc
tests/distributed_grids/3d_refinement_03.cc
tests/distributed_grids/3d_refinement_08.cc

index 026d2f8c81a8d5b5663c2cc519fe1e750ba17e3c..ecfdb5ecc7e750d0282a47fcae4f585602222c6d 100644 (file)
@@ -39,7 +39,7 @@ void test(std::ostream & /*out*/)
 
   GridIn<dim> 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);
index bbe607ef8cb3e876987459f9bec0c2496e48a90b..1428c08c16bd6a9fca212c97c4c95d39ea83114b 100644 (file)
@@ -37,7 +37,7 @@ void test(std::ostream & /*out*/)
 
   GridIn<dim> 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");
index 98bfa2072f1de2c182a0e9f27046c9506b639a9f..2c560adf1011fe98d4b32d88462d7079706d2db4 100644 (file)
@@ -44,7 +44,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> 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<dim> 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);
index 647c202964221fb400d8f9fa90a4c9ba89e56c28..bd195cf4d032abbb435cab59c051a890d6c083d2 100644 (file)
@@ -44,7 +44,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> 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<dim> 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);
index b591d0aa7f0183aa0ea1bfb704abebdd948d0dca..80191cab0689cf333c92a677404402c00faf0b5f 100644 (file)
@@ -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();
 
index 5bb8018baeefd536ae07101ae210280526a262e3..cb9f25fcc6f9bc8ea729b7d139b570840ae4f014 100644 (file)
@@ -37,7 +37,7 @@ void test(std::ostream & /*out*/)
 
   GridIn<dim> 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 ()
index a5696697cd287aa32011972e261ad5cf75430141..f9428c145bc16b824393dda972f614044f99225e 100644 (file)
@@ -44,7 +44,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> 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<dim> 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);
   }
index 2b356084f2b771d1f221bdf1e295fc20dc3dd9a0..ef15527c94af98e770186a920e26dab5134c2cf4 100644 (file)
@@ -44,7 +44,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> 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<dim> 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);
   }
index 5582944a47f9374d1ee940a0f633984ca0bea998..d6a96ee56aa19106764548fb0dc7d48e87c1ee59 100644 (file)
@@ -44,14 +44,14 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> 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<dim> 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);
   }
 
index 88676c5c315570f10927e8738802cdc6a22ba839..3824ea066ad8c48f498c2c2079d073b5831863f6 100644 (file)
@@ -44,14 +44,14 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> 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<dim> 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);
   }
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.