From: Wolfgang Bangerth Date: Mon, 27 Jul 2015 23:37:55 +0000 (-0500) Subject: Don't call compute_fill_face, but go right back to the function in the base class. X-Git-Tag: v8.4.0-rc2~701^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7a3ecfc914619c69e6f20a67b431a4f9d55050f;p=dealii.git Don't call compute_fill_face, but go right back to the function in the base class. --- diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index edb1827ae4..fb77e350a4 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -320,29 +320,23 @@ fill_fe_face_values (const typename Triangulation::cell_iterator & // is in the interior, as the mapping on the face depends on the mapping of // the cell, which in turn depends on the fact whether _any_ of the faces of // this cell is at the boundary, not only the present face - data.use_mapping_q1_on_current_cell=!(use_mapping_q_on_all_cells - || cell->has_boundary_lines()); + data.use_mapping_q1_on_current_cell = !(use_mapping_q_on_all_cells + || cell->has_boundary_lines()); // depending on this result, use this or the other data object for the - // mapping + // mapping and call the function in the base class with this + // data object to do the work const typename MappingQ1::InternalData *p_data = (data.use_mapping_q1_on_current_cell ? &data.mapping_q1_data : &data); - - const unsigned int n_q_points = quadrature.size(); - this->compute_fill_face (cell, face_no, numbers::invalid_unsigned_int, - QProjector::DataSetDescriptor:: - face (face_no, - cell->face_orientation(face_no), - cell->face_flip(face_no), - cell->face_rotation(face_no), - n_q_points), - quadrature, - *p_data, - output_data); + MappingQ1::fill_fe_face_values(cell, + face_no, + quadrature, + *p_data, + output_data); } @@ -368,30 +362,24 @@ fill_fe_subface_values (const typename Triangulation::cell_iterato // is in the interior, as the mapping on the face depends on the mapping of // the cell, which in turn depends on the fact whether _any_ of the faces of // this cell is at the boundary, not only the present face - data.use_mapping_q1_on_current_cell=!(use_mapping_q_on_all_cells - || cell->has_boundary_lines()); + data.use_mapping_q1_on_current_cell = !(use_mapping_q_on_all_cells + || cell->has_boundary_lines()); // depending on this result, use this or the other data object for the - // mapping + // mapping and call the function in the base class with this + // data object to do the work const typename MappingQ1::InternalData *p_data = (data.use_mapping_q1_on_current_cell ? &data.mapping_q1_data : &data); - - const unsigned int n_q_points = quadrature.size(); - this->compute_fill_face (cell, face_no, subface_no, - QProjector::DataSetDescriptor:: - subface (face_no, subface_no, - cell->face_orientation(face_no), - cell->face_flip(face_no), - cell->face_rotation(face_no), - n_q_points, - cell->subface_case(face_no)), - quadrature, - *p_data, - output_data); + MappingQ1::fill_fe_subface_values(cell, + face_no, + subface_no, + quadrature, + *p_data, + output_data); }