From 0b37a2a594567f71cf2b30695bcf8dc431cfb1ed Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 20 May 1998 08:41:03 +0000 Subject: [PATCH] Clarify some things with the update flags for FEValues objects. git-svn-id: https://svn.dealii.org/trunk@320 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/Attic/examples/convergence/convergence.cc | 2 +- .../Attic/examples/error-estimation/error-estimation.cc | 2 +- deal.II/deal.II/Attic/examples/poisson/problem.cc | 2 +- deal.II/deal.II/source/numerics/error_estimator.cc | 9 ++------- deal.II/deal.II/source/numerics/matrices.cc | 6 +----- deal.II/deal.II/source/numerics/vectors.cc | 1 - tests/big-tests/convergence/convergence.cc | 2 +- tests/big-tests/error-estimation/error-estimation.cc | 2 +- tests/big-tests/poisson/problem.cc | 2 +- 9 files changed, 9 insertions(+), 19 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/convergence.cc b/deal.II/deal.II/Attic/examples/convergence/convergence.cc index 7c09fcc3f5..b2424130dc 100644 --- a/deal.II/deal.II/Attic/examples/convergence/convergence.cc +++ b/deal.II/deal.II/Attic/examples/convergence/convergence.cc @@ -252,7 +252,7 @@ void PoissonProblem::run (const unsigned int level) { cout << " Assembling matrices..." << endl; UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | - update_jacobians | update_JxW_values); + update_JxW_values); ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = boundary_values; diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index fc2e807838..063f9902c5 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -438,7 +438,7 @@ void PoissonProblem::run (ParameterHandler &prm) { cout << " Assembling matrices..." << endl; UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | - update_jacobians | update_JxW_values); + update_JxW_values); ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = solution_function; diff --git a/deal.II/deal.II/Attic/examples/poisson/problem.cc b/deal.II/deal.II/Attic/examples/poisson/problem.cc index cd95664c87..d8fb3c517f 100644 --- a/deal.II/deal.II/Attic/examples/poisson/problem.cc +++ b/deal.II/deal.II/Attic/examples/poisson/problem.cc @@ -459,7 +459,7 @@ void PoissonProblem::run (ParameterHandler &prm) { dirichlet_bc[0] = boundary_values; assemble (equation, quadrature, fe, UpdateFlags(update_gradients | update_JxW_values | - update_jacobians | update_q_points), + update_q_points), dirichlet_bc, *boundary); cout << " Solving..." << endl; diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index c5be6740d4..a4cc86f989 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -76,14 +76,9 @@ void KellyErrorEstimator::estimate_error (const DoFHandler &dof, FEFaceValues fe_face_values_cell (fe, quadrature, UpdateFlags(update_gradients | update_JxW_values | - update_jacobians | update_normal_vectors)); - FEFaceValues fe_face_values_neighbor (fe, quadrature, - UpdateFlags(update_gradients | - update_jacobians)); - FESubfaceValues fe_subface_values (fe, quadrature, - UpdateFlags(update_gradients | - update_jacobians)); + FEFaceValues fe_face_values_neighbor (fe, quadrature, update_gradients); + FESubfaceValues fe_subface_values (fe, quadrature, update_gradients); // loop over all cells const active_cell_iterator endc = dof.end(); diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index 2ba113cd36..c2bd7354ec 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -21,8 +21,7 @@ void MatrixCreator::create_mass_matrix (const DoFHandler &dof, dSMatrix &matrix, const Function * const a) { dVector dummy; // no entries, should give an error if accessed - UpdateFlags update_flags = UpdateFlags(update_jacobians | - update_JxW_values); + UpdateFlags update_flags = update_JxW_values; if (a != 0) update_flags = UpdateFlags (update_flags | update_q_points); const AssemblerData data (dof, @@ -55,7 +54,6 @@ void MatrixCreator::create_mass_matrix (const DoFHandler &dof, dVector &rhs_vector, const Function * const a) { UpdateFlags update_flags = UpdateFlags(update_q_points | - update_jacobians | update_JxW_values); const AssemblerData data (dof, true, true, @@ -86,7 +84,6 @@ void MatrixCreator::create_laplace_matrix (const DoFHandler &dof, const Function * const a) { dVector dummy; // no entries, should give an error if accessed UpdateFlags update_flags = UpdateFlags(update_gradients | - update_jacobians | update_JxW_values); if (a != 0) update_flags = UpdateFlags(update_flags | update_q_points); @@ -120,7 +117,6 @@ void MatrixCreator::create_laplace_matrix (const DoFHandler &dof, const Function * const a) { UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | - update_jacobians | update_JxW_values); const AssemblerData data (dof, true, true, diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index a9136e875a..bfffb5a645 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -124,7 +124,6 @@ void VectorTools::integrate_difference (const DoFHandler &dof, difference.reinit (dof.get_tria().n_active_cells()); UpdateFlags update_flags = UpdateFlags (update_q_points | - update_jacobians | update_JxW_values); if ((norm==H1_seminorm) || (norm==H1_norm)) update_flags = UpdateFlags (update_flags | update_gradients); diff --git a/tests/big-tests/convergence/convergence.cc b/tests/big-tests/convergence/convergence.cc index 7c09fcc3f5..b2424130dc 100644 --- a/tests/big-tests/convergence/convergence.cc +++ b/tests/big-tests/convergence/convergence.cc @@ -252,7 +252,7 @@ void PoissonProblem::run (const unsigned int level) { cout << " Assembling matrices..." << endl; UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | - update_jacobians | update_JxW_values); + update_JxW_values); ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = boundary_values; diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index fc2e807838..063f9902c5 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -438,7 +438,7 @@ void PoissonProblem::run (ParameterHandler &prm) { cout << " Assembling matrices..." << endl; UpdateFlags update_flags = UpdateFlags(update_q_points | update_gradients | - update_jacobians | update_JxW_values); + update_JxW_values); ProblemBase::FunctionMap dirichlet_bc; dirichlet_bc[0] = solution_function; diff --git a/tests/big-tests/poisson/problem.cc b/tests/big-tests/poisson/problem.cc index cd95664c87..d8fb3c517f 100644 --- a/tests/big-tests/poisson/problem.cc +++ b/tests/big-tests/poisson/problem.cc @@ -459,7 +459,7 @@ void PoissonProblem::run (ParameterHandler &prm) { dirichlet_bc[0] = boundary_values; assemble (equation, quadrature, fe, UpdateFlags(update_gradients | update_JxW_values | - update_jacobians | update_q_points), + update_q_points), dirichlet_bc, *boundary); cout << " Solving..." << endl; -- 2.39.5