]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix bugs in deal.II tests.
authorBruno Turcksin <bruno.turcksin@gmail.com>
Fri, 23 Aug 2013 21:24:55 +0000 (21:24 +0000)
committerBruno Turcksin <bruno.turcksin@gmail.com>
Fri, 23 Aug 2013 21:24:55 +0000 (21:24 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30461 0785d39b-7218-0410-832d-ea1e28bc413d

tests/deal.II/face_orientations_3d.cc
tests/deal.II/grid_in.cc
tests/deal.II/grid_in_02.cc
tests/deal.II/grid_in_msh.cc
tests/deal.II/grid_in_msh_02.cc
tests/deal.II/grid_in_msh_03.cc
tests/deal.II/grid_in_msh_version_1.cc
tests/deal.II/grid_in_msh_version_2.cc
tests/deal.II/grid_in_tecplot.cc
tests/deal.II/grid_in_unv_2d.cc
tests/deal.II/grid_in_unv_3d.cc

index 739445d4365c0ab20773147d714d17f8d31b14c3..b838cece939d0ad94c59caf3f895657f18139ba8 100644 (file)
@@ -82,12 +82,12 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  test ("grid_in_3d/1.in");
-  test ("grid_in_3d/2.in");
-  test ("grid_in_3d/3.in");
-  test ("grid_in_3d/4.in");
+  test (SOURCE_DIR "/grid_in_3d/1.in");
+  test (SOURCE_DIR "/grid_in_3d/2.in");
+  test (SOURCE_DIR "/grid_in_3d/3.in");
+  test (SOURCE_DIR "/grid_in_3d/4.in");
 
-  test ("grid_in_3d/evil_0.in");
-  test ("grid_in_3d/evil_4.in");
+  test (SOURCE_DIR "/grid_in_3d/evil_0.in");
+  test (SOURCE_DIR "/grid_in_3d/evil_4.in");
 }
 
index 0e798ed36fcef31748d3c1eb72e5fe90b07a4c5a..93b9e8c757a0d75c11bb5ae1eb8a3257ac861eb5 100644 (file)
@@ -41,7 +41,7 @@ void test1 ()
   Triangulation<dim> tria;
   GridIn<dim> gi;
   gi.attach_triangulation (tria);
-  std::ifstream in ("2d.inp");
+  std::ifstream in (SOURCE_DIR "/grid_in/2d.inp");
   gi.read_ucd (in);
 
   GridOut grid_out;
@@ -72,7 +72,7 @@ void test2 ()
   Triangulation<dim> tria (Triangulation<dim>::none, true);
   GridIn<dim> gi;
   gi.attach_triangulation (tria);
-  std::ifstream in ("2d.xda");
+  std::ifstream in (SOURCE_DIR "/grid_in/2d.xda");
   try
     {
       gi.read_xda (in);
@@ -103,7 +103,7 @@ void test3 ()
   Triangulation<dim> tria;
   GridIn<dim> gi;
   gi.attach_triangulation (tria);
-  gi.read ("2d.nc");
+  gi.read (SOURCE_DIR "/grid_in/2d.nc");
 
   GridOut grid_out;
   std::ofstream gnufile("grid_in_2d.gnuplot");
@@ -137,8 +137,8 @@ void check_file (const std::string name,
 
 void filename_resolution()
 {
-  check_file<2> (std::string("2d"), GridIn<2>::ucd);
-  check_file<2> (std::string("2d"), GridIn<2>::xda);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in/2d"), GridIn<2>::ucd);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in/2d"), GridIn<2>::xda);
 }
 
 
index 470efab763598bd7c6fb4a893b0365cb52f3f64d..a244e9bdbcc72704d27ccb64f9bc51a1fe305b7e 100644 (file)
@@ -56,7 +56,7 @@ void test2 ()
   Triangulation<dim> tria (Triangulation<dim>::none, true);
   GridIn<dim> gi;
   gi.attach_triangulation (tria);
