Unify grid file location

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31325 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/bits/distorted_cells_02.cc b/tests/bits/distorted_cells_02.cc
index a3e209c07ed5c1c8970dd9ae1b746065ec7d543e..9baebc766c33129964e403118fd67a38ebefec09 100644 (file)
--- a/tests/bits/distorted_cells_02.cc
+++ b/tests/bits/distorted_cells_02.cc
@@ -41,8 +41,8 @@ void check ()
   Triangulation<dim> coarse_grid (Triangulation<dim>::none, true);
 
   GridIn<dim> gi;
-  std::ifstream in (dim == 2 ? SOURCE_DIR "/distorted_cells_02/2d" : 
-      SOURCE_DIR "/distorted_cells_02/3d");
+  std::ifstream in (dim == 2 ? SOURCE_DIR "/grids/2d" :
+      SOURCE_DIR "/grids/3d");
 
   gi.attach_triangulation (coarse_grid);
 

diff --git a/tests/bits/find_cell_10.cc b/tests/bits/find_cell_10.cc
index a223625e179afc971190ec4d5e911154c2fc44a6..e52c159ddb98767b054f97ae1ccb14828377074d 100644 (file)
--- a/tests/bits/find_cell_10.cc
+++ b/tests/bits/find_cell_10.cc
@@ -81,7 +81,7 @@ void test()
 
   GridIn<2> grid_in1;
   grid_in1.attach_triangulation (triangulation);
-  std::ifstream input_file1(SOURCE_DIR "/find_cell_10/mesh.msh");
+  std::ifstream input_file1(SOURCE_DIR "/grids/mesh.msh");
   grid_in1.read_msh(input_file1);
 
   dof_handler.distribute_dofs (fe);

diff --git a/tests/bits/find_cell_6.cc b/tests/bits/find_cell_6.cc
index ca0fa5cf4b920ab73be5c42803b78fe91df58f7f..6e058dbcf25059850ae6d804c9bc62d7b9f22322 100644 (file)
--- a/tests/bits/find_cell_6.cc
+++ b/tests/bits/find_cell_6.cc
@@ -48,7 +48,7 @@ void check2 ()
   Triangulation<3> tria;
   GridIn<3> gridIn;
   gridIn.attach_triangulation (tria);
-  std::ifstream inputFile(SOURCE_DIR "/find_cell_6/grid.inp");
+  std::ifstream inputFile(SOURCE_DIR "/grids/grid.inp");
   gridIn.read_ucd (inputFile);
 
   Point<3> p2(304.767,-57.0113,254.766);

diff --git a/tests/bits/find_cell_7.cc b/tests/bits/find_cell_7.cc
index a1c47aa7afd59d6a7148a59f03781cf6591c54d4..235a4535a1593f88a706b31678aa3f4424c10f4a 100644 (file)
--- a/tests/bits/find_cell_7.cc
+++ b/tests/bits/find_cell_7.cc
@@ -56,7 +56,7 @@ void check2 ()
   Triangulation<3> tria;
   GridIn<3> gridIn;
   gridIn.attach_triangulation (tria);
-  std::ifstream inputFile(SOURCE_DIR "/find_cell_7/grid.inp");
+  std::ifstream inputFile(SOURCE_DIR "/grids/grid.inp");
   gridIn.read_ucd (inputFile);
 
   Point<3> p2(304.767,-57.0113,254.766);

