Fixed trivial tests.

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

diff --git a/tests/bits/distorted_cells_03.cc b/tests/bits/distorted_cells_03.cc
index 0e16552ed8d458d40c53038e21e0e4c79937ee93..4d32febe7170d8df1283a6f7250b029a43ffbf97 100644 (file)
--- a/tests/bits/distorted_cells_03.cc
+++ b/tests/bits/distorted_cells_03.cc
@@ -40,35 +40,37 @@
 
 
 template <int dim>
-class MyBoundary : public Boundary<dim>
+class MyBoundary : public Manifold<dim>
 {
   virtual Point<dim>
-  get_new_point_on_line (const typename Triangulation<dim>::line_iterator &line) const
+  get_new_point (const std::vector<Point<dim> > &v,
+                const std::vector<double> &ws) const
   {
-    deallog << "Finding point between "
-            << line->vertex(0) << " and "
-            << line->vertex(1) << std::endl;
-
-    // in 2d, find a point that
-    // lies on the opposite side
-    // of the quad. in 3d, choose
-    // the midpoint of the edge
-    if (dim == 2)
-      return Point<dim>(0,0.75);
-    else
-      return (line->vertex(0) + line->vertex(1)) / 2;
-  }
-
-  virtual Point<dim>
-  get_new_point_on_quad (const typename Triangulation<dim>::quad_iterator &quad) const
-  {
-    deallog << "Finding point between "
-            << quad->vertex(0) << " and "
-            << quad->vertex(1) << " and "
-            << quad->vertex(2) << " and "
-            << quad->vertex(3) << std::endl;
-
-    return Point<dim>(0,0,.75);
+    switch(v.size()) {
+    case 2:
+      deallog << "Finding point between "
+             << v[0] << " and "
+             << v[1] << std::endl;
+
+      // in 2d, find a point that
+      // lies on the opposite side
+      // of the quad. in 3d, choose
+      // the midpoint of the edge
+      if (dim == 2)
+       return Point<dim>(0,0.75);
+      else
+       return (v[0] + v[1]) / 2;
+      break;
+    default:
+      deallog << "Finding point between "
+             << v[0] << " and "
+             << v[1] << " and "
+             << v[2] << " and "
+             << v[3] << std::endl;
+
+      return Point<dim>(0,0,.75);
+      break;
+    }
   }
 };
 

diff --git a/tests/bits/find_cell_2.cc b/tests/bits/find_cell_2.cc
index 612e8bd8f53e082109c9161206066d252dfd6869..601001c239227fb69bec43e23239ebe710fb6a7a 100644 (file)
--- a/tests/bits/find_cell_2.cc
+++ b/tests/bits/find_cell_2.cc
@@ -41,7 +41,7 @@ void check (Triangulation<3> &tria)
 
   deallog << cell << std::endl;
   for (unsigned int v=0; v<GeometryInfo<3>::vertices_per_cell; ++v)
