From: Guido Kanschat Date: Tue, 27 Mar 2001 17:04:38 +0000 (+0000) Subject: bug removed X-Git-Tag: v8.0.0~19469 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=115c09255be8540b78a1b99829e2bbbcd082fd33;p=dealii.git bug removed git-svn-id: https://svn.dealii.org/trunk@4311 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 4fa98b1cbc..6bcc145253 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -635,29 +635,6 @@ FEFaceValues::FEFaceValues (const Mapping &mapping, mapping_data = mapping.get_face_data(flags, quadrature); fe_data = fe.get_face_data(flags, mapping, quadrature); - // The get_face_data functions - // might have added an update flag. - // Therefore collect all flags - // again. - // - // E.g. if update_JxW_values is set - // the update_boundary_forms flag - // is added within the - // Mapping::get_face_data function. - // If also update_normal_vectors is - // set this update_boundary_forms - // flag was already set by the - // update_once or update_each - // function resulting in no change - // in flags below, but if - // update_normal_vectors is not set - // this actually makes a - // difference. - flags |= mapping_data->update_once - | mapping_data->update_each - | fe_data->update_once - | fe_data->update_each; - // set up objects within this class FEValuesData::initialize(n_quadrature_points, dofs_per_cell, @@ -697,29 +674,6 @@ FEFaceValues::FEFaceValues (const FiniteElement &fe, mapping_data = mapping->get_face_data(flags, quadrature); fe_data = fe.get_face_data(flags, *mapping, quadrature); - // The get_face_data functions - // might have added an update flag. - // Therefore collect all flags - // again. - // - // E.g. if update_JxW_values is set - // the update_boundary_forms flag - // is added within the - // Mapping::get_face_data function. - // If also update_normal_vectors is - // set this update_boundary_forms - // flag was already set by the - // update_once or update_each - // function resulting in no change - // in flags below, but if - // update_normal_vectors is not set - // this actually makes a - // difference. - flags |= mapping_data->update_once - | mapping_data->update_each - | fe_data->update_once - | fe_data->update_each; - // set up objects within this class FEValuesData::initialize(n_quadrature_points, dofs_per_cell, diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index f935479361..d877681a7d 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -288,10 +288,11 @@ MappingQ1::update_each (const UpdateFlags in) const // cerr << "Mapping-each " << hex << in << ' ' << out; - if (in & update_normal_vectors) + if (out & (update_JxW_values + |update_normal_vectors)) out |= update_boundary_forms; - if (in & (update_covariant_transformation + if (out & (update_covariant_transformation | update_JxW_values | update_boundary_forms | update_normal_vectors))