From: angela.klewinghaus Date: Wed, 6 Mar 2013 13:25:39 +0000 (+0000) Subject: corrected fill data for line shape values for 3D in fill_fe_face_values X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db8fba944f5cd83d1eefdce30d9111b7da900d1;p=dealii-svn.git corrected fill data for line shape values for 3D in fill_fe_face_values git-svn-id: https://svn.dealii.org/branches/branch_face_elements@28752 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/fe/fe_poly_face.templates.h b/deal.II/include/deal.II/fe/fe_poly_face.templates.h index 39720be20b..4afa67c2f5 100644 --- a/deal.II/include/deal.II/fe/fe_poly_face.templates.h +++ b/deal.II/include/deal.II/fe/fe_poly_face.templates.h @@ -221,6 +221,9 @@ FE_PolyFace::fill_fe_face_values ( for (unsigned int k=0; kdofs_per_quad; ++k) data.shape_values(foffset+k,i) = fe_data.shape_values[k+this->first_face_quad_index][i]; } + } + case 2: + { // Fill data for line shape functions if (this->dofs_per_line != 0) { @@ -228,31 +231,19 @@ FE_PolyFace::fill_fe_face_values ( for (unsigned int line=0; line::lines_per_face; ++line) { for (unsigned int k=0; kdofs_per_line; ++k) - data.shape_values(foffset+GeometryInfo::face_to_cell_lines(face, line)+k,i) = fe_data.shape_values[k+(line*this->dofs_per_line)+this->first_face_line_index][i]; + data.shape_values(foffset+GeometryInfo::face_to_cell_lines(face, line)*this->dofs_per_line+k,i) = fe_data.shape_values[k+(line*this->dofs_per_line)+this->first_face_line_index][i]; } } - break; - } - case 2: - { - // Fill data for line shape functions - if (this->dofs_per_line != 0) - { - const unsigned int foffset = this->first_line_index + this->dofs_per_line * face; - for (unsigned int k=0; kdofs_per_line; ++k) - data.shape_values(foffset+k,i) = fe_data.shape_values[k+this->first_face_line_index][i]; - } - break; } case 1: - { + { + // Fill data for vertex shape functions + if (this->dofs_per_vertex != 0) + for (unsigned int lvertex=0; lvertex::vertices_per_face; ++lvertex) + data.shape_values(GeometryInfo::face_to_cell_vertices(face, lvertex),i) = fe_data.shape_values[lvertex][i]; break; } } - // Fill data for vertex shape functions - if (this->dofs_per_vertex != 0) - for (unsigned int lvertex=0; lvertex::vertices_per_face; ++lvertex) - data.shape_values(GeometryInfo::face_to_cell_vertices(face, lvertex),i) = fe_data.shape_values[lvertex][i]; } }