diff --git a/tests/bits/find_cell_7/grid.inp b/tests/bits/find_cell_7/grid.inp
deleted file mode 100644 (file)
index 7874765..0000000
--- a/tests/bits/find_cell_7/grid.inp
+++ /dev/null
@@ -1,146 +0,0 @@
-# sixD mesh generator, version 1 
-# omit element on surface: 1
-# nodes:    x: 6   y: 4   z: 4   total: 96
-# elements: x: 5   y: 3   z: 3   total: 44
-# size: first corner: (-1000;-500;0)    second corner: (1150;650;650)
-96 44 0 0 0
-1 -1000 -500 0
-2 -500 -500 0
-3 -6.10352e-05 -500 0
-4 150 -500 0
-5 650 -500 0
-6 1150 -500 0
-7 -1000 0 0
-8 -500 0 0
-9 -6.10352e-05 0 0
-10 150 0 0
-11 650 0 0
-12 1150 0 0
-13 -1000 150 0
-14 -500 150 0
-15 -6.10352e-05 150 0
-16 150 150 0
-17 650 150 0
-18 1150 150 0
-19 -1000 650 0
-20 -500 650 0
-21 -6.10352e-05 650 0
-22 150 650 0
-23 650 650 0
-24 1150 650 0
-25 -1000 -500 150
-26 -500 -500 150
-27 -6.10352e-05 -500 150
-28 150 -500 150
-29 650 -500 150
-30 1150 -500 150
-31 -1000 0 150
-32 -500 0 150
-33 -6.10352e-05 0 150
-34 150 0 150
-35 650 0 150
-36 1150 0 150
-37 -1000 150 150
-38 -500 150 150
-39 -6.10352e-05 150 150
-40 150 150 150
-41 650 150 150
-42 1150 150 150
-43 -1000 650 150
-44 -500 650 150
-45 -6.10352e-05 650 150
-46 150 650 150
-47 650 650 150
-48 1150 650 150
-49 -1000 -500 400
-50 -500 -500 400
-51 -6.10352e-05 -500 400
-52 150 -500 400
-53 650 -500 400
-54 1150 -500 400
-55 -1000 0 400
-56 -500 0 400
-57 -6.10352e-05 0 400
-58 150 0 400
-59 650 0 400
-60 1150 0 400
-61 -1000 150 400
-62 -500 150 400
-63 -6.10352e-05 150 400
-64 150 150 400
-65 650 150 400
-66 1150 150 400
-67 -1000 650 400
-68 -500 650 400
-69 -6.10352e-05 650 400
-70 150 650 400
-71 650 650 400
-72 1150 650 400
-73 -1000 -500 650
-74 -500 -500 650
-75 -6.10352e-05 -500 650
-76 150 -500 650
-77 650 -500 650
-78 1150 -500 650
-79 -1000 0 650
-80 -500 0 650
-81 -6.10352e-05 0 650
-82 150 0 650
-83 650 0 650
-84 1150 0 650
-85 -1000 150 650
-86 -500 150 650
-87 -6.10352e-05 150 650
-88 150 150 650
-89 650 150 650
-90 1150 150 650
-91 -1000 650 650
-92 -500 650 650
-93 -6.10352e-05 650 650
-94 150 650 650
-95 650 650 650
-96 1150 650 650
-1 0 hex 1 2 8 7 25 26 32 31
-2 0 hex 2 3 9 8 26 27 33 32
-3 0 hex 3 4 10 9 27 28 34 33
-4 0 hex 4 5 11 10 28 29 35 34
-5 0 hex 5 6 12 11 29 30 36 35
-6 0 hex 7 8 14 13 31 32 38 37
-7 0 hex 8 9 15 14 32 33 39 38
-8 0 hex 10 11 17 16 34 35 41 40
-9 0 hex 11 12 18 17 35 36 42 41
-10 0 hex 13 14 20 19 37 38 44 43
-11 0 hex 14 15 21 20 38 39 45 44
-12 0 hex 15 16 22 21 39 40 46 45
-13 0 hex 16 17 23 22 40 41 47 46
-14 0 hex 17 18 24 23 41 42 48 47
-15 0 hex 25 26 32 31 49 50 56 55
-16 0 hex 26 27 33 32 50 51 57 56
-17 0 hex 27 28 34 33 51 52 58 57
-18 0 hex 28 29 35 34 52 53 59 58
-19 0 hex 29 30 36 35 53 54 60 59
-20 0 hex 31 32 38 37 55 56 62 61
-21 0 hex 32 33 39 38 56 57 63 62
-22 0 hex 33 34 40 39 57 58 64 63
-23 0 hex 34 35 41 40 58 59 65 64
-24 0 hex 35 36 42 41 59 60 66 65
-25 0 hex 37 38 44 43 61 62 68 67
-26 0 hex 38 39 45 44 62 63 69 68
-27 0 hex 39 40 46 45 63 64 70 69
-28 0 hex 40 41 47 46 64 65 71 70
-29 0 hex 41 42 48 47 65 66 72 71
-30 0 hex 49 50 56 55 73 74 80 79
-31 0 hex 50 51 57 56 74 75 81 80
-32 0 hex 51 52 58 57 75 76 82 81
-33 0 hex 52 53 59 58 76 77 83 82
-34 0 hex 53 54 60 59 77 78 84 83
-35 0 hex 55 56 62 61 79 80 86 85
-36 0 hex 56 57 63 62 80 81 87 86
-37 0 hex 57 58 64 63 81 82 88 87
-38 0 hex 58 59 65 64 82 83 89 88
-39 0 hex 59 60 66 65 83 84 90 89
-40 0 hex 61 62 68 67 85 86 92 91
-41 0 hex 62 63 69 68 86 87 93 92
-42 0 hex 63 64 70 69 87 88 94 93
-43 0 hex 64 65 71 70 88 89 95 94
-44 0 hex 65 66 72 71 89 90 96 95

