Make several tests work.

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

diff --git a/tests/deal.II/grid_in.cc b/tests/deal.II/grid_in.cc
index 93b9e8c757a0d75c11bb5ae1eb8a3257ac861eb5..378e534bbf42ec8f13256b6e968786d36bd78869 100644 (file)
--- a/tests/deal.II/grid_in.cc
+++ b/tests/deal.II/grid_in.cc
@@ -129,8 +129,7 @@ void check_file (const std::string name,
               << std::endl;
     }
 
-  deallog << name
-          << '\t' << tria.n_vertices()
+  deallog << '\t' << tria.n_vertices()
           << '\t' << tria.n_cells()
           << std::endl;
 }

diff --git a/tests/deal.II/grid_in.output b/tests/deal.II/grid_in.output
index 86db31fde6c12732f7838935d5ea7f31480cf4ee..eb5f940415b2e8994bc193e5c8f3634c766e8e01 100644 (file)
--- a/tests/deal.II/grid_in.output
+++ b/tests/deal.II/grid_in.output
@@ -22,18 +22,18 @@
 14  0.66 0.0 0
 15  0.0 1.0 0
 16  0.0 0.66 0
-1 0 quad    5 1 6 8 
-2 0 quad    8 6 2 7 
-3 0 quad    7 2 9 11 
-4 0 quad    11 9 3 10 
-5 0 quad    1 12 14 6 
-6 0 quad    12 4 13 14 
-7 0 quad    14 13 3 9 
-8 0 quad    6 14 9 2 
-9 0 quad    16 10 3 13 
-10 0 quad    15 16 13 4 
+1 0 quad    5 1 6 8
+2 0 quad    8 6 2 7
+3 0 quad    7 2 9 11
+4 0 quad    11 9 3 10
+5 0 quad    1 12 14 6
+6 0 quad    12 4 13 14
+7 0 quad    14 13 3 9
+8 0 quad    6 14 9 2
+9 0 quad    16 10 3 13
+10 0 quad    15 16 13 4
 DEAL::25 cells are distorted.
 DEAL::1266405810
-DEAL::grid_in/2d       16      10
+DEAL:: 16      10
 DEAL::25 cells are distorted.
-DEAL::grid_in/2d       29490   29037
+DEAL:: 29490   29037

