From fc07a8d1635f2857726e1c5abb8b69930b003006 Mon Sep 17 00:00:00 2001 From: guido Date: Mon, 12 Mar 2001 10:33:15 +0000 Subject: [PATCH] Buf with update_flags fixed git-svn-id: https://svn.dealii.org/trunk@4188 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/fe_values.cc | 40 +++++++++++++++----------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index 106e757bd8..3618e5fddd 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -41,6 +41,8 @@ FEValuesData::initialize (const unsigned int n_quadrature_points, const unsigned int n_shapes, const UpdateFlags flags) { + update_flags = flags; + if (flags & update_values) shape_values.reinit(n_shapes, n_quadrature_points); @@ -433,7 +435,7 @@ FEValues::FEValues (const Mapping &mapping, FEValuesBase (q.n_quadrature_points, fe.dofs_per_cell, 1, - update_flags, + update_default, mapping, fe), quadrature (q) @@ -449,8 +451,9 @@ FEValues::FEValues (const Mapping &mapping, // ask the finite element and mapping. // elements are first since they // might require update in mapping - UpdateFlags flags = fe.update_once (update_flags) - | fe.update_each (update_flags); + UpdateFlags flags = update_flags + | fe.update_once (update_flags) + | fe.update_each (update_flags); flags |= mapping.update_once (flags) | mapping.update_each (flags); @@ -477,7 +480,7 @@ FEValues::FEValues (const FiniteElement &fe, FEValuesBase (q.n_quadrature_points, fe.dofs_per_cell, 1, - update_flags, + update_default, mapping_q1, fe), quadrature (q) @@ -493,8 +496,9 @@ FEValues::FEValues (const FiniteElement &fe, // ask the finite element and mapping. // elements are first since they // might require update in mapping - UpdateFlags flags = fe.update_once (update_flags) - | fe.update_each (update_flags); + UpdateFlags flags = update_flags + | fe.update_once (update_flags) + | fe.update_each (update_flags); flags |= mapping->update_once (flags) | mapping->update_each (flags); @@ -558,7 +562,7 @@ template FEFaceValuesBase::FEFaceValuesBase (const unsigned int n_q_points, const unsigned int dofs_per_cell, const unsigned int n_faces_or_subfaces, - const UpdateFlags update_flags, + const UpdateFlags, const Mapping &mapping, const FiniteElement &fe, const Quadrature& quadrature) @@ -566,7 +570,7 @@ FEFaceValuesBase::FEFaceValuesBase (const unsigned int n_q_points, FEValuesBase (n_q_points, dofs_per_cell, n_faces_or_subfaces, - update_flags, + update_default, mapping, fe), quadrature(quadrature) @@ -618,8 +622,9 @@ FEFaceValues::FEFaceValues (const Mapping &mapping, // ask the finite element and mapping. // elements are first since they // might require update in mapping - UpdateFlags flags = fe.update_once (update_flags) - | fe.update_each (update_flags); + UpdateFlags flags = update_flags + | fe.update_once (update_flags) + | fe.update_each (update_flags); flags |= mapping.update_once (flags) | mapping.update_each (flags); @@ -656,8 +661,9 @@ FEFaceValues::FEFaceValues (const FiniteElement &fe, // ask the finite element and mapping. // elements are first since they // might require update in mapping - UpdateFlags flags = fe.update_once (update_flags) - | fe.update_each (update_flags); + UpdateFlags flags = update_flags + | fe.update_once (update_flags) + | fe.update_each (update_flags); flags |= mapping->update_once (flags) | mapping->update_each (flags); @@ -733,8 +739,9 @@ FESubfaceValues::FESubfaceValues (const Mapping &mapping, // ask the finite element and mapping. // elements are first since they // might require update in mapping - UpdateFlags flags = fe.update_once (update_flags) - | fe.update_each (update_flags); + UpdateFlags flags = update_flags + | fe.update_once (update_flags) + | fe.update_each (update_flags); flags |= mapping.update_once (flags) | mapping.update_each (flags); @@ -772,8 +779,9 @@ FESubfaceValues::FESubfaceValues (const FiniteElement &fe, // ask the finite element and mapping. // elements are first since they // might require update in mapping - UpdateFlags flags = fe.update_once (update_flags) - | fe.update_each (update_flags); + UpdateFlags flags = update_flags + | fe.update_once (update_flags) + | fe.update_each (update_flags); flags |= mapping->update_once (flags) | mapping->update_each (flags); -- 2.39.5