diff --git a/tests/bits/distorted_cells_02/2d b/tests/bits/grids/2d
similarity index 100%
rename from tests/bits/distorted_cells_02/2d
rename to tests/bits/grids/2d

diff --git a/tests/bits/distorted_cells_02/3d b/tests/bits/grids/3d
similarity index 100%
rename from tests/bits/distorted_cells_02/3d
rename to tests/bits/grids/3d

diff --git a/tests/bits/find_cell_6/grid.inp b/tests/bits/grids/grid.inp
similarity index 100%
rename from tests/bits/find_cell_6/grid.inp
rename to tests/bits/grids/grid.inp

diff --git a/tests/bits/find_cell_10/mesh.msh b/tests/bits/grids/mesh.msh
similarity index 100%
rename from tests/bits/find_cell_10/mesh.msh
rename to tests/bits/grids/mesh.msh

diff --git a/tests/grid/grid_in_msh_01.cc b/tests/grid/grid_in_msh_01.cc
index c65ae0357032869df0fdb40d12aeb924fdc049fd..9dce8d8aa4b181c775df03b5ba7c35c8aacbf901 100644 (file)
--- a/tests/grid/grid_in_msh_01.cc
+++ b/tests/grid/grid_in_msh_01.cc
@@ -60,11 +60,11 @@ int main ()
 
   try
     {
-      gmsh_grid<2> (SOURCE_DIR "/grid_in_msh_01/grid_in_msh_01.2d.msh");
-      gmsh_grid<2> (SOURCE_DIR "/grid_in_msh_01/grid_in_msh_01.2da.msh");
-      gmsh_grid<3> (SOURCE_DIR "/grid_in_msh_01/grid_in_msh_01.3d.msh");
-      gmsh_grid<3> (SOURCE_DIR "/grid_in_msh_01/grid_in_msh_01.3da.msh");
-      gmsh_grid<3> (SOURCE_DIR "/grid_in_msh_01/grid_in_msh_01.3d_neg.msh");
+      gmsh_grid<2> (SOURCE_DIR "/grids/grid_in_msh_01.2d.msh");
+      gmsh_grid<2> (SOURCE_DIR "/grids/grid_in_msh_01.2da.msh");
+      gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3d.msh");
+      gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3da.msh");
+      gmsh_grid<3> (SOURCE_DIR "/grids/grid_in_msh_01.3d_neg.msh");
     }
   catch (std::exception &exc)
     {

diff --git a/tests/grid/grid_in_msh_01/grid_in_msh_01.2d.msh b/tests/grid/grids/grid_in_msh_01.2d.msh
similarity index 100%
rename from tests/grid/grid_in_msh_01/grid_in_msh_01.2d.msh
rename to tests/grid/grids/grid_in_msh_01.2d.msh

diff --git a/tests/grid/grid_in_msh_01/grid_in_msh_01.2da.msh b/tests/grid/grids/grid_in_msh_01.2da.msh
similarity index 100%
rename from tests/grid/grid_in_msh_01/grid_in_msh_01.2da.msh
rename to tests/grid/grids/grid_in_msh_01.2da.msh

diff --git a/tests/grid/grid_in_msh_01/grid_in_msh_01.3d.msh b/tests/grid/grids/grid_in_msh_01.3d.msh
similarity index 100%
rename from tests/grid/grid_in_msh_01/grid_in_msh_01.3d.msh
rename to tests/grid/grids/grid_in_msh_01.3d.msh

diff --git a/tests/grid/grid_in_msh_01/grid_in_msh_01.3d_neg.msh b/tests/grid/grids/grid_in_msh_01.3d_neg.msh
similarity index 100%
rename from tests/grid/grid_in_msh_01/grid_in_msh_01.3d_neg.msh
rename to tests/grid/grids/grid_in_msh_01.3d_neg.msh

diff --git a/tests/grid/grid_in_msh_01/grid_in_msh_01.3da.msh b/tests/grid/grids/grid_in_msh_01.3da.msh
similarity index 100%
rename from tests/grid/grid_in_msh_01/grid_in_msh_01.3da.msh
rename to tests/grid/grids/grid_in_msh_01.3da.msh