From 27d7dd34d3745e7f8369625ae18278e57875c46c Mon Sep 17 00:00:00 2001 From: Jonathan Robey Date: Wed, 31 Aug 2016 14:02:36 -0700 Subject: [PATCH] Change update_q_points to update_quadrature_points --- include/deal.II/numerics/vector_tools.templates.h | 4 ++-- source/fe/mapping_q_eulerian.cc | 2 +- tests/aniso/mesh_3d_21.cc | 4 ++-- tests/base/work_stream_03.cc | 4 ++-- tests/base/work_stream_03_graph.cc | 4 ++-- tests/bits/block_sparse_matrix_1.cc | 2 +- tests/bits/joa_1.cc | 2 +- tests/bits/make_boundary_constraints_03.cc | 2 +- tests/bits/q_point_sum_1.cc | 4 ++-- tests/bits/q_point_sum_2.cc | 4 ++-- tests/bits/q_point_sum_3.cc | 4 ++-- tests/bits/q_point_sum_4.cc | 4 ++-- tests/bits/q_points.cc | 4 ++-- tests/bits/rt_1.cc | 2 +- tests/bits/rt_2.cc | 4 ++-- tests/bits/static_condensation.cc | 4 ++-- tests/bits/step-12.cc | 8 ++++---- tests/bits/step-13.cc | 2 +- tests/bits/step-14.cc | 8 ++++---- tests/bits/step-15.cc | 6 +++--- tests/bits/step-16.cc | 4 ++-- tests/bits/step-4.cc | 2 +- tests/bits/step-5.cc | 2 +- tests/bits/step-6-racoptimize-2.cc | 2 +- tests/bits/step-6-racoptimize.cc | 2 +- tests/bits/step-6.cc | 2 +- tests/bits/step-7.cc | 4 ++-- tests/bits/step-8.cc | 2 +- tests/bits/volume_1.cc | 4 ++-- tests/bits/volume_2.cc | 4 ++-- tests/bits/volume_3.cc | 4 ++-- tests/bits/volume_4.cc | 4 ++-- tests/dofs/dof_renumbering_02.cc | 4 ++-- tests/dofs/dof_renumbering_03.cc | 2 +- tests/dofs/dof_renumbering_04.cc | 2 +- tests/dofs/dof_renumbering_05.cc | 2 +- tests/dofs/dof_renumbering_06.cc | 2 +- tests/dofs/dof_renumbering_07.cc | 2 +- tests/dofs/dof_renumbering_08.cc | 2 +- tests/dofs/dof_renumbering_zorder_01.cc | 2 +- tests/dofs/dof_renumbering_zorder_02.cc | 2 +- tests/fail/abf_approximation_01.cc | 2 +- tests/fail/circular_01.cc | 2 +- tests/fail/hp-step-14.cc | 8 ++++---- tests/fail/hp-step-15.cc | 6 +++--- tests/fail/rt_distorted_01.cc | 2 +- tests/fail/rt_distorted_02.cc | 2 +- tests/fe/abf_01.cc | 8 ++++---- tests/fe/bdm_2.cc | 2 +- tests/fe/deformed_projection.h | 8 ++++---- tests/fe/fe_face_values_1d.cc | 4 ++-- tests/fe/fe_values_view_25.cc | 2 +- tests/fe/fe_values_view_25_nonsymmetric.cc | 2 +- tests/fe/fe_values_view_26.cc | 2 +- tests/fe/fe_values_view_27.cc | 2 +- tests/fe/fe_values_view_28.cc | 2 +- tests/fe/fe_values_view_29.cc | 2 +- tests/fe/nedelec.cc | 2 +- tests/fe/nedelec_2.cc | 6 +++--- tests/fe/nedelec_3.cc | 2 +- tests/fe/rt_2.cc | 2 +- tests/fe/rt_7.cc | 2 +- tests/fe/rt_approximation_01.cc | 2 +- tests/fe/rt_normal_02.cc | 10 +++++----- tests/fe/rtn_2.cc | 2 +- tests/fe/shapes.h | 4 ++-- tests/grid/mesh_3d_14.cc | 4 ++-- tests/grid/mesh_3d_20.cc | 4 ++-- tests/grid/mesh_3d_7.cc | 4 ++-- tests/hp/crash_17.cc | 2 +- tests/hp/crash_18.cc | 2 +- tests/hp/step-12.cc | 8 ++++---- tests/hp/step-13.cc | 2 +- tests/hp/step-4.cc | 2 +- tests/hp/step-5.cc | 2 +- tests/hp/step-6.cc | 2 +- tests/hp/step-7.cc | 4 ++-- tests/hp/step-8.cc | 2 +- tests/lac/filtered_matrix_06.cc | 2 +- tests/mappings/fe_face_values_1d_mapping_cartesian.cc | 4 ++-- tests/mappings/fe_face_values_1d_mapping_q2.cc | 4 ++-- tests/mappings/mapping.cc | 6 +++--- tests/mappings/mapping_c1.cc | 4 ++-- tests/numerics/derivative_approximation_2.cc | 2 +- tests/numerics/derivatives.cc | 4 ++-- tests/numerics/normal_flux_inhom_01.cc | 2 +- tests/numerics/tangential_flux_inhom_01.cc | 2 +- 87 files changed, 145 insertions(+), 145 deletions(-) diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index 34948dbd61..e95fe14037 100644 --- a/include/deal.II/numerics/vector_tools.templates.h +++ b/include/deal.II/numerics/vector_tools.templates.h @@ -5334,7 +5334,7 @@ namespace VectorTools hp::FEFaceValues x_fe_face_values (mapping_collection, fe_collection, face_quadrature_collection, - update_q_points | + update_quadrature_points | update_normal_vectors); // have a map that stores normal vectors for each vector-dof tuple we want @@ -5920,7 +5920,7 @@ namespace VectorTools hp::FEFaceValues x_fe_face_values (mapping_collection, fe_collection, face_quadrature_collection, - update_q_points | + update_quadrature_points | update_normal_vectors); // Extract a list that collects all vector components that belong to the diff --git a/source/fe/mapping_q_eulerian.cc b/source/fe/mapping_q_eulerian.cc index 4683798e06..0e7ffc820e 100644 --- a/source/fe/mapping_q_eulerian.cc +++ b/source/fe/mapping_q_eulerian.cc @@ -48,7 +48,7 @@ MappingQEulerianGeneric (const unsigned int degr support_quadrature(degree), fe_values(mapping_q_eulerian.euler_dof_handler->get_fe(), support_quadrature, - update_values | update_q_points) + update_values | update_quadrature_points) {} template diff --git a/tests/aniso/mesh_3d_21.cc b/tests/aniso/mesh_3d_21.cc index 448fbf8623..4e74bcb7d5 100644 --- a/tests/aniso/mesh_3d_21.cc +++ b/tests/aniso/mesh_3d_21.cc @@ -43,10 +43,10 @@ FE_DGQ<3> fe(1); QGauss<2> quadrature(3); MappingQ<3> mapping(2); FEFaceValues<3> fe_face_values1 (mapping, fe, quadrature, - update_q_points | update_JxW_values | + update_quadrature_points | update_JxW_values | update_normal_vectors); FESubfaceValues<3> fe_face_values2 (mapping, fe, quadrature, - update_q_points | update_JxW_values | + update_quadrature_points | update_JxW_values | update_normal_vectors); void check_this (Triangulation<3> &tria) diff --git a/tests/base/work_stream_03.cc b/tests/base/work_stream_03.cc index 73a0e9499d..90312fe3f7 100644 --- a/tests/base/work_stream_03.cc +++ b/tests/base/work_stream_03.cc @@ -56,7 +56,7 @@ namespace { Scratch(const FiniteElement &fe, const Quadrature &quadrature) : fe_collection(fe), quadrature_collection(quadrature), x_fe_values( - fe_collection, quadrature_collection, update_q_points), rhs_values( + fe_collection, quadrature_collection, update_quadrature_points), rhs_values( quadrature_collection.size()) { } @@ -64,7 +64,7 @@ namespace Scratch(const Scratch &data) : fe_collection(data.fe_collection), quadrature_collection( data.quadrature_collection), x_fe_values(fe_collection, - quadrature_collection, update_q_points), rhs_values( + quadrature_collection, update_quadrature_points), rhs_values( data.rhs_values) { } diff --git a/tests/base/work_stream_03_graph.cc b/tests/base/work_stream_03_graph.cc index 281c1bb620..cddb701ca6 100644 --- a/tests/base/work_stream_03_graph.cc +++ b/tests/base/work_stream_03_graph.cc @@ -53,7 +53,7 @@ namespace { Scratch(const FiniteElement &fe, const Quadrature &quadrature) : fe_collection(fe), quadrature_collection(quadrature), x_fe_values( - fe_collection, quadrature_collection, update_q_points), rhs_values( + fe_collection, quadrature_collection, update_quadrature_points), rhs_values( quadrature_collection.size()) { } @@ -61,7 +61,7 @@ namespace Scratch(const Scratch &data) : fe_collection(data.fe_collection), quadrature_collection( data.quadrature_collection), x_fe_values(fe_collection, - quadrature_collection, update_q_points), rhs_values( + quadrature_collection, update_quadrature_points), rhs_values( data.rhs_values) { } diff --git a/tests/bits/block_sparse_matrix_1.cc b/tests/bits/block_sparse_matrix_1.cc index c0ecef6156..808dbc6f74 100644 --- a/tests/bits/block_sparse_matrix_1.cc +++ b/tests/bits/block_sparse_matrix_1.cc @@ -101,7 +101,7 @@ int main() FEValues<2> fe_values (dof_handler.get_fe(), qr, UpdateFlags(update_values | update_gradients | - update_q_points | + update_quadrature_points | update_JxW_values)); MatrixTools::create_laplace_matrix (dof_handler, qr, B.block(0,0)); diff --git a/tests/bits/joa_1.cc b/tests/bits/joa_1.cc index 40a71e1c02..9ba06b8739 100644 --- a/tests/bits/joa_1.cc +++ b/tests/bits/joa_1.cc @@ -555,7 +555,7 @@ void LaplaceProblem::assemble_system () FEValues fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/make_boundary_constraints_03.cc b/tests/bits/make_boundary_constraints_03.cc index f9b51792e3..3afe78aa68 100644 --- a/tests/bits/make_boundary_constraints_03.cc +++ b/tests/bits/make_boundary_constraints_03.cc @@ -69,7 +69,7 @@ void test () Quadrature<2> quadrature_formula(fe.get_unit_support_points()); FEValues<2> fe_values (fe, quadrature_formula, - update_values | update_gradients | update_JxW_values|update_q_points); + update_values | update_gradients | update_JxW_values|update_quadrature_points); const unsigned int dofs_per_cell = fe.dofs_per_cell; std::vector local_dof_indices (dofs_per_cell); diff --git a/tests/bits/q_point_sum_1.cc b/tests/bits/q_point_sum_1.cc index 445df4e727..a8d1d1e07e 100644 --- a/tests/bits/q_point_sum_1.cc +++ b/tests/bits/q_point_sum_1.cc @@ -43,9 +43,9 @@ void check (const Triangulation &tria) QGauss q_face(3); FEFaceValues fe_face_values (fe, q_face, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FESubfaceValues fe_subface_values (fe, q_face, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); Point n1, n2; for (typename DoFHandler::active_cell_iterator diff --git a/tests/bits/q_point_sum_2.cc b/tests/bits/q_point_sum_2.cc index d046b34369..02425b862f 100644 --- a/tests/bits/q_point_sum_2.cc +++ b/tests/bits/q_point_sum_2.cc @@ -51,9 +51,9 @@ void check (const Triangulation &tria, QGauss q_face(3); FEFaceValues fe_face_values (mapping, fe, q_face, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FESubfaceValues fe_subface_values (mapping, fe, q_face, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); Point n1, n2; for (typename DoFHandler::active_cell_iterator diff --git a/tests/bits/q_point_sum_3.cc b/tests/bits/q_point_sum_3.cc index c528cb3dc1..702dbb1e7b 100644 --- a/tests/bits/q_point_sum_3.cc +++ b/tests/bits/q_point_sum_3.cc @@ -50,9 +50,9 @@ void check (const Triangulation &tria) QGauss q_face(3); FEFaceValues fe_face_values (mapping, fe, q_face, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FESubfaceValues fe_subface_values (mapping, fe, q_face, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); Point n1, n2; for (typename DoFHandler::active_cell_iterator diff --git a/tests/bits/q_point_sum_4.cc b/tests/bits/q_point_sum_4.cc index f66e30095c..8410eeeb94 100644 --- a/tests/bits/q_point_sum_4.cc +++ b/tests/bits/q_point_sum_4.cc @@ -50,9 +50,9 @@ void check (const Triangulation &tria) QGauss q_face(3); FEFaceValues fe_face_values (mapping, fe, q_face, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FESubfaceValues fe_subface_values (mapping, fe, q_face, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); Point n1, n2; for (typename DoFHandler::active_cell_iterator diff --git a/tests/bits/q_points.cc b/tests/bits/q_points.cc index 34dc80dd20..6e012d8370 100644 --- a/tests/bits/q_points.cc +++ b/tests/bits/q_points.cc @@ -80,9 +80,9 @@ void check (Triangulation<3> &tria) QGauss<2> quadrature(3); FE_Q<3> fe(1); FEFaceValues<3> fe_face_values1 (fe, quadrature, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FEFaceValues<3> fe_face_values2 (fe, quadrature, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); DoFHandler<3> dof_handler (tria); dof_handler.distribute_dofs (fe); diff --git a/tests/bits/rt_1.cc b/tests/bits/rt_1.cc index 35411b6560..e4fc58f0c4 100644 --- a/tests/bits/rt_1.cc +++ b/tests/bits/rt_1.cc @@ -50,7 +50,7 @@ void test (const unsigned int degree, update_values | update_gradients | update_second_derivatives | - update_q_points | + update_quadrature_points | update_jacobians); fe_values.reinit (dof_handler.begin_active(), 0); diff --git a/tests/bits/rt_2.cc b/tests/bits/rt_2.cc index 933a4c4437..5064f8c93d 100644 --- a/tests/bits/rt_2.cc +++ b/tests/bits/rt_2.cc @@ -59,14 +59,14 @@ void evaluate_normal (DoFHandler<2> &dof_handler, QGauss<1> quad (6); FEFaceValues<2> fe_v_face (dof_handler.get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_normal_vectors | update_JxW_values)); FEFaceValues<2> fe_v_face_n (dof_handler.get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_normal_vectors | update_JxW_values)); diff --git a/tests/bits/static_condensation.cc b/tests/bits/static_condensation.cc index 074d19c060..5acbaa4f5f 100644 --- a/tests/bits/static_condensation.cc +++ b/tests/bits/static_condensation.cc @@ -338,10 +338,10 @@ void HelmholtzProblem::assemble_system (const bool do_reconstruct) FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FEFaceValues x_fe_face_values (fe, face_quadrature_formula, - update_values | update_q_points | + update_values | update_quadrature_points | update_normal_vectors | update_JxW_values); const RightHandSide right_hand_side; diff --git a/tests/bits/step-12.cc b/tests/bits/step-12.cc index e3b185a1b5..1bad2706e4 100644 --- a/tests/bits/step-12.cc +++ b/tests/bits/step-12.cc @@ -409,11 +409,11 @@ void DGMethod::assemble_system1 () const UpdateFlags update_flags = update_values | update_gradients - | update_q_points + | update_quadrature_points | update_JxW_values; const UpdateFlags face_update_flags = update_values - | update_q_points + | update_quadrature_points | update_JxW_values | update_normal_vectors; @@ -575,11 +575,11 @@ void DGMethod::assemble_system2 () const UpdateFlags update_flags = update_values | update_gradients - | update_q_points + | update_quadrature_points | update_JxW_values; const UpdateFlags face_update_flags = update_values - | update_q_points + | update_quadrature_points | update_JxW_values | update_normal_vectors; diff --git a/tests/bits/step-13.cc b/tests/bits/step-13.cc index 8a8e34eb66..cc24030255 100644 --- a/tests/bits/step-13.cc +++ b/tests/bits/step-13.cc @@ -524,7 +524,7 @@ namespace LaplaceSolver assemble_rhs (Vector &rhs) const { FEValues fe_values (*this->fe, *this->quadrature, - update_values | update_q_points | + update_values | update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = this->fe->dofs_per_cell; diff --git a/tests/bits/step-14.cc b/tests/bits/step-14.cc index d8fd7c46a2..9193f5588e 100644 --- a/tests/bits/step-14.cc +++ b/tests/bits/step-14.cc @@ -190,7 +190,7 @@ namespace Evaluation QTrapez vertex_quadrature; FEValues fe_values (dof_handler.get_fe(), vertex_quadrature, - update_gradients | update_q_points); + update_gradients | update_quadrature_points); std::vector > solution_gradients (vertex_quadrature.size()); @@ -670,7 +670,7 @@ namespace LaplaceSolver assemble_rhs (Vector &rhs) const { FEValues fe_values (*this->fe, *this->quadrature, - update_values | update_q_points | + update_values | update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = this->fe->dofs_per_cell; @@ -1223,7 +1223,7 @@ namespace DualFunctional QGauss quadrature(4); FEValues fe_values (dof_handler.get_fe(), quadrature, update_gradients | - update_q_points | + update_quadrature_points | update_JxW_values); const unsigned int n_q_points = fe_values.n_quadrature_points; const unsigned int dofs_per_cell = dof_handler.get_fe().dofs_per_cell; @@ -1475,7 +1475,7 @@ namespace LaplaceSolver fe_values (fe, quadrature, update_values | update_second_derivatives | - update_q_points | + update_quadrature_points | update_JxW_values), right_hand_side (&right_hand_side) { diff --git a/tests/bits/step-15.cc b/tests/bits/step-15.cc index 58749bee75..fc6dbfba8f 100644 --- a/tests/bits/step-15.cc +++ b/tests/bits/step-15.cc @@ -191,7 +191,7 @@ void MinimizationProblem::assemble_step () QGauss quadrature_formula(4); FEValues fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); @@ -398,7 +398,7 @@ void MinimizationProblem<1>::refine_grid () FEValues fe_values (fe, quadrature, update_values | update_gradients | update_second_derivatives | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FEValues neighbor_fe_values (fe, quadrature, update_gradients); @@ -519,7 +519,7 @@ MinimizationProblem::energy (const DoFHandler &dof_handler, QGauss quadrature_formula(4); FEValues fe_values (dof_handler.get_fe(), quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/step-16.cc b/tests/bits/step-16.cc index 3b138f4bb4..63adbc035e 100644 --- a/tests/bits/step-16.cc +++ b/tests/bits/step-16.cc @@ -138,7 +138,7 @@ void LaplaceProblem::assemble_system () FEValues fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); @@ -195,7 +195,7 @@ void LaplaceProblem::assemble_multigrid () FEValues fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/step-4.cc b/tests/bits/step-4.cc index 8446fbebe5..3e97f7f900 100644 --- a/tests/bits/step-4.cc +++ b/tests/bits/step-4.cc @@ -178,7 +178,7 @@ void LaplaceProblem::assemble_system () FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/step-5.cc b/tests/bits/step-5.cc index 5605ccaffe..a6bd3a5557 100644 --- a/tests/bits/step-5.cc +++ b/tests/bits/step-5.cc @@ -174,7 +174,7 @@ void LaplaceProblem::assemble_system () FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/step-6-racoptimize-2.cc b/tests/bits/step-6-racoptimize-2.cc index e8a71c0ceb..33ff086e16 100644 --- a/tests/bits/step-6-racoptimize-2.cc +++ b/tests/bits/step-6-racoptimize-2.cc @@ -200,7 +200,7 @@ void LaplaceProblem::assemble_system () FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/step-6-racoptimize.cc b/tests/bits/step-6-racoptimize.cc index 4796af99f6..0f36c94b50 100644 --- a/tests/bits/step-6-racoptimize.cc +++ b/tests/bits/step-6-racoptimize.cc @@ -200,7 +200,7 @@ void LaplaceProblem::assemble_system () FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/step-6.cc b/tests/bits/step-6.cc index fcb46a0103..9310693dd0 100644 --- a/tests/bits/step-6.cc +++ b/tests/bits/step-6.cc @@ -199,7 +199,7 @@ void LaplaceProblem::assemble_system () FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/step-7.cc b/tests/bits/step-7.cc index cc3f48f908..6958a6a9c8 100644 --- a/tests/bits/step-7.cc +++ b/tests/bits/step-7.cc @@ -284,10 +284,10 @@ void HelmholtzProblem::assemble_system () FEValues x_fe_values (*fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FEFaceValues x_fe_face_values (*fe, face_quadrature_formula, - update_values | update_q_points | + update_values | update_quadrature_points | update_normal_vectors | update_JxW_values); const RightHandSide right_hand_side; diff --git a/tests/bits/step-8.cc b/tests/bits/step-8.cc index 2851fc34b0..bc09462cd9 100644 --- a/tests/bits/step-8.cc +++ b/tests/bits/step-8.cc @@ -205,7 +205,7 @@ void ElasticProblem::assemble_system () FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe.dofs_per_cell; const unsigned int n_q_points = quadrature_formula.size(); diff --git a/tests/bits/volume_1.cc b/tests/bits/volume_1.cc index 2a60489e2b..c32689562e 100644 --- a/tests/bits/volume_1.cc +++ b/tests/bits/volume_1.cc @@ -45,11 +45,11 @@ void check (const Triangulation &tria) FEFaceValues fe_face_values (fe, q_face, update_normal_vectors | - update_q_points | + update_quadrature_points | update_JxW_values); FESubfaceValues fe_subface_values (fe, q_face, update_normal_vectors | - update_q_points | + update_quadrature_points | update_JxW_values); double v1=0, v2=0; diff --git a/tests/bits/volume_2.cc b/tests/bits/volume_2.cc index c512b8885b..2b95d6d9fc 100644 --- a/tests/bits/volume_2.cc +++ b/tests/bits/volume_2.cc @@ -55,11 +55,11 @@ void check (const Triangulation &tria, FEFaceValues fe_face_values (mapping, fe, q_face, update_normal_vectors | - update_q_points | + update_quadrature_points | update_JxW_values); FESubfaceValues fe_subface_values (mapping, fe, q_face, update_normal_vectors | - update_q_points | + update_quadrature_points | update_JxW_values); double v1=0, v2=0; diff --git a/tests/bits/volume_3.cc b/tests/bits/volume_3.cc index a4158fce7b..cf375a7175 100644 --- a/tests/bits/volume_3.cc +++ b/tests/bits/volume_3.cc @@ -51,11 +51,11 @@ void check (const Triangulation &tria) FEFaceValues fe_face_values (mapping, fe, q_face, update_normal_vectors | - update_q_points | + update_quadrature_points | update_JxW_values); FESubfaceValues fe_subface_values (mapping, fe, q_face, update_normal_vectors | - update_q_points | + update_quadrature_points | update_JxW_values); double v1=0, v2=0; diff --git a/tests/bits/volume_4.cc b/tests/bits/volume_4.cc index 1814b03053..62b592a2e0 100644 --- a/tests/bits/volume_4.cc +++ b/tests/bits/volume_4.cc @@ -51,11 +51,11 @@ void check (const Triangulation &tria) FEFaceValues fe_face_values (mapping, fe, q_face, update_normal_vectors | - update_q_points | + update_quadrature_points | update_JxW_values); FESubfaceValues fe_subface_values (mapping, fe, q_face, update_normal_vectors | - update_q_points | + update_quadrature_points | update_JxW_values); double v1=0, v2=0; diff --git a/tests/dofs/dof_renumbering_02.cc b/tests/dofs/dof_renumbering_02.cc index dd848b6b68..6ad723b75b 100644 --- a/tests/dofs/dof_renumbering_02.cc +++ b/tests/dofs/dof_renumbering_02.cc @@ -48,7 +48,7 @@ print_dofs (const DoFHandler &dof) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); @@ -81,7 +81,7 @@ print_dofs (const DoFHandler &dof, unsigned int level) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::cell_iterator cell=dof.begin(level); diff --git a/tests/dofs/dof_renumbering_03.cc b/tests/dofs/dof_renumbering_03.cc index 65e10d80d2..2a1f668021 100644 --- a/tests/dofs/dof_renumbering_03.cc +++ b/tests/dofs/dof_renumbering_03.cc @@ -48,7 +48,7 @@ print_dofs (const DoFHandler &dof) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_04.cc b/tests/dofs/dof_renumbering_04.cc index 630ea7c7cb..8199bf19c3 100644 --- a/tests/dofs/dof_renumbering_04.cc +++ b/tests/dofs/dof_renumbering_04.cc @@ -48,7 +48,7 @@ print_dofs (const DoFHandler &dof) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_05.cc b/tests/dofs/dof_renumbering_05.cc index 8aeb9373d0..9fd5744245 100644 --- a/tests/dofs/dof_renumbering_05.cc +++ b/tests/dofs/dof_renumbering_05.cc @@ -48,7 +48,7 @@ print_dofs (const DoFHandler &dof) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_06.cc b/tests/dofs/dof_renumbering_06.cc index 8266e8679a..62322508e4 100644 --- a/tests/dofs/dof_renumbering_06.cc +++ b/tests/dofs/dof_renumbering_06.cc @@ -48,7 +48,7 @@ print_dofs (const DoFHandler &dof) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_07.cc b/tests/dofs/dof_renumbering_07.cc index 5393468027..d85d22e7e9 100644 --- a/tests/dofs/dof_renumbering_07.cc +++ b/tests/dofs/dof_renumbering_07.cc @@ -48,7 +48,7 @@ print_dofs (const DoFHandler &dof) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_08.cc b/tests/dofs/dof_renumbering_08.cc index 0def4eb159..94c8b709c5 100644 --- a/tests/dofs/dof_renumbering_08.cc +++ b/tests/dofs/dof_renumbering_08.cc @@ -48,7 +48,7 @@ print_dofs (const DoFHandler &dof) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_zorder_01.cc b/tests/dofs/dof_renumbering_zorder_01.cc index 8e7890f1dd..1ce9325529 100644 --- a/tests/dofs/dof_renumbering_zorder_01.cc +++ b/tests/dofs/dof_renumbering_zorder_01.cc @@ -47,7 +47,7 @@ print_dofs (const DoFHandler &dof, stream &out) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/dofs/dof_renumbering_zorder_02.cc b/tests/dofs/dof_renumbering_zorder_02.cc index 52ec178553..01f075e6c8 100644 --- a/tests/dofs/dof_renumbering_zorder_02.cc +++ b/tests/dofs/dof_renumbering_zorder_02.cc @@ -50,7 +50,7 @@ print_dofs (const DoFHandler &dof, stream &out) if (fe.has_support_points()) { Quadrature quad(fe.get_unit_support_points()); - fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_q_points)); + fevalues = std_cxx11::shared_ptr >(new FEValues(fe, quad, update_quadrature_points)); } for (typename DoFHandler::active_cell_iterator cell=dof.begin_active(); diff --git a/tests/fail/abf_approximation_01.cc b/tests/fail/abf_approximation_01.cc index c72fe81c23..213b0368ad 100644 --- a/tests/fail/abf_approximation_01.cc +++ b/tests/fail/abf_approximation_01.cc @@ -370,7 +370,7 @@ double TestProjection (Mapping<2> &mapping, QGauss<2> quad (6); FEValues<2> fe_values (mapping, dof_handler->get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_JxW_values| update_contravariant_transformation)); diff --git a/tests/fail/circular_01.cc b/tests/fail/circular_01.cc index a8cf5e365e..53e3fa2bea 100644 --- a/tests/fail/circular_01.cc +++ b/tests/fail/circular_01.cc @@ -200,7 +200,7 @@ void LaplaceProblem::assemble_system () hp::FEValues hp_fe_values (fe_collection, quadrature_collection, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const RightHandSide rhs_function; diff --git a/tests/fail/hp-step-14.cc b/tests/fail/hp-step-14.cc index 9ca8b7ca38..00e71c3fc0 100644 --- a/tests/fail/hp-step-14.cc +++ b/tests/fail/hp-step-14.cc @@ -190,7 +190,7 @@ namespace Evaluation QTrapez vertex_quadrature; hp::FEValues fe_values (dof_handler.get_fe(), vertex_quadrature, - update_gradients | update_q_points); + update_gradients | update_quadrature_points); std::vector > solution_gradients (vertex_quadrature.size()); @@ -668,7 +668,7 @@ namespace LaplaceSolver assemble_rhs (Vector &rhs) const { hp::FEValues fe_values (*this->fe, *this->quadrature, - update_values | update_q_points | + update_values | update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = (*this->fe)[0].dofs_per_cell; @@ -1221,7 +1221,7 @@ namespace DualFunctional QGauss quadrature(4); hp::FEValues fe_values (dof_handler.get_fe(), quadrature, update_gradients | - update_q_points | + update_quadrature_points | update_JxW_values); const unsigned int n_q_points = fe_values.get_present_fe_values().n_quadrature_points; const unsigned int dofs_per_cell = dof_handler.get_fe().dofs_per_cell; @@ -1473,7 +1473,7 @@ namespace LaplaceSolver fe_values (fe, quadrature, update_values | update_second_derivatives | - update_q_points | + update_quadrature_points | update_JxW_values), right_hand_side (&right_hand_side) { diff --git a/tests/fail/hp-step-15.cc b/tests/fail/hp-step-15.cc index 90fc4d27da..c6ce14c34d 100644 --- a/tests/fail/hp-step-15.cc +++ b/tests/fail/hp-step-15.cc @@ -192,7 +192,7 @@ void MinimizationProblem::assemble_step () hp::QCollection quadrature_formula(QGauss(4)); hp::FEValues fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; const unsigned int n_q_points = quadrature_formula[0].size(); @@ -400,7 +400,7 @@ void MinimizationProblem<1>::refine_grid () hp::FEValues fe_values (fe, quadrature, update_values | update_gradients | update_second_derivatives | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); hp::FEValues neighbor_fe_values (fe, quadrature, update_gradients); @@ -521,7 +521,7 @@ MinimizationProblem::energy (const hp::DoFHandler &dof_handler, hp::QCollection quadrature_formula(QGauss(4)); hp::FEValues fe_values (dof_handler.get_fe(), quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int n_q_points = quadrature_formula[0].size(); diff --git a/tests/fail/rt_distorted_01.cc b/tests/fail/rt_distorted_01.cc index 77f9f8086b..05787554a8 100644 --- a/tests/fail/rt_distorted_01.cc +++ b/tests/fail/rt_distorted_01.cc @@ -274,7 +274,7 @@ double EvaluateArea (Mapping<2> &mapping, QGauss<2> quad (6); FEValues<2> fe_values (mapping, dof_handler->get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_JxW_values)); const unsigned int n_q_points = quad.size(); diff --git a/tests/fail/rt_distorted_02.cc b/tests/fail/rt_distorted_02.cc index 4f081c2edf..45f245ce40 100644 --- a/tests/fail/rt_distorted_02.cc +++ b/tests/fail/rt_distorted_02.cc @@ -286,7 +286,7 @@ double EvaluateDiver (Mapping<2> &mapping, QGauss<2> quad (6); FEValues<2> fe_values (mapping, dof_handler.get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_JxW_values| update_contravariant_transformation)); diff --git a/tests/fe/abf_01.cc b/tests/fe/abf_01.cc index 1b3f6911d5..7826db2b54 100644 --- a/tests/fe/abf_01.cc +++ b/tests/fe/abf_01.cc @@ -72,7 +72,7 @@ void EvaluateDerivative (DoFHandler<2> *dof_handler, QGauss<2> quad (3); FEValues<2> fe_values (dof_handler->get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_JxW_values)); @@ -145,9 +145,9 @@ void create_mass_matrix (const Mapping &mapping, Vector &rhs_vector, const Function *const coefficient = 0) { - UpdateFlags update_flags = UpdateFlags(update_values | update_JxW_values | update_q_points); + UpdateFlags update_flags = UpdateFlags(update_values | update_JxW_values | update_quadrature_points); if (coefficient != 0) - update_flags = UpdateFlags (update_flags | update_q_points); + update_flags = UpdateFlags (update_flags | update_quadrature_points); FEValues fe_values (mapping, dof.get_fe(), q, update_flags); @@ -344,7 +344,7 @@ void create_right_hand_side (const Mapping &mapping, rhs_vector = 0; UpdateFlags update_flags = UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_JxW_values); FEValues fe_values (mapping, fe, quadrature, update_flags); diff --git a/tests/fe/bdm_2.cc b/tests/fe/bdm_2.cc index b86c0977c3..62607e04f9 100644 --- a/tests/fe/bdm_2.cc +++ b/tests/fe/bdm_2.cc @@ -118,7 +118,7 @@ plot_shape_functions(const unsigned int degree) QTrapez<1> q_trapez; const unsigned int div=2; QIterated q(q_trapez, div); - FEValues fe(element, q, update_values|update_gradients|update_q_points); + FEValues fe(element, q, update_values|update_gradients|update_quadrature_points); fe.reinit(c); for (unsigned int q_point=0; q_point< q.size(); ++q_point) diff --git a/tests/fe/deformed_projection.h b/tests/fe/deformed_projection.h index d3e05c816d..1d605a7bd7 100644 --- a/tests/fe/deformed_projection.h +++ b/tests/fe/deformed_projection.h @@ -117,7 +117,7 @@ void EvaluateDerivative (DoFHandler<2> *dof_handler, QGauss<2> quad (3); FEValues<2> fe_values (dof_handler->get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_JxW_values)); @@ -195,9 +195,9 @@ void create_mass_matrix (const Mapping &mapping, Vector &rhs_vector, const Function *const coefficient = 0) { - UpdateFlags update_flags = UpdateFlags(update_values | update_JxW_values | update_q_points); + UpdateFlags update_flags = UpdateFlags(update_values | update_JxW_values | update_quadrature_points); if (coefficient != 0) - update_flags = UpdateFlags (update_flags | update_q_points); + update_flags = UpdateFlags (update_flags | update_quadrature_points); FEValues fe_values (mapping, dof.get_fe(), q, update_flags); @@ -393,7 +393,7 @@ void create_right_hand_side (const Mapping &mapping, rhs_vector = 0; UpdateFlags update_flags = UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_JxW_values); FEValues fe_values (mapping, fe, quadrature, update_flags); diff --git a/tests/fe/fe_face_values_1d.cc b/tests/fe/fe_face_values_1d.cc index 108b65789d..89601bedd0 100644 --- a/tests/fe/fe_face_values_1d.cc +++ b/tests/fe/fe_face_values_1d.cc @@ -55,7 +55,7 @@ plot_faces(Mapping &mapping, Assert (q.size() == 1, ExcInternalError()); FEFaceValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_JxW_values | update_values | update_gradients @@ -101,7 +101,7 @@ plot_subfaces(Mapping &mapping, Assert (q.size() == 1, ExcInternalError()); FESubfaceValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_JxW_values | update_values | update_gradients diff --git a/tests/fe/fe_values_view_25.cc b/tests/fe/fe_values_view_25.cc index 4472fb1abb..5ecf1d814b 100644 --- a/tests/fe/fe_values_view_25.cc +++ b/tests/fe/fe_values_view_25.cc @@ -51,7 +51,7 @@ void test (const Triangulation &tr, const QGauss quadrature(2); FEValues fe_values (fe, quadrature, - update_values | update_gradients | update_q_points); + update_values | update_gradients | update_quadrature_points); fe_values.reinit (dof.begin_active()); // let the FEValues object compute the diff --git a/tests/fe/fe_values_view_25_nonsymmetric.cc b/tests/fe/fe_values_view_25_nonsymmetric.cc index a81a6d6f88..1405bb3492 100644 --- a/tests/fe/fe_values_view_25_nonsymmetric.cc +++ b/tests/fe/fe_values_view_25_nonsymmetric.cc @@ -51,7 +51,7 @@ void test (const Triangulation &tr, const QGauss quadrature(2); FEValues fe_values (fe, quadrature, - update_values | update_gradients | update_q_points); + update_values | update_gradients | update_quadrature_points); fe_values.reinit (dof.begin_active()); // let the FEValues object compute the diff --git a/tests/fe/fe_values_view_26.cc b/tests/fe/fe_values_view_26.cc index cf9087ddd8..22369b8dd0 100644 --- a/tests/fe/fe_values_view_26.cc +++ b/tests/fe/fe_values_view_26.cc @@ -66,7 +66,7 @@ void test (const Triangulation &tr, const QGauss quadrature(2); FEValues fe_values (fe, quadrature, - update_values | update_gradients | update_q_points); + update_values | update_gradients | update_quadrature_points); fe_values.reinit (dof.begin_active()); // let the FEValues object compute the diff --git a/tests/fe/fe_values_view_27.cc b/tests/fe/fe_values_view_27.cc index 66eab34c4c..11c43622f8 100644 --- a/tests/fe/fe_values_view_27.cc +++ b/tests/fe/fe_values_view_27.cc @@ -66,7 +66,7 @@ void test (const Triangulation &tr, const QGauss quadrature(2); FEValues fe_values (fe, quadrature, - update_values | update_gradients | update_q_points); + update_values | update_gradients | update_quadrature_points); fe_values.reinit (dof.begin_active()); // let the FEValues object compute the diff --git a/tests/fe/fe_values_view_28.cc b/tests/fe/fe_values_view_28.cc index a85add05be..bdb78d9eee 100644 --- a/tests/fe/fe_values_view_28.cc +++ b/tests/fe/fe_values_view_28.cc @@ -84,7 +84,7 @@ void test (const Triangulation &tr, const QGauss quadrature(2); FEValues fe_values (fe, quadrature, - update_values | update_gradients | update_q_points); + update_values | update_gradients | update_quadrature_points); fe_values.reinit (dof.begin_active()); // let the FEValues object compute the diff --git a/tests/fe/fe_values_view_29.cc b/tests/fe/fe_values_view_29.cc index 7f503332c7..7f0d66498f 100644 --- a/tests/fe/fe_values_view_29.cc +++ b/tests/fe/fe_values_view_29.cc @@ -85,7 +85,7 @@ void test (const Triangulation &tr, const QGauss quadrature(2); FEValues fe_values (fe, quadrature, - update_values | update_gradients | update_q_points); + update_values | update_gradients | update_quadrature_points); fe_values.reinit (dof.begin_active()); // let the FEValues object compute the diff --git a/tests/fe/nedelec.cc b/tests/fe/nedelec.cc index 7392e799e0..ebab9fbccc 100644 --- a/tests/fe/nedelec.cc +++ b/tests/fe/nedelec.cc @@ -124,7 +124,7 @@ plot_shape_functions(const unsigned int degree) QTrapez<1> q_trapez; const unsigned int div=2; QIterated q(q_trapez, div); - FEValues fe(element, q, update_values|update_gradients|update_q_points); + FEValues fe(element, q, update_values|update_gradients|update_quadrature_points); fe.reinit(c); for (unsigned int q_point=0; q_point< q.size(); ++q_point) diff --git a/tests/fe/nedelec_2.cc b/tests/fe/nedelec_2.cc index 183a35702b..14370979a5 100644 --- a/tests/fe/nedelec_2.cc +++ b/tests/fe/nedelec_2.cc @@ -107,11 +107,11 @@ plot (const Triangulation &tr, const unsigned int p) MappingCartesian mapping; FEFaceValues feface(mapping, fe_ned, quadrature, - update_values|update_q_points|update_normal_vectors); + update_values|update_quadrature_points|update_normal_vectors); FEFaceValues feneighbor(mapping, fe_ned, quadrature, - update_values|update_q_points|update_normal_vectors); + update_values|update_quadrature_points|update_normal_vectors); FESubfaceValues fesubface(mapping, fe_ned, quadrature, - update_values|update_q_points|update_normal_vectors); + update_values|update_quadrature_points|update_normal_vectors); for (typename DoFHandler::active_cell_iterator diff --git a/tests/fe/nedelec_3.cc b/tests/fe/nedelec_3.cc index f16fef3ac4..92aaf2c377 100644 --- a/tests/fe/nedelec_3.cc +++ b/tests/fe/nedelec_3.cc @@ -82,7 +82,7 @@ check (const unsigned int p) std::vector > shape_values (quadrature.size(), Vector(dim)); FEValues fe(fe_ned, quadrature, - update_values|update_q_points); + update_values|update_quadrature_points); for (typename DoFHandler::active_cell_iterator c = dof.begin_active(); diff --git a/tests/fe/rt_2.cc b/tests/fe/rt_2.cc index 38a0424696..75ad4977e5 100644 --- a/tests/fe/rt_2.cc +++ b/tests/fe/rt_2.cc @@ -118,7 +118,7 @@ plot_shape_functions(const unsigned int degree) QTrapez<1> q_trapez; const unsigned int div=2; QIterated q(q_trapez, div); - FEValues fe(element, q, update_values|update_gradients|update_q_points); + FEValues fe(element, q, update_values|update_gradients|update_quadrature_points); fe.reinit(c); for (unsigned int q_point=0; q_point< q.size(); ++q_point) diff --git a/tests/fe/rt_7.cc b/tests/fe/rt_7.cc index 0590645979..eeee8a4bfe 100644 --- a/tests/fe/rt_7.cc +++ b/tests/fe/rt_7.cc @@ -51,7 +51,7 @@ plot_shape_functions(const unsigned int degree) QTrapez<1> q_trapez; const unsigned int div=10; QIterated q(q_trapez, div); - FEValues fe(fe_rt, q, update_values|update_gradients|update_q_points); + FEValues fe(fe_rt, q, update_values|update_gradients|update_quadrature_points); fe.reinit(c); Assert (fe.get_fe().n_components() == dim, ExcInternalError()); diff --git a/tests/fe/rt_approximation_01.cc b/tests/fe/rt_approximation_01.cc index fc1607172c..9375e9c83b 100644 --- a/tests/fe/rt_approximation_01.cc +++ b/tests/fe/rt_approximation_01.cc @@ -370,7 +370,7 @@ double TestProjection (Mapping<2> &mapping, QGauss<2> quad (6); FEValues<2> fe_values (mapping, dof_handler->get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_JxW_values| update_contravariant_transformation)); diff --git a/tests/fe/rt_normal_02.cc b/tests/fe/rt_normal_02.cc index 13d1878967..69408c52df 100644 --- a/tests/fe/rt_normal_02.cc +++ b/tests/fe/rt_normal_02.cc @@ -68,20 +68,20 @@ void EvaluateNormal2 (DoFHandler<2> *dof_handler, FEFaceValues<2> fe_v_face (dof_handler->get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_normal_vectors | update_JxW_values)); FEValues<2> fe_v (dof_handler->get_fe (), qproject, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_JxW_values)); FEValues<2> fe_v_n (dof_handler->get_fe (), qproject, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_JxW_values)); @@ -184,14 +184,14 @@ void EvaluateNormal (DoFHandler<2> *dof_handler, QGauss<1> quad (6); FEFaceValues<2> fe_v_face (dof_handler->get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_normal_vectors | update_JxW_values)); FEFaceValues<2> fe_v_face_n (dof_handler->get_fe (), quad, UpdateFlags(update_values | - update_q_points | + update_quadrature_points | update_gradients | update_normal_vectors | update_JxW_values)); diff --git a/tests/fe/rtn_2.cc b/tests/fe/rtn_2.cc index 1dbc26b134..d381c93e04 100644 --- a/tests/fe/rtn_2.cc +++ b/tests/fe/rtn_2.cc @@ -52,7 +52,7 @@ plot_shape_functions(const unsigned int degree) QTrapez<1> q_trapez; const unsigned int div=10; QIterated q(q_trapez, div); - FEValues fe(fe_rt, q, update_values|update_gradients|update_q_points); + FEValues fe(fe_rt, q, update_values|update_gradients|update_quadrature_points); fe.reinit(c); for (unsigned int q_point=0; q_point q_trapez; QIterated q(q_trapez, div); - FEFaceValues fe(mapping, finel, q, UpdateFlags(uflags | update_q_points)); - FESubfaceValues sub(mapping, finel, q, UpdateFlags(uflags | update_q_points)); + FEFaceValues fe(mapping, finel, q, UpdateFlags(uflags | update_quadrature_points)); + FESubfaceValues sub(mapping, finel, q, UpdateFlags(uflags | update_quadrature_points)); sprintf(fname, "Face%dd-%s", dim, name); deallog.push(fname); diff --git a/tests/grid/mesh_3d_14.cc b/tests/grid/mesh_3d_14.cc index a66e17e9a2..14786acfed 100644 --- a/tests/grid/mesh_3d_14.cc +++ b/tests/grid/mesh_3d_14.cc @@ -43,10 +43,10 @@ void check_this (Triangulation<3> &tria) QTrapez<2> quadrature; FE_Q<3> fe(1); FEFaceValues<3> fe_face_values1 (fe, quadrature, - update_q_points | update_JxW_values | + update_quadrature_points | update_JxW_values | update_normal_vectors); FESubfaceValues<3> fe_face_values2 (fe, quadrature, - update_q_points | update_JxW_values | + update_quadrature_points | update_JxW_values | update_normal_vectors); DoFHandler<3> dof_handler (tria); diff --git a/tests/grid/mesh_3d_20.cc b/tests/grid/mesh_3d_20.cc index 3135eb0552..f53275f6bc 100644 --- a/tests/grid/mesh_3d_20.cc +++ b/tests/grid/mesh_3d_20.cc @@ -42,9 +42,9 @@ void check_this (Triangulation<3> &tria) QTrapez<2> quadrature; FE_Q<3> fe(1); FEFaceValues<3> fe_face_values1 (fe, quadrature, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FEFaceValues<3> fe_face_values2 (fe, quadrature, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); DoFHandler<3> dof_handler (tria); dof_handler.distribute_dofs (fe); diff --git a/tests/grid/mesh_3d_7.cc b/tests/grid/mesh_3d_7.cc index 71adf4b88d..d4aaf6fcb6 100644 --- a/tests/grid/mesh_3d_7.cc +++ b/tests/grid/mesh_3d_7.cc @@ -40,9 +40,9 @@ void check_this (Triangulation<3> &tria) QTrapez<2> quadrature; FE_Q<3> fe(1); FEFaceValues<3> fe_face_values1 (fe, quadrature, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); FEFaceValues<3> fe_face_values2 (fe, quadrature, - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); DoFHandler<3> dof_handler (tria); dof_handler.distribute_dofs (fe); diff --git a/tests/hp/crash_17.cc b/tests/hp/crash_17.cc index 797fb3577d..1f2a999146 100644 --- a/tests/hp/crash_17.cc +++ b/tests/hp/crash_17.cc @@ -200,7 +200,7 @@ void LaplaceProblem::assemble_system () hp::FEValues hp_fe_values (fe_collection, quadrature_collection, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const RightHandSide rhs_function; diff --git a/tests/hp/crash_18.cc b/tests/hp/crash_18.cc index 71e75f9ec5..bc0c993078 100644 --- a/tests/hp/crash_18.cc +++ b/tests/hp/crash_18.cc @@ -205,7 +205,7 @@ void LaplaceProblem::assemble_system () hp::FEValues hp_fe_values (fe_collection, quadrature_collection, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const RightHandSide rhs_function; diff --git a/tests/hp/step-12.cc b/tests/hp/step-12.cc index 09ae107b4c..692c76d4f6 100644 --- a/tests/hp/step-12.cc +++ b/tests/hp/step-12.cc @@ -413,11 +413,11 @@ void DGMethod::assemble_system1 () const UpdateFlags update_flags = update_values | update_gradients - | update_q_points + | update_quadrature_points | update_JxW_values; const UpdateFlags face_update_flags = update_values - | update_q_points + | update_quadrature_points | update_JxW_values | update_normal_vectors; @@ -579,11 +579,11 @@ void DGMethod::assemble_system2 () const UpdateFlags update_flags = update_values | update_gradients - | update_q_points + | update_quadrature_points | update_JxW_values; const UpdateFlags face_update_flags = update_values - | update_q_points + | update_quadrature_points | update_JxW_values | update_normal_vectors; diff --git a/tests/hp/step-13.cc b/tests/hp/step-13.cc index 2ebad32e92..79c6e72a43 100644 --- a/tests/hp/step-13.cc +++ b/tests/hp/step-13.cc @@ -524,7 +524,7 @@ namespace LaplaceSolver assemble_rhs (Vector &rhs) const { hp::FEValues fe_values (*this->fe, *this->quadrature, - update_values | update_q_points | + update_values | update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = (*this->fe)[0].dofs_per_cell; diff --git a/tests/hp/step-4.cc b/tests/hp/step-4.cc index 3efc197f07..5fc0b5f8f3 100644 --- a/tests/hp/step-4.cc +++ b/tests/hp/step-4.cc @@ -177,7 +177,7 @@ void LaplaceProblem::assemble_system () hp::FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; const unsigned int n_q_points = quadrature_formula[0].size(); diff --git a/tests/hp/step-5.cc b/tests/hp/step-5.cc index 8fc4229692..3e6da0c400 100644 --- a/tests/hp/step-5.cc +++ b/tests/hp/step-5.cc @@ -173,7 +173,7 @@ void LaplaceProblem::assemble_system () hp::FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; const unsigned int n_q_points = quadrature_formula[0].size(); diff --git a/tests/hp/step-6.cc b/tests/hp/step-6.cc index 809bbc2170..61709ea87f 100644 --- a/tests/hp/step-6.cc +++ b/tests/hp/step-6.cc @@ -198,7 +198,7 @@ void LaplaceProblem::assemble_system () hp::FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; const unsigned int n_q_points = quadrature_formula[0].size(); diff --git a/tests/hp/step-7.cc b/tests/hp/step-7.cc index 1c5f935a74..245eecc1f2 100644 --- a/tests/hp/step-7.cc +++ b/tests/hp/step-7.cc @@ -283,10 +283,10 @@ void HelmholtzProblem::assemble_system () hp::FEValues x_fe_values (*fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); hp::FEFaceValues x_fe_face_values (*fe, face_quadrature_formula, - update_values | update_q_points | + update_values | update_quadrature_points | update_normal_vectors | update_JxW_values); const RightHandSide right_hand_side; diff --git a/tests/hp/step-8.cc b/tests/hp/step-8.cc index 913c707524..6465e0b6b3 100644 --- a/tests/hp/step-8.cc +++ b/tests/hp/step-8.cc @@ -204,7 +204,7 @@ void ElasticProblem::assemble_system () hp::FEValues x_fe_values (fe, quadrature_formula, update_values | update_gradients | - update_q_points | update_JxW_values); + update_quadrature_points | update_JxW_values); const unsigned int dofs_per_cell = fe[0].dofs_per_cell; const unsigned int n_q_points = quadrature_formula[0].size(); diff --git a/tests/lac/filtered_matrix_06.cc b/tests/lac/filtered_matrix_06.cc index 0de68e1626..fdd4fe4774 100644 --- a/tests/lac/filtered_matrix_06.cc +++ b/tests/lac/filtered_matrix_06.cc @@ -117,7 +117,7 @@ check () FEValues fe (mapping, element, quadrature, update_values | update_gradients - | update_q_points | update_JxW_values); + | update_quadrature_points | update_JxW_values); std::vector global_dofs (element.dofs_per_cell); std::vector function (quadrature.size()); diff --git a/tests/mappings/fe_face_values_1d_mapping_cartesian.cc b/tests/mappings/fe_face_values_1d_mapping_cartesian.cc index c2c7827380..a5d048bc67 100644 --- a/tests/mappings/fe_face_values_1d_mapping_cartesian.cc +++ b/tests/mappings/fe_face_values_1d_mapping_cartesian.cc @@ -54,7 +54,7 @@ plot_faces(Mapping &mapping, Assert (q.size() == 1, ExcInternalError()); FEFaceValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_JxW_values | update_values | update_gradients @@ -100,7 +100,7 @@ plot_subfaces(Mapping &mapping, Assert (q.size() == 1, ExcInternalError()); FESubfaceValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_JxW_values | update_values | update_gradients diff --git a/tests/mappings/fe_face_values_1d_mapping_q2.cc b/tests/mappings/fe_face_values_1d_mapping_q2.cc index 0878065bac..31b02c6df0 100644 --- a/tests/mappings/fe_face_values_1d_mapping_q2.cc +++ b/tests/mappings/fe_face_values_1d_mapping_q2.cc @@ -54,7 +54,7 @@ plot_faces(Mapping &mapping, Assert (q.size() == 1, ExcInternalError()); FEFaceValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_JxW_values | update_values | update_gradients @@ -100,7 +100,7 @@ plot_subfaces(Mapping &mapping, Assert (q.size() == 1, ExcInternalError()); FESubfaceValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_JxW_values | update_values | update_gradients diff --git a/tests/mappings/mapping.cc b/tests/mappings/mapping.cc index ffde9d918f..82e9781ba3 100644 --- a/tests/mappings/mapping.cc +++ b/tests/mappings/mapping.cc @@ -53,7 +53,7 @@ plot_transformation(Mapping &mapping, QTrapez<1> q_trapez; QIterated q(q_trapez, div); FEValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_JxW_values)); fe_values.reinit(cell); @@ -94,7 +94,7 @@ plot_faces(Mapping &mapping, const unsigned int nq = (unsigned int) (.01 + std::pow(q.size(), 1./(dim-1))); FEFaceValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_JxW_values | update_normal_vectors)); @@ -138,7 +138,7 @@ plot_subfaces(Mapping &mapping, const unsigned int nq = (unsigned int) (.01 + std::pow(q.size(), 1./(dim-1))); FESubfaceValues fe_values(mapping, fe, q, - UpdateFlags(update_q_points + UpdateFlags(update_quadrature_points | update_normal_vectors)); for (unsigned int face_nr=0; face_nr < GeometryInfo::faces_per_cell; diff --git a/tests/mappings/mapping_c1.cc b/tests/mappings/mapping_c1.cc index 74c5efd2a9..9f5984a8ad 100644 --- a/tests/mappings/mapping_c1.cc +++ b/tests/mappings/mapping_c1.cc @@ -75,14 +75,14 @@ int main () const QTrapez<1> quadrature; const MappingC1<2> c1_mapping; FEFaceValues<2> c1_values (c1_mapping, fe, quadrature, - update_q_points | update_normal_vectors); + update_quadrature_points | update_normal_vectors); // to compare with, also print the // normal vectors as generated by a // cubic mapping const MappingQ<2> q3_mapping(3); FEFaceValues<2> q3_values (q3_mapping, fe, quadrature, - update_q_points | update_normal_vectors); + update_quadrature_points | update_normal_vectors); for (DoFHandler<2>::active_cell_iterator cell=dof_handler.begin_active(); cell!=dof_handler.end(); ++cell) diff --git a/tests/numerics/derivative_approximation_2.cc b/tests/numerics/derivative_approximation_2.cc index fff9f441af..3eafac1637 100644 --- a/tests/numerics/derivative_approximation_2.cc +++ b/tests/numerics/derivative_approximation_2.cc @@ -153,7 +153,7 @@ void derivatives() Vector solution; MappingQGeneric mapping(1); QMidpoint q_midpoint; - FEValues fe_values(mapping, fe, q_midpoint, update_q_points); + FEValues fe_values(mapping, fe, q_midpoint, update_quadrature_points); dof_handler.distribute_dofs (fe); solution.reinit(dof_handler.n_dofs()); diff --git a/tests/numerics/derivatives.cc b/tests/numerics/derivatives.cc index 8ad9ab8799..94ab3da865 100644 --- a/tests/numerics/derivatives.cc +++ b/tests/numerics/derivatives.cc @@ -65,7 +65,7 @@ check (const unsigned int level, FEValues fe (mapping, element, quadrature, update_values - | update_q_points | update_JxW_values); + | update_quadrature_points | update_JxW_values); std::vector global_dofs (element.dofs_per_cell); std::vector function (quadrature.size()); @@ -119,7 +119,7 @@ check (const unsigned int level, FEValues fe2 (mapping, element, quadrature, update_values | update_gradients | update_second_derivatives - | update_q_points | update_JxW_values); + | update_quadrature_points | update_JxW_values); double l2 = 0.; double h1 = 0.; diff --git a/tests/numerics/normal_flux_inhom_01.cc b/tests/numerics/normal_flux_inhom_01.cc index 0f15904ea5..26dc4d0171 100644 --- a/tests/numerics/normal_flux_inhom_01.cc +++ b/tests/numerics/normal_flux_inhom_01.cc @@ -69,7 +69,7 @@ void test (const Triangulation &tr, const std::vector > & unit_support_points = fe.get_unit_face_support_points(); Quadrature quadrature(unit_support_points); - FEFaceValues fe_face_values(fe, quadrature, update_q_points); + FEFaceValues fe_face_values(fe, quadrature, update_quadrature_points); typename DoFHandler::active_cell_iterator cell = dof.begin_active(), endc = dof.end(); diff --git a/tests/numerics/tangential_flux_inhom_01.cc b/tests/numerics/tangential_flux_inhom_01.cc index 251cb03570..dcaff1c463 100644 --- a/tests/numerics/tangential_flux_inhom_01.cc +++ b/tests/numerics/tangential_flux_inhom_01.cc @@ -70,7 +70,7 @@ void test (const Triangulation &tr, const std::vector > & unit_support_points = fe.get_unit_face_support_points(); Quadrature quadrature(unit_support_points); - FEFaceValues fe_face_values(fe, quadrature, update_q_points); + FEFaceValues fe_face_values(fe, quadrature, update_quadrature_points); typename DoFHandler::active_cell_iterator cell = dof.begin_active(), endc = dof.end(); -- 2.39.5