Testsuite: Also adjust location in disctributed_grids and mpi

We have a small number of tests under distributed_grids/ and mpi/ that read
in external grids from deal.II/ (which is now removed).

Update those references to the new location "../grid/grid_in*".

diff --git a/tests/distributed_grids/2d_coarse_grid_02.cc b/tests/distributed_grids/2d_coarse_grid_02.cc
index 7d0b8751d74fcfcec26e74822b6651d228a4b027..32743e0e0c7a77eb6992142a51e4b816b21c325b 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_02.cc
+++ b/tests/distributed_grids/2d_coarse_grid_02.cc
@@ -38,7 +38,7 @@ void test(std::ostream & /*out*/)
 
   GridIn<dim> gi;
   gi.attach_triangulation (tr);
-  std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda");
+  std::ifstream in (SOURCE_DIR "/../grid/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 d1e08f9ea884c0689dc7f8cdff22f106c0602801..f73d4ac0d5428af96e4f73314696d61a6ea2bf42 100644 (file)
--- a/tests/distributed_grids/2d_coarse_grid_03.cc
+++ b/tests/distributed_grids/2d_coarse_grid_03.cc
@@ -36,7 +36,7 @@ void test(std::ostream & /*out*/)
 
   GridIn<dim> gi;
   gi.attach_triangulation (tr);
-  std::ifstream in (SOURCE_DIR "/../deal.II/grid_in/2d.inp");
+  std::ifstream in (SOURCE_DIR "/../grid/grid_in/2d.inp");
   gi.read_ucd (in);
 
   write_vtk(tr, "1");

diff --git a/tests/distributed_grids/2d_coarsening_03.cc b/tests/distributed_grids/2d_coarsening_03.cc
index 1ce18114576088dd7e818edd192212557e5bf3cf..df7fbbfaed32de931dffd6e21c64b0e36f979618 100644 (file)
--- a/tests/distributed_grids/2d_coarsening_03.cc
+++ b/tests/distributed_grids/2d_coarsening_03.cc
@@ -43,7 +43,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda");
+    std::ifstream in (SOURCE_DIR "/../grid/grid_in_02/2d.xda");
     try
       {
         gi.read_xda (in);
@@ -60,7 +60,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr2);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda");
+    std::ifstream in (SOURCE_DIR "/../grid/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 719b02b6cfe9ea906c1e0da58de4f9fe7428c7fa..3ed03a64259f618e15457fe94d2c2e0ba895be3c 100644 (file)
--- a/tests/distributed_grids/2d_refinement_03.cc
+++ b/tests/distributed_grids/2d_refinement_03.cc
@@ -43,7 +43,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda");
+    std::ifstream in (SOURCE_DIR "/../grid/grid_in_02/2d.xda");
     try
       {
         gi.read_xda (in);
@@ -60,7 +60,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr2);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda");
+    std::ifstream in (SOURCE_DIR "/../grid/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 3a56eaf6d77ce269def188cb9fb30297e3ad1552..67cc78b6289c815b1158bd8f3eb1e8667ac3b9b9 100644 (file)
--- 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> (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");
+  test<3> (SOURCE_DIR "/../grid/grid_in_3d/1.in");
+  test<3> (SOURCE_DIR "/../grid/grid_in_3d/2.in");
+  test<3> (SOURCE_DIR "/../grid/grid_in_3d/3.in");
+  test<3> (SOURCE_DIR "/../grid/grid_in_3d/4.in");
+
+  test<3> (SOURCE_DIR "/../grid/grid_in_3d/evil_0.in");
+  test<3> (SOURCE_DIR "/../grid/grid_in_3d/evil_1.in");
+  test<3> (SOURCE_DIR "/../grid/grid_in_3d/evil_2.in");
+  test<3> (SOURCE_DIR "/../grid/grid_in_3d/evil_3.in");
+  test<3> (SOURCE_DIR "/../grid/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 c5b4c50bd090c30f60ac2146fbe53d53116692a0..c806e75f4641ad11336b54ab6eb8fec85989fa5c 100644 (file)
--- a/tests/distributed_grids/3d_coarse_grid_06.cc
+++ b/tests/distributed_grids/3d_coarse_grid_06.cc
@@ -36,7 +36,7 @@ void test(std::ostream & /*out*/)
 
   GridIn<dim> gi;
   gi.attach_triangulation (tr);
-  gi.read (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd");
+  gi.read (SOURCE_DIR "/../grid/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 20dd79066c2f6ba7e1d66f62e1074e916e67e0a2..126a2d5c5ce57471084faf1c8ab99ec868756deb 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_03.cc
+++ b/tests/distributed_grids/3d_coarsening_03.cc
@@ -43,7 +43,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d/4.in");
+    std::ifstream in (SOURCE_DIR "/../grid/grid_in_3d/4.in");
     gi.read_xda (in);
                                     //tr.refine_global (1);
   }
@@ -51,7 +51,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr2);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d/4.in");
+    std::ifstream in (SOURCE_DIR "/../grid/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 810e3dcb527816124a72d4e6a622879559c4f5ba..184c2ce62833be3c27629a0ba3cba4dad2fb41c9 100644 (file)
--- a/tests/distributed_grids/3d_coarsening_04.cc
+++ b/tests/distributed_grids/3d_coarsening_04.cc
@@ -43,7 +43,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd");
+    std::ifstream in (SOURCE_DIR "/../grid/grid_in_3d_02/747.ucd");
     gi.read (in);
     //tr.refine_global (1);
   }
@@ -51,7 +51,7 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr2);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd");
+    std::ifstream in (SOURCE_DIR "/../grid/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 1613aa02f9b939f2a1e9f43e40ddea3f972287ee..ec8855c2b711338d94a36cd52d9dc2e048bb7a45 100644 (file)
--- a/tests/distributed_grids/3d_refinement_03.cc
+++ b/tests/distributed_grids/3d_refinement_03.cc
@@ -43,14 +43,14 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d/4.in");
+    std::ifstream in (SOURCE_DIR "/../grid/grid_in_3d/4.in");
     gi.read_xda (in);
   }
 
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr2);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d/4.in");
+    std::ifstream in (SOURCE_DIR "/../grid/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 5a32c118324fe28630e44fb3e581a6076a7b8c51..8f48c7b8c83000b0bd23adcc7b31136300ee7abc 100644 (file)
--- a/tests/distributed_grids/3d_refinement_08.cc
+++ b/tests/distributed_grids/3d_refinement_08.cc
@@ -43,14 +43,14 @@ void test(std::ostream & /*out*/)
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd");
+    std::ifstream in (SOURCE_DIR "/../grid/grid_in_3d_02/747.ucd");
     gi.read (in);
   }
 
   {
     GridIn<dim> gi;
     gi.attach_triangulation (tr2);
-    std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_3d_02/747.ucd");
+    std::ifstream in (SOURCE_DIR "/../grid/grid_in_3d_02/747.ucd");
     gi.read (in);
   }
 

diff --git a/tests/mpi/p4est_2d_coarse_01.cc b/tests/mpi/p4est_2d_coarse_01.cc
index 3dff6398b688720cb34ed1e513b2b6ad05696e0c..87951cb3aad5ec54d75e5ccf7fdeef823a0f9411 100644 (file)
--- a/tests/mpi/p4est_2d_coarse_01.cc
+++ b/tests/mpi/p4est_2d_coarse_01.cc
@@ -44,7 +44,7 @@ void test()
       parallel::distributed::Triangulation<dim> tr(MPI_COMM_WORLD);
       GridIn<dim> gi;
       gi.attach_triangulation (tr);
-      std::ifstream in (SOURCE_DIR "/../deal.II/grid_in_02/2d.xda");
+      std::ifstream in (SOURCE_DIR "/../grid/grid_in_02/2d.xda");
       try
         {
           gi.read_xda (in);