-    deallog << "<" << cell->vertex(v) << "> ";
+    deallog << "< " << cell->vertex(v) << " > ";
   deallog << std::endl;
 
   Assert (p.distance (cell->center()) < cell->diameter()/2,

diff --git a/tests/bits/find_cell_2.output b/tests/bits/find_cell_2.output
index 2cd0564b41a163783a7ab4f05719df8d7a7377ba..daa34f13c0a3603590b22e959945828f850ea4d1 100644 (file)
--- a/tests/bits/find_cell_2.output
+++ b/tests/bits/find_cell_2.output
@@ -1,5 +1,5 @@
 
 DEAL::2.3
-DEAL::<0.250000 0.250000 0.00000> <0.500000 0.250000 0.00000> <0.250000 0.500000 0.00000> <0.500000 0.500000 0.00000> <0.250000 0.250000 0.250000> <0.500000 0.250000 0.250000> <0.250000 0.500000 0.250000> <0.500000 0.500000 0.250000> 
+DEAL::< 0.250000 0.250000 0.00000 > < 0.500000 0.250000 0.00000 > < 0.250000 0.500000 0.00000 > < 0.500000 0.500000 0.00000 > < 0.250000 0.250000 0.250000 > < 0.500000 0.250000 0.250000 > < 0.250000 0.500000 0.250000 > < 0.500000 0.500000 0.250000 > 
 DEAL::2.435
-DEAL::<0.286905 0.658777 4.33681e-19> <0.209333 0.437629 8.67362e-19> <0.562887 0.562887 8.67362e-19> <0.418667 0.418667 1.73472e-18> <0.269808 0.604598 0.269808> <0.203251 0.422066 0.203251> <0.530301 0.530301 0.245590> <0.406502 0.406502 0.197169> 
+DEAL::< 0.286905 0.658777 4.33681e-19 > < 0.209333 0.437629 8.67362e-19 > < 0.562887 0.562887 8.67362e-19 > < 0.418667 0.418667 1.73472e-18 > < 0.269808 0.604598 0.269808 > < 0.203251 0.422066 0.203251 > < 0.530301 0.530301 0.245590 > < 0.406502 0.406502 0.197169 > 

diff --git a/tests/bits/find_cell_3.cc b/tests/bits/find_cell_3.cc
index d2d75513033242ebf486854a6693561bb1beda7f..f9b4a23bd759d60f99c49e5a54ef0fcbd78e3236 100644 (file)
--- a/tests/bits/find_cell_3.cc
+++ b/tests/bits/find_cell_3.cc
@@ -41,7 +41,7 @@ void check (Triangulation<3> &tria)
 
   deallog << cell << std::endl;
   for (unsigned int v=0; v<GeometryInfo<3>::vertices_per_cell; ++v)
-    deallog << "<" << cell->vertex(v) << "> ";
+    deallog << "< " << cell->vertex(v) << " > ";
   deallog << std::endl;
 
   Assert (p.distance (cell->center()) < cell->diameter()/2,

diff --git a/tests/bits/find_cell_3.output b/tests/bits/find_cell_3.output
index 32e2345e216bf39ab22bd5830faf4c8d385ed37d..cb809c7377497b9fbc2d83181b3c4e77f725c203 100644 (file)
--- a/tests/bits/find_cell_3.output
+++ b/tests/bits/find_cell_3.output
@@ -1,7 +1,7 @@
 
 DEAL::1.0
-DEAL::<0.00000 0.00000 0.00000> <0.500000 0.00000 0.00000> <0.00000 0.00000 -0.500000> <0.500000 0.00000 -0.500000> <0.00000 0.500000 0.00000> <0.500000 0.500000 0.00000> <0.00000 0.500000 -0.500000> <0.500000 0.500000 -0.500000> 
+DEAL::< 0.00000 0.00000 0.00000 > < 0.500000 0.00000 0.00000 > < 0.00000 0.00000 -0.500000 > < 0.500000 0.00000 -0.500000 > < 0.00000 0.500000 0.00000 > < 0.500000 0.500000 0.00000 > < 0.00000 0.500000 -0.500000 > < 0.500000 0.500000 -0.500000 > 
 DEAL::1.16
-DEAL::<0.00000 0.00000 0.00000> <0.500000 0.00000 0.00000> <0.00000 0.00000 -0.500000> <0.500000 0.00000 -0.500000> <0.00000 0.500000 0.00000> <0.500000 0.500000 0.00000> <0.00000 0.500000 -0.500000> <0.500000 0.500000 -0.500000> 
+DEAL::< 0.00000 0.00000 0.00000 > < 0.500000 0.00000 0.00000 > < 0.00000 0.00000 -0.500000 > < 0.500000 0.00000 -0.500000 > < 0.00000 0.500000 0.00000 > < 0.500000 0.500000 0.00000 > < 0.00000 0.500000 -0.500000 > < 0.500000 0.500000 -0.500000 > 
 DEAL::1.50
-DEAL::<0.00000 0.577350 -0.577350> <1.73472e-18 0.394338 -0.394338> <0.577350 0.577350 -0.577350> <0.394338 0.394338 -0.394338> <0.00000 0.577350 0.00000> <1.44560e-19 0.394338 0.00000> <0.577350 0.577350 0.00000> <0.394338 0.394338 1.73472e-18> 
+DEAL::< 0.00000 0.577350 -0.577350 > < 1.73472e-18 0.394338 -0.394338 > < 0.577350 0.577350 -0.577350 > < 0.394338 0.394338 -0.394338 > < 0.00000 0.577350 0.00000 > < 1.44560e-19 0.394338 0.00000 > < 0.577350 0.577350 0.00000 > < 0.394338 0.394338 1.73472e-18 > 

diff --git a/tests/bits/find_cell_4.cc b/tests/bits/find_cell_4.cc
index ebf68899f724ee17f534bdcb032a1e5a13215694..fc826fcbe97a43be6d3a1179803b232fef41a8d7 100644 (file)
--- a/tests/bits/find_cell_4.cc
+++ b/tests/bits/find_cell_4.cc
@@ -42,7 +42,7 @@ void check (Triangulation<3> &tria)
 
   deallog << cell << std::endl;
   for (unsigned int v=0; v<GeometryInfo<3>::vertices_per_cell; ++v)
-    deallog << "<" << cell->vertex(v) << "> ";
+    deallog << "< " << cell->vertex(v) << " > ";
   deallog << std::endl;
 
   // Transform back and forth

diff --git a/tests/bits/find_cell_4.compiler=Intel=false.release.output b/tests/bits/find_cell_4.compiler=Intel=false.release.output
index 7bdc5e949df2842edc86c101bf33022a91bdc35c..02138e3239f3ac5d044fa46636c92e53f590e571 100644 (file)
--- a/tests/bits/find_cell_4.compiler=Intel=false.release.output
+++ b/tests/bits/find_cell_4.compiler=Intel=false.release.output
@@ -1,3 +1,3 @@
 
 DEAL::3.72
-DEAL::<0.750000 0.00000 0.00000> <0.875000 0.00000 0.00000> <0.750000 0.125000 0.00000> <0.875000 0.125000 0.00000> <0.750000 0.00000 0.125000> <0.875000 0.00000 0.125000> <0.750000 0.125000 0.125000> <0.875000 0.125000 0.125000> 
+DEAL::< 0.750000 0.00000 0.00000 > < 0.875000 0.00000 0.00000 > < 0.750000 0.125000 0.00000 > < 0.875000 0.125000 0.00000 > < 0.750000 0.00000 0.125000 > < 0.875000 0.00000 0.125000 > < 0.750000 0.125000 0.125000 > < 0.875000 0.125000 0.125000 > 

diff --git a/tests/bits/find_cell_4.compiler=Intel=true.release.output b/tests/bits/find_cell_4.compiler=Intel=true.release.output
index c6432b503a6531c2eb1581807fd900090e2fdd8b..52539b98c82797baf7e96d257f1cde3109e29da3 100644 (file)
--- a/tests/bits/find_cell_4.compiler=Intel=true.release.output
+++ b/tests/bits/find_cell_4.compiler=Intel=true.release.output
@@ -1,3 +1,3 @@
 
 DEAL::3.65
-DEAL::<0.625000 0.00000 0.00000> <0.750000 0.00000 0.00000> <0.625000 0.125000 0.00000> <0.750000 0.125000 0.00000> <0.625000 0.00000 0.125000> <0.750000 0.00000 0.125000> <0.625000 0.125000 0.125000> <0.750000 0.125000 0.125000> 
+DEAL::< 0.625000 0.00000 0.00000 > < 0.750000 0.00000 0.00000 > < 0.625000 0.125000 0.00000 > < 0.750000 0.125000 0.00000 > < 0.625000 0.00000 0.125000 > < 0.750000 0.00000 0.125000 > < 0.625000 0.125000 0.125000 > < 0.750000 0.125000 0.125000 > 

diff --git a/tests/bits/find_cell_4.debug.output b/tests/bits/find_cell_4.debug.output
index 7bdc5e949df2842edc86c101bf33022a91bdc35c..02138e3239f3ac5d044fa46636c92e53f590e571 100644 (file)
--- a/tests/bits/find_cell_4.debug.output
+++ b/tests/bits/find_cell_4.debug.output
@@ -1,3 +1,3 @@
 
 DEAL::3.72
-DEAL::<0.750000 0.00000 0.00000> <0.875000 0.00000 0.00000> <0.750000 0.125000 0.00000> <0.875000 0.125000 0.00000> <0.750000 0.00000 0.125000> <0.875000 0.00000 0.125000> <0.750000 0.125000 0.125000> <0.875000 0.125000 0.125000> 
+DEAL::< 0.750000 0.00000 0.00000 > < 0.875000 0.00000 0.00000 > < 0.750000 0.125000 0.00000 > < 0.875000 0.125000 0.00000 > < 0.750000 0.00000 0.125000 > < 0.875000 0.00000 0.125000 > < 0.750000 0.125000 0.125000 > < 0.875000 0.125000 0.125000 > 

diff --git a/tests/bits/find_cell_alt_2.cc b/tests/bits/find_cell_alt_2.cc
index bd23f66979a7a68e9475bad84a9aaa84acfecb88..96562d9de2e4d20b68636e0e3528a071a297714d 100644 (file)
--- a/tests/bits/find_cell_alt_2.cc
+++ b/tests/bits/find_cell_alt_2.cc
@@ -45,7 +45,7 @@ void check (Triangulation<3> &tria)
 
   deallog << cell.first << std::endl;
   for (unsigned int v=0; v<GeometryInfo<3>::vertices_per_cell; ++v)
-    deallog << "<" << cell.first->vertex(v) << "> "<< std::endl;
+    deallog << "< " << cell.first->vertex(v) << " > "<< std::endl;
   deallog << "[ " << cell.second << "] ";
 
   deallog << std::endl << std::endl;

diff --git a/tests/bits/find_cell_alt_2.output b/tests/bits/find_cell_alt_2.output
index e5e204bb7888a0edb11f073278b19ff67c6234c8..2bfa6db789c34594d921dc21f4efa80e243be77c 100644 (file)
--- a/tests/bits/find_cell_alt_2.output
+++ b/tests/bits/find_cell_alt_2.output
@@ -1,23 +1,23 @@
 
 DEAL::2.3
-DEAL::<0.250000 0.250000 0.00000> 
-DEAL::<0.500000 0.250000 0.00000> 
-DEAL::<0.250000 0.500000 0.00000> 
-DEAL::<0.500000 0.500000 0.00000> 
-DEAL::<0.250000 0.250000 0.250000> 
-DEAL::<0.500000 0.250000 0.250000> 
-DEAL::<0.250000 0.500000 0.250000> 
-DEAL::<0.500000 0.500000 0.250000> 
+DEAL::< 0.250000 0.250000 0.00000 > 
+DEAL::< 0.500000 0.250000 0.00000 > 
+DEAL::< 0.250000 0.500000 0.00000 > 
+DEAL::< 0.500000 0.500000 0.00000 > 
+DEAL::< 0.250000 0.250000 0.250000 > 
+DEAL::< 0.500000 0.250000 0.250000 > 
+DEAL::< 0.250000 0.500000 0.250000 > 
+DEAL::< 0.500000 0.500000 0.250000 > 
 DEAL::[ 0.333333 1.00000 0.800000] 
 DEAL::
 DEAL::2.435
-DEAL::<0.286905 0.658777 4.33681e-19> 
-DEAL::<0.209333 0.437629 8.67362e-19> 
-DEAL::<0.562887 0.562887 8.67362e-19> 
-DEAL::<0.418667 0.418667 1.73472e-18> 
-DEAL::<0.269808 0.604598 0.269808> 
-DEAL::<0.203251 0.422066 0.203251> 
-DEAL::<0.530301 0.530301 0.245590> 
-DEAL::<0.406502 0.406502 0.197169> 
+DEAL::< 0.286905 0.658777 4.33681e-19 > 
+DEAL::< 0.209333 0.437629 8.67362e-19 > 
+DEAL::< 0.562887 0.562887 8.67362e-19 > 
+DEAL::< 0.418667 0.418667 1.73472e-18 > 
+DEAL::< 0.269808 0.604598 0.269808 > 
+DEAL::< 0.203251 0.422066 0.203251 > 
+DEAL::< 0.530301 0.530301 0.245590 > 
+DEAL::< 0.406502 0.406502 0.197169 > 
 DEAL::[ 0.494208 0.406025 0.866848] 
 DEAL::

diff --git a/tests/bits/find_cell_alt_3.cc b/tests/bits/find_cell_alt_3.cc
index bd0d261a7932574352bb2a7fefbf47be86293212..06463881ef9dcad44a85aa9631ba66457908194f 100644 (file)
--- a/tests/bits/find_cell_alt_3.cc
+++ b/tests/bits/find_cell_alt_3.cc
@@ -45,7 +45,7 @@ void check (Triangulation<3> &tria)
 
   deallog << cell.first << std::endl;
   for (unsigned int v=0; v<GeometryInfo<3>::vertices_per_cell; ++v)
-    deallog << "<" << cell.first->vertex(v) << "> ";
+    deallog << "< " << cell.first->vertex(v) << " > ";
   deallog << "[ " << cell.second << "] ";
   deallog << std::endl;
 

diff --git a/tests/bits/find_cell_alt_3.output b/tests/bits/find_cell_alt_3.output
index 0c1fe08babc1c764ada723a9774af56ebd8b9874..a66f43f36c3855471a69e8d40d31f1082b16841e 100644 (file)
--- a/tests/bits/find_cell_alt_3.output
+++ b/tests/bits/find_cell_alt_3.output
@@ -1,7 +1,7 @@
 
 DEAL::1.0
-DEAL::<0.00000 0.00000 0.00000> <0.500000 0.00000 0.00000> <0.00000 0.00000 -0.500000> <0.500000 0.00000 -0.500000> <0.00000 0.500000 0.00000> <0.500000 0.500000 0.00000> <0.00000 0.500000 -0.500000> <0.500000 0.500000 -0.500000> [ 0.666667 0.400000 1.00000] 
+DEAL::< 0.00000 0.00000 0.00000 > < 0.500000 0.00000 0.00000 > < 0.00000 0.00000 -0.500000 > < 0.500000 0.00000 -0.500000 > < 0.00000 0.500000 0.00000 > < 0.500000 0.500000 0.00000 > < 0.00000 0.500000 -0.500000 > < 0.500000 0.500000 -0.500000 > [ 0.666667 0.400000 1.00000] 
 DEAL::1.16
-DEAL::<0.00000 0.00000 0.00000> <0.500000 0.00000 0.00000> <0.00000 0.00000 -0.500000> <0.500000 0.00000 -0.500000> <0.00000 0.500000 0.00000> <0.500000 0.500000 0.00000> <0.00000 0.500000 -0.500000> <0.500000 0.500000 -0.500000> [ 0.666667 0.400000 1.00000] 
+DEAL::< 0.00000 0.00000 0.00000 > < 0.500000 0.00000 0.00000 > < 0.00000 0.00000 -0.500000 > < 0.500000 0.00000 -0.500000 > < 0.00000 0.500000 0.00000 > < 0.500000 0.500000 0.00000 > < 0.00000 0.500000 -0.500000 > < 0.500000 0.500000 -0.500000 > [ 0.666667 0.400000 1.00000] 
 DEAL::1.50
-DEAL::<0.00000 0.577350 -0.577350> <1.73472e-18 0.394338 -0.394338> <0.577350 0.577350 -0.577350> <0.394338 0.394338 -0.394338> <0.00000 0.577350 0.00000> <1.44560e-19 0.394338 0.00000> <0.577350 0.577350 0.00000> <0.394338 0.394338 1.73472e-18> [ 0.422650 0.666667 0.600000] 
+DEAL::< 0.00000 0.577350 -0.577350 > < 1.73472e-18 0.394338 -0.394338 > < 0.577350 0.577350 -0.577350 > < 0.394338 0.394338 -0.394338 > < 0.00000 0.577350 0.00000 > < 1.44560e-19 0.394338 0.00000 > < 0.577350 0.577350 0.00000 > < 0.394338 0.394338 1.73472e-18 > [ 0.422650 0.666667 0.600000]