diff --git a/tests/deal.II/grid_in_3d.cc b/tests/deal.II/grid_in_3d.cc
index d1af15d7db3260c8aa509f0496648253665c8fdb..872a871f741c1b7b159a9fcff8c0202bed3aabc8 100644 (file)
--- a/tests/deal.II/grid_in_3d.cc
+++ b/tests/deal.II/grid_in_3d.cc
@@ -42,8 +42,6 @@ void test (const char *filename)
 {
   const unsigned int dim = 3;
 
-  deallog << "Reading " << filename << std::endl;
-
   Triangulation<3> tria;
   GridIn<3> gi;
   gi.attach_triangulation (tria);
@@ -94,16 +92,16 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  test ("1.in");
-  test ("2.in");
-  test ("3.in");
-  test ("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 ("evil_0.in");
-  test ("evil_1.in");
-  test ("evil_2.in");
-  test ("evil_3.in");
-  test ("evil_4.in");
+  test (SOURCE_DIR "/grid_in_3d/evil_0.in");
+  test (SOURCE_DIR "/grid_in_3d/evil_1.in");
+  test (SOURCE_DIR "/grid_in_3d/evil_2.in");
+  test (SOURCE_DIR "/grid_in_3d/evil_3.in");
+  test (SOURCE_DIR "/grid_in_3d/evil_4.in");
 
   // test1 needs NetCDF
 //    test1 ();

diff --git a/tests/deal.II/grid_in_3d.output b/tests/deal.II/grid_in_3d.output
index 523c0be8aea5376083cf6fe2f422f68b0941ecc8..d2cfdf5d1e9f5968b7aa0a799335025a194dac4e 100644 (file)
--- a/tests/deal.II/grid_in_3d.output
+++ b/tests/deal.II/grid_in_3d.output
@@ -1,28 +1,19 @@
 
-DEAL::Reading grid_in_3d/1.in
 DEAL::  16480 active cells
 DEAL::  hash=950760495
-DEAL::Reading grid_in_3d/2.in
 DEAL::  360 active cells
 DEAL::  hash=454134
-DEAL::Reading grid_in_3d/3.in
 DEAL::  2 active cells
 DEAL::  hash=2
-DEAL::Reading grid_in_3d/4.in
 DEAL::  13824 active cells
 DEAL::  hash=667584889
-DEAL::Reading grid_in_3d/evil_0.in
 DEAL::  10 active cells
 DEAL::  hash=318
-DEAL::Reading grid_in_3d/evil_1.in
 DEAL::  10 active cells
 DEAL::  hash=317
-DEAL::Reading grid_in_3d/evil_2.in
 DEAL::  10 active cells
 DEAL::  hash=313
-DEAL::Reading grid_in_3d/evil_3.in
 DEAL::  10 active cells
 DEAL::  hash=314
-DEAL::Reading grid_in_3d/evil_4.in
 DEAL::  10 active cells
 DEAL::  hash=318

diff --git a/tests/deal.II/grid_in_3d_02.cc b/tests/deal.II/grid_in_3d_02.cc
index f44bd0a1c2460f52d1e93b2b4e6145c0b9af7137..d6294e574d7abc10baa702a5e14e181cf7be02dc 100644 (file)
--- a/tests/deal.II/grid_in_3d_02.cc
+++ b/tests/deal.II/grid_in_3d_02.cc
@@ -47,8 +47,6 @@ void test (const char *filename)
 {
   const unsigned int dim = 3;
 
-  deallog << "Reading " << filename << std::endl;
-
   Triangulation<3> tria;
   GridIn<3> gi;
   gi.attach_triangulation (tria);
@@ -97,6 +95,6 @@ int main ()
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
 
-  test ("747.ucd");
+  test (SOURCE_DIR "/grid_in_3d_02/747.ucd");
 }
 

diff --git a/tests/deal.II/grid_in_3d_02.output b/tests/deal.II/grid_in_3d_02.output
index 0a0c0020de1cac468c26dba581c9adfe131fd69d..9290e87da10a8e420afb60e6db050b10244c7b5c 100644 (file)
--- a/tests/deal.II/grid_in_3d_02.output
+++ b/tests/deal.II/grid_in_3d_02.output
@@ -1,4 +1,3 @@
 
-DEAL::Reading grid_in_3d_02/747.ucd
 DEAL::  51823 active cells
 DEAL::  hash=798824717

diff --git a/tests/deal.II/grid_in_unv_2d.cc b/tests/deal.II/grid_in_unv_2d.cc
index 0eb2dcf9c68ae61f6682555abd29e314d624dac4..8c800d96a59b1dd9baf76ff2851590a6a1958a69 100644 (file)
--- a/tests/deal.II/grid_in_unv_2d.cc
+++ b/tests/deal.II/grid_in_unv_2d.cc
@@ -47,8 +47,7 @@ void check_file (const std::string name,
   GridIn<dim> gi;
   gi.attach_triangulation (tria);
   gi.read(name, format);
-  deallog << name
-          << '\t' << tria.n_vertices()
+  deallog << '\t' << tria.n_vertices()
           << '\t' << tria.n_cells()
           << std::endl;
 

diff --git a/tests/deal.II/grid_in_unv_2d.output b/tests/deal.II/grid_in_unv_2d.output
index e7e195b2fa7aafbd2610897b7459dbb1a9eac03e..95300421320a8bf058566c99ed82c00bd8055514 100644 (file)
--- a/tests/deal.II/grid_in_unv_2d.output
+++ b/tests/deal.II/grid_in_unv_2d.output
@@ -1,5 +1,5 @@
 
-DEAL::grid_in_unv_2d/test1427  72      48
+DEAL:: 72      48
 -0.50 -1.0 0 0
 -0.50 -0.75 0 0
 -0.75 -0.75 0 0
@@ -336,7 +336,7 @@ DEAL::grid_in_unv_2d/test1427       72      48
 -0.75 0.25 0 0
 
 
-DEAL::grid_in_unv_2d/test46    81      64
+DEAL:: 81      64
 1.0 -1.0 0 1
 1.0 -0.75 0 1
 0.75 -0.75 0 1

diff --git a/tests/deal.II/grid_in_unv_3d.cc b/tests/deal.II/grid_in_unv_3d.cc
index 7522623a8c4dc344cbc37bc08b074e92851127ff..50edcb227834de63b320ef59381654688f7c740b 100644 (file)
--- a/tests/deal.II/grid_in_unv_3d.cc
+++ b/tests/deal.II/grid_in_unv_3d.cc
@@ -47,8 +47,7 @@ void check_file (const std::string name,
   GridIn<dim> gi;
   gi.attach_triangulation (tria);
   gi.read(name, format);
-  deallog << name
-          << '\t' << tria.n_vertices()
+  deallog << '\t' << tria.n_vertices()
           << '\t' << tria.n_cells()
           << std::endl;
 

diff --git a/tests/deal.II/grid_in_unv_3d.output b/tests/deal.II/grid_in_unv_3d.output
index c60209a0c1bf516968c41cf82a19722b07235247..b23dbe8ee28efb20d4005dffb92be704d0c6c66f 100644 (file)
--- a/tests/deal.II/grid_in_unv_3d.output
+++ b/tests/deal.II/grid_in_unv_3d.output
@@ -1,5 +1,5 @@
 
-DEAL::grid_in_unv_3d/3D        216     125
+DEAL:: 216     125
 1.1e-16 1.0 0.80 0 1
 0.31 0.95 0.80 0 1
 0.28 0.86 0.80 0 1