Fixed bug in runtime for 3D manifolds.

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

diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc
index 9909c43ab3241b6eb7fa5403020b65dd66856efa..e964f71b9a92b5ccbb7d9cd525c3a6f2ff3261dc 100644 (file)
--- a/deal.II/source/grid/tria.cc
+++ b/deal.II/source/grid/tria.cc
@@ -52,7 +52,7 @@ namespace {
 
  void get_default_points_and_weights(std::vector<Point<3> > &sp,
                                     std::vector<double> &wp,
-                                    const CellAccessor<3,3>& obj) 
+                                    const TriaActiveIterator<CellAccessor<3, 3> >& obj) 
  {
    const int dim = 3;
    
@@ -64,17 +64,17 @@ namespace {
    unsigned int j=0;
    for(unsigned int i=0; i<GeometryInfo<dim>::vertices_per_cell; ++i, ++j) 
      {
-       sp[j] = obj.vertex(i);
+       sp[j] = obj->vertex(i);
        wp[j] = 1.0/128.0;
      }
    for(unsigned int i=0; i<GeometryInfo<dim>::lines_per_cell; ++i, ++j) 
      {
-       sp[j] = obj.line(i)->child(0)->vertex(1);
+       sp[j] = obj->line(i)->child(0)->vertex(1);
        wp[j] = 7.0/192.0;
      }
    for(unsigned int i=0; i<GeometryInfo<dim>::faces_per_cell; ++i, ++j) 
      {
-       sp[j] = obj.face(i)->isotropic_child(0)->vertex(3);
+       sp[j] = obj->face(i)->isotropic_child(0)->vertex(3);
        wp[j] = 1.0/12.0;
      }
  }
@@ -8493,26 +8493,6 @@ namespace internal
                       triangulation.vertices[next_unused_vertex] =
                        hex->get_manifold().get_new_point(sp, wp);
                      
-                      // // first add corners of hex
-                      // for (unsigned int vertex=0;
-                      //      vertex<GeometryInfo<dim>::vertices_per_cell; ++vertex)
-                      //   triangulation.vertices[next_unused_vertex] += hex->vertex(vertex) / 128;
-                      // // now add center of lines
-                      // for (unsigned int line=0;
-                      //      line<GeometryInfo<dim>::lines_per_cell; ++line)
-                      //   triangulation.vertices[next_unused_vertex] += hex->line(line)->child(0)->vertex(1) *
-                      //                                                 7./192.;
-                      // // finally add centers of
-                      // // faces. note that vertex 3
-                      // // of child 0 is an invariant
-                      // // with respect to the face
-                      // // orientation, flip and
-                      // // rotation
-                      // for (unsigned int face=0;
-                      //      face<GeometryInfo<dim>::faces_per_cell; ++face)
-                      //   triangulation.vertices[next_unused_vertex] += hex->face(face)->isotropic_child(0)->vertex(3) *
-                      //                                                 1./12.;
-
                       // set the data of the
                       // six lines.  first
                       // collect the indices of