-  std::ifstream in ("2d.xda");
+  std::ifstream in (SOURCE_DIR "/grid_in_02/2d.xda");
   try
     {
       gi.read_xda (in);
index 7dc0ade009e65a651620d7f22bbb3df811ed4775..11c96757f1c861cc4b026612432c194f8c073660 100644 (file)
@@ -55,7 +55,7 @@ void check_file (const std::string name,
 
 void filename_resolution()
 {
-  check_file<2> (std::string("mesh"), GridIn<2>::msh);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_msh/mesh"), GridIn<2>::msh);
 }
 
 
index 1f71d6154b98ca3cfe3921a2ad85ef90b34b1e66..cbc40de425faaeeef42ae8b7e1e43ed359c4e616 100644 (file)
@@ -57,7 +57,7 @@ void check_file (const std::string name,
 
 void filename_resolution()
 {
-  check_file<2> (std::string("mesh"), GridIn<2>::msh);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_msh_02/mesh"), GridIn<2>::msh);
 }
 
 
index 1f71d6154b98ca3cfe3921a2ad85ef90b34b1e66..0fbe53bd04a8a106b0943bffe11e340e6bf02766 100644 (file)
@@ -57,7 +57,7 @@ void check_file (const std::string name,
 
 void filename_resolution()
 {
-  check_file<2> (std::string("mesh"), GridIn<2>::msh);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_msh_03/mesh"), GridIn<2>::msh);
 }
 
 
index d5ea54052f093c59e8120aaf9bfc02af01eb4c47..e04525c6ad8262cd4a2a44170c598505ff5975d4 100644 (file)
@@ -57,8 +57,8 @@ void check_file (const std::string name,
 
 void filename_resolution()
 {
-  check_file<2> (std::string("input_v1"), GridIn<2>::msh);
-  check_file<2> (std::string("input_v2"), GridIn<2>::msh);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_msh_version_1/input_v1"), GridIn<2>::msh);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_msh_version_1/input_v2"), GridIn<2>::msh);
 }
 
 
index 93051a9b374747c96e7f817e28eb9de0d3c562cc..9e0f3f444fc0c82ec9d533167b217b3ba64b3446 100644 (file)
@@ -56,8 +56,8 @@ void check_file (const std::string name,
 
 void filename_resolution()
 {
-  check_file<2> (std::string("hole81"), GridIn<2>::msh);
-  check_file<2> (std::string("hole8170"), GridIn<2>::msh);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_msh_version_2/hole81"), GridIn<2>::msh);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_msh_version_2/hole8170"), GridIn<2>::msh);
 }
 
 
index ce97d0511793ff009f8788b4b9f7347a0edc2e58..ad8448afe97f08b689c9d5c2c8fe3a10d52c85a8 100644 (file)
@@ -47,9 +47,9 @@ void test (const std::string &infilename)
 
 int main ()
 {
-  test<2> ("1.dat");
-  test<2> ("2.dat");
-  test<2> ("3.dat");
-  test<2> ("4.dat");
+  test<2> (std::string(SOURCE_DIR "/grid_in_tecplot/1.dat"));
+  test<2> (std::string(SOURCE_DIR "/grid_in_tecplot/2.dat"));
+  test<2> (std::string(SOURCE_DIR "/grid_in_tecplot/3.dat"));
+  test<2> (std::string(SOURCE_DIR "/grid_in_tecplot/4.dat"));
 }
 
index c062659dedf4c670f96e5f16584ba7f95101e724..0eb2dcf9c68ae61f6682555abd29e314d624dac4 100644 (file)
@@ -58,8 +58,8 @@ void check_file (const std::string name,
 
 void filename_resolution()
 {
-  check_file<2> (std::string("test1427"), GridIn<2>::unv);
-  check_file<2> (std::string("test46"), GridIn<2>::unv);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_unv_2d/test1427"), GridIn<2>::unv);
+  check_file<2> (std::string(SOURCE_DIR "/grid_in_unv_2d/test46"), GridIn<2>::unv);
 }
 
 
index 27d9b8bcf9e52a3158323f40c665225f75d3ba0d..7522623a8c4dc344cbc37bc08b074e92851127ff 100644 (file)
@@ -58,7 +58,7 @@ void check_file (const std::string name,
 
 void filename_resolution()
 {
-  check_file<3> (std::string("3D"), GridIn<3>::unv);
+  check_file<3> (std::string(SOURCE_DIR "/grid_in_unv_3d/3D"), GridIn<3>::unv);
 }
 
 

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.