Take over fixes from 1.111->1.113

git-svn-id: https://svn.dealii.org/branches/Branch-3-0@2749 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc
index f7037b486ea03cf0eb220d9c6c8e807994a66281..94cd9f2d662752c32a01d23b2e038ee13c8c3ee3 100644 (file)
--- a/deal.II/deal.II/source/grid/tria.cc
+++ b/deal.II/deal.II/source/grid/tria.cc
@@ -1236,7 +1236,7 @@ void Triangulation<dim>::distort_random (const double factor,
     };
 
 
-const unsigned int n_vertices = vertices.size();
+  const unsigned int n_vertices = vertices.size();
   Point<dim> shift_vector;
   
   for (unsigned int vertex=0; vertex<n_vertices; ++vertex) 
@@ -4387,7 +4387,7 @@ void Triangulation<3>::execute_refinement () {
 
                                       // now count the quads and lines which
                                       // were flagged for refinement
-      for (quad_iterator quad=begin_quad(); quad!=end_quad(); ++quad)
+      for (quad_iterator quad=begin_quad(level); quad!=end_quad(level); ++quad)
        if (quad->user_flag_set())
          {
            Assert (quad->has_children() == false, ExcInternalError());
@@ -4396,7 +4396,7 @@ void Triangulation<3>::execute_refinement () {
            needed_vertices += 1;
          };
 
-      for (line_iterator line=begin_line(); line!=end_line(); ++line)
+      for (line_iterator line=begin_line(level); line!=end_line(level); ++line)
        if (line->user_flag_set())
          {
            Assert (line->has_children() == false, ExcInternalError());
@@ -4409,8 +4409,8 @@ void Triangulation<3>::execute_refinement () {
                                       // the next higher level
       const unsigned int used_cells
        = count_if (levels[level+1]->quads.used.begin(),
-               levels[level+1]->quads.used.end(),
-               bind2nd (equal_to<bool>(), true));
+                   levels[level+1]->quads.used.end(),
+                   bind2nd (equal_to<bool>(), true));
 
 
                                       // reserve space for the used_cells