From: turcksin Date: Mon, 15 Apr 2013 17:19:33 +0000 (+0000) Subject: Merge from mainline. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6b02080a936b9e4865f7739aeb4fc11801a49df;p=dealii-svn.git Merge from mainline. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29290 0785d39b-7218-0410-832d-ea1e28bc413d --- f6b02080a936b9e4865f7739aeb4fc11801a49df diff --cc deal.II/source/grid/grid_generator.cc index 809b330497,f09d170ccc..c455db08ec --- a/deal.II/source/grid/grid_generator.cc +++ b/deal.II/source/grid/grid_generator.cc @@@ -3378,8 -3378,8 +3378,8 @@@ merge_triangulations (const Triangulati void GridGenerator:: - extrude_triangulation(const Triangulation<2, 2> & input, + extrude_triangulation(const Triangulation<2, 2> &input, - const unsigned int n_slices, + const size_type n_slices, const double height, Triangulation<3,3> &result) { @@@ -3393,22 -3393,22 +3393,22 @@@ std::vector > cells; cells.reserve((n_slices-1)*input.n_active_cells()); - for (size_type slice=0;slice & v = input.get_vertices()[i]; - points[i+slice*input.n_vertices()](0) = v(0); - points[i+slice*input.n_vertices()](1) = v(1); - points[i+slice*input.n_vertices()](2) = height * slice / (n_slices-1); - } + { + const Point<2> &v = input.get_vertices()[i]; + points[i+slice*input.n_vertices()](0) = v(0); + points[i+slice*input.n_vertices()](1) = v(1); + points[i+slice*input.n_vertices()](2) = height * slice / (n_slices-1); + } } for (Triangulation<2,2>::cell_iterator - cell = input.begin(); cell != input.end(); ++cell) + cell = input.begin(); cell != input.end(); ++cell) { - for (size_type slice=0;slice this_cell; for (unsigned int v=0; v::vertices_per_cell; ++v) @@@ -3436,14 -3436,14 +3436,14 @@@ { quad.boundary_id = cell->face(f)->boundary_indicator(); bid = std::max(bid, quad.boundary_id); - for (size_type slice=0;sliceface(f)->vertex_index(0)+slice*input.n_vertices(); - quad.vertices[1] = cell->face(f)->vertex_index(1)+slice*input.n_vertices(); - quad.vertices[2] = cell->face(f)->vertex_index(0)+(slice+1)*input.n_vertices(); - quad.vertices[3] = cell->face(f)->vertex_index(1)+(slice+1)*input.n_vertices(); - s.boundary_quads.push_back(quad); - } ++ for (size_type slice=0; sliceface(f)->vertex_index(0)+slice*input.n_vertices(); + quad.vertices[1] = cell->face(f)->vertex_index(1)+slice*input.n_vertices(); + quad.vertices[2] = cell->face(f)->vertex_index(0)+(slice+1)*input.n_vertices(); + quad.vertices[3] = cell->face(f)->vertex_index(1)+(slice+1)*input.n_vertices(); + s.boundary_quads.push_back(quad); + } } } diff --cc tests/matrix_free/step-37.cc index 457e11360a,c422125579..d0fac74dec --- a/tests/matrix_free/step-37.cc +++ b/tests/matrix_free/step-37.cc @@@ -431,8 -431,8 +431,8 @@@ namespace Step3 typename FunctionMap::type dirichlet_boundary; ZeroFunction homogeneous_dirichlet_bc (1); dirichlet_boundary[0] = &homogeneous_dirichlet_bc; - std::vector > boundary_indices(triangulation.n_levels()); + std::vector > boundary_indices(triangulation.n_levels()); - MGTools::make_boundary_list (mg_dof_handler, + MGTools::make_boundary_list (dof_handler, dirichlet_boundary, boundary_indices); for (unsigned int level=0; level