From: heltai Date: Thu, 14 Nov 2013 16:17:59 +0000 (+0000) Subject: Fixed bug in runtime for 3D manifolds. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4cec480af7e041c24839cfddab62d1a7546e565;p=dealii-svn.git 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 9909c43ab3..e964f71b9a 100644 --- 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 > &sp, std::vector &wp, - const CellAccessor<3,3>& obj) + const TriaActiveIterator >& obj) { const int dim = 3; @@ -64,17 +64,17 @@ namespace { unsigned int j=0; for(unsigned int i=0; i::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::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::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::vertices_per_cell; ++vertex) - // triangulation.vertices[next_unused_vertex] += hex->vertex(vertex) / 128; - // // now add center of lines - // for (unsigned int line=0; - // line::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::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