]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Change update_q_points to update_quadrature_points
authorJonathan Robey <class4kayaker@gmail.com>
Wed, 31 Aug 2016 21:02:36 +0000 (14:02 -0700)
committerJonathan Robey <class4kayaker@gmail.com>
Thu, 1 Sep 2016 00:57:03 +0000 (17:57 -0700)
87 files changed:
include/deal.II/numerics/vector_tools.templates.h
source/fe/mapping_q_eulerian.cc
tests/aniso/mesh_3d_21.cc
tests/base/work_stream_03.cc
tests/base/work_stream_03_graph.cc
tests/bits/block_sparse_matrix_1.cc
tests/bits/joa_1.cc
tests/bits/make_boundary_constraints_03.cc
tests/bits/q_point_sum_1.cc
tests/bits/q_point_sum_2.cc
tests/bits/q_point_sum_3.cc
tests/bits/q_point_sum_4.cc
tests/bits/q_points.cc
tests/bits/rt_1.cc
tests/bits/rt_2.cc
tests/bits/static_condensation.cc
tests/bits/step-12.cc
tests/bits/step-13.cc
tests/bits/step-14.cc
tests/bits/step-15.cc
tests/bits/step-16.cc
tests/bits/step-4.cc
tests/bits/step-5.cc
tests/bits/step-6-racoptimize-2.cc
tests/bits/step-6-racoptimize.cc
tests/bits/step-6.cc
tests/bits/step-7.cc
tests/bits/step-8.cc
tests/bits/volume_1.cc
tests/bits/volume_2.cc
tests/bits/volume_3.cc
tests/bits/volume_4.cc
tests/dofs/dof_renumbering_02.cc
tests/dofs/dof_renumbering_03.cc
tests/dofs/dof_renumbering_04.cc
tests/dofs/dof_renumbering_05.cc
tests/dofs/dof_renumbering_06.cc
tests/dofs/dof_renumbering_07.cc
tests/dofs/dof_renumbering_08.cc
tests/dofs/dof_renumbering_zorder_01.cc
tests/dofs/dof_renumbering_zorder_02.cc
tests/fail/abf_approximation_01.cc
tests/fail/circular_01.cc
tests/fail/hp-step-14.cc
tests/fail/hp-step-15.cc
tests/fail/rt_distorted_01.cc
tests/fail/rt_distorted_02.cc
tests/fe/abf_01.cc
tests/fe/bdm_2.cc
tests/fe/deformed_projection.h
tests/fe/fe_face_values_1d.cc
tests/fe/fe_values_view_25.cc
tests/fe/fe_values_view_25_nonsymmetric.cc
tests/fe/fe_values_view_26.cc
tests/fe/fe_values_view_27.cc
tests/fe/fe_values_view_28.cc
tests/fe/fe_values_view_29.cc
tests/fe/nedelec.cc
tests/fe/nedelec_2.cc
tests/fe/nedelec_3.cc
tests/fe/rt_2.cc
tests/fe/rt_7.cc
tests/fe/rt_approximation_01.cc
tests/fe/rt_normal_02.cc
tests/fe/rtn_2.cc
tests/fe/shapes.h
tests/grid/mesh_3d_14.cc
tests/grid/mesh_3d_20.cc
tests/grid/mesh_3d_7.cc
tests/hp/crash_17.cc
tests/hp/crash_18.cc
tests/hp/step-12.cc
tests/hp/step-13.cc
tests/hp/step-4.cc
tests/hp/step-5.cc
tests/hp/step-6.cc
tests/hp/step-7.cc
tests/hp/step-8.cc
tests/lac/filtered_matrix_06.cc
tests/mappings/fe_face_values_1d_mapping_cartesian.cc
tests/mappings/fe_face_values_1d_mapping_q2.cc
tests/mappings/mapping.cc
tests/mappings/mapping_c1.cc
tests/numerics/derivative_approximation_2.cc
tests/numerics/derivatives.cc
tests/numerics/normal_flux_inhom_01.cc
tests/numerics/tangential_flux_inhom_01.cc

index 34948dbd61d920c413963fbc34a25c4723d21572..e95fe14037626a8ce0c64cd83f4690e559593d57 100644 (file)
@@ -5334,7 +5334,7 @@ namespace VectorTools
     hp::FEFaceValues<dim,spacedim> 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<dim,spacedim> 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
index 4683798e06245cb30a2539949b7234acdbb4ad80..0e7ffc820e1bd622002f9deaec4d964c98f943dc 100644 (file)
@@ -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 <int dim, class VectorType, int spacedim>
index 448fbf8623135feed95ab4e24b925ef90b5210ac..4e74bcb7d5d8aa67dc0898e3920210ec4fc6d3e9 100644 (file)
@@ -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)
index 73a0e9499db7d06850836e7e25a47ba02fb1cf35..90312fe3f7fc749d28eae25ccc910008b92ba890 100644 (file)
@@ -56,7 +56,7 @@ namespace
   {
     Scratch(const FiniteElement<dim> &fe, const Quadrature<dim> &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)
     {
     }
index 281c1bb6209a44b2d2b4db001425ee4195a24492..cddb701ca6e6f2700315224bd977fc24e0efd3c7 100644 (file)
@@ -53,7 +53,7 @@ namespace
   {
     Scratch(const FiniteElement<dim> &fe, const Quadrature<dim> &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)
     {
     }
index c0ecef61565447a01e18f1c7bdf4bfb53ddaa827..808dbc6f74b89fd9f80ba221da260644769247e2 100644 (file)
@@ -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));
index 40a71e1c02aa4b6e3a3a640750868be1454bac94..9ba06b8739b1fa504814312e7feb3e58fe5f1f0f 100644 (file)
@@ -555,7 +555,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   FEValues<dim> 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();
index f9b51792e32523e4348d6daf0936f06b2968cfaf..3afe78aa684411e6d95ff0fe6c7d7aab5a00a594 100644 (file)
@@ -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<types::global_dof_index> local_dof_indices (dofs_per_cell);
index 445df4e72711d7d8f06f08fc8ee81a9902213a1c..a8d1d1e07e1e332689c8c801f3e9fc363d0c94d9 100644 (file)
@@ -43,9 +43,9 @@ void check (const Triangulation<dim> &tria)
   QGauss<dim-1> q_face(3);
 
   FEFaceValues<dim>    fe_face_values (fe, q_face,
-                                       update_q_points | update_JxW_values);
+                                       update_quadrature_points | update_JxW_values);
   FESubfaceValues<dim> fe_subface_values (fe, q_face,
-                                          update_q_points | update_JxW_values);
+                                          update_quadrature_points | update_JxW_values);
 
   Point<dim> n1, n2;
   for (typename DoFHandler<dim>::active_cell_iterator
index d046b343694faf6cf1e9dbd2aaee4b1a213ade8a..02425b862ffb46adcdef31c41ff268bf8c3c6514 100644 (file)
@@ -51,9 +51,9 @@ void check (const Triangulation<dim> &tria,
   QGauss<dim-1> q_face(3);
 
   FEFaceValues<dim>    fe_face_values (mapping, fe, q_face,
-                                       update_q_points | update_JxW_values);
+                                       update_quadrature_points | update_JxW_values);
   FESubfaceValues<dim> fe_subface_values (mapping, fe, q_face,
-                                          update_q_points | update_JxW_values);
+                                          update_quadrature_points | update_JxW_values);
 
   Point<dim> n1, n2;
   for (typename DoFHandler<dim>::active_cell_iterator
index c528cb3dc1a827e3297632faf9827d4de7cccb50..702dbb1e7b3c496ea4a28d1ce6266e7b3a9c2d9e 100644 (file)
@@ -50,9 +50,9 @@ void check (const Triangulation<dim> &tria)
   QGauss<dim-1> q_face(3);
 
   FEFaceValues<dim>    fe_face_values (mapping, fe, q_face,
-                                       update_q_points | update_JxW_values);
+                                       update_quadrature_points | update_JxW_values);
   FESubfaceValues<dim> fe_subface_values (mapping, fe, q_face,
-                                          update_q_points | update_JxW_values);
+                                          update_quadrature_points | update_JxW_values);
 
   Point<dim> n1, n2;
   for (typename DoFHandler<dim>::active_cell_iterator
index f66e30095cf5f683dd12e9474b811436389b6374..8410eeeb94b3a860cbe39c348e34cae694683d65 100644 (file)
@@ -50,9 +50,9 @@ void check (const Triangulation<dim> &tria)
   QGauss<dim-1> q_face(3);
 
   FEFaceValues<dim>    fe_face_values (mapping, fe, q_face,
-                                       update_q_points | update_JxW_values);
+                                       update_quadrature_points | update_JxW_values);
   FESubfaceValues<dim> fe_subface_values (mapping, fe, q_face,
-                                          update_q_points | update_JxW_values);
+                                          update_quadrature_points | update_JxW_values);
 
   Point<dim> n1, n2;
   for (typename DoFHandler<dim>::active_cell_iterator
index 34dc80dd207e6ae3b7b502ff9db993e0515bce35..6e012d8370ab1e544d6f8f3a2da42a9cb80a4d0a 100644 (file)
@@ -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);
index 35411b6560b4c25af1b5e8a39105b7c8ec0f2ce7..e4fc58f0c40e5be886cbc6359be218c90a7ba15b 100644 (file)
@@ -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);
 
index 933a4c4437dc4cb45041e66358fb131f11e8e473..5064f8c93d8007e0d3bc81bba90e346e95ca37af 100644 (file)
@@ -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));
index 074d19c0603bf5d1e31358b16d9beda6720bd9a0..5acbaa4f5fdca68c9c19aac2996f7967ad3ff842 100644 (file)
@@ -338,10 +338,10 @@ void HelmholtzProblem<dim>::assemble_system (const bool do_reconstruct)
 
   FEValues<dim>  x_fe_values (fe, quadrature_formula,
                               update_values   | update_gradients |
-                              update_q_points | update_JxW_values);
+                              update_quadrature_points | update_JxW_values);
 
   FEFaceValues<dim> 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<dim> right_hand_side;
index e3b185a1b54dce602efcde354739f163d0d7266c..1bad2706e4fe89fbe7954c5628ac4f1f0fe36fba 100644 (file)
@@ -409,11 +409,11 @@ void DGMethod<dim>::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<dim>::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;
 
index 8a8e34eb66c079eb7feff368884137ff3f9e4219..cc24030255662d7eb0e9e55970fa8e01c8c06303 100644 (file)
@@ -524,7 +524,7 @@ namespace LaplaceSolver
   assemble_rhs (Vector<double> &rhs) const
   {
     FEValues<dim> 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;
index d8fd7c46a23300042e7d892d7b83f1b1a94d4a88..9193f5588e5cd60d80bb12b61a6f7cd909a7d843 100644 (file)
@@ -190,7 +190,7 @@ namespace Evaluation
     QTrapez<dim>  vertex_quadrature;
     FEValues<dim> fe_values (dof_handler.get_fe(),
                              vertex_quadrature,
-                             update_gradients | update_q_points);
+                             update_gradients | update_quadrature_points);
     std::vector<Tensor<1,dim> >
     solution_gradients (vertex_quadrature.size());
 
@@ -670,7 +670,7 @@ namespace LaplaceSolver
   assemble_rhs (Vector<double> &rhs) const
   {
     FEValues<dim> 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<dim> quadrature(4);
     FEValues<dim>  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)
   {
index 58749bee750a2f13f6b511b250587345418cf5fb..fc6dbfba8f8453355e8dda0bef4d11aa71aaaaee 100644 (file)
@@ -191,7 +191,7 @@ void MinimizationProblem<dim>::assemble_step ()
   QGauss<dim>  quadrature_formula(4);
   FEValues<dim> 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<dim> fe_values (fe, quadrature,
                            update_values   | update_gradients |
                            update_second_derivatives |
-                           update_q_points | update_JxW_values);
+                           update_quadrature_points | update_JxW_values);
 
   FEValues<dim> neighbor_fe_values (fe, quadrature,
                                     update_gradients);
@@ -519,7 +519,7 @@ MinimizationProblem<dim>::energy (const DoFHandler<dim> &dof_handler,
   QGauss<dim>  quadrature_formula(4);
   FEValues<dim> 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();
 
index 3b138f4bb411e41a4c92a9d77748c6a0771d601f..63adbc035ec536a091036d37575a6c016691aca7 100644 (file)
@@ -138,7 +138,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   FEValues<dim> 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<dim>::assemble_multigrid ()
 
   FEValues<dim> 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();
index 8446fbebe598b522fcef62b7532fc09d9a5302e4..3e97f7f9006949837cd7dfe27cb653556ac22159 100644 (file)
@@ -178,7 +178,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   FEValues<dim> 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();
index 5605ccaffedab1959a342ab73da901e63f1e9d2a..a6bd3a55575944cfb4b0fcf78873a34daf56c686 100644 (file)
@@ -174,7 +174,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   FEValues<dim> 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();
index e8a71c0ceb3a8a7ad6c48745a3391e24b5f312aa..33ff086e16f7a3cfcea56d4bfec87e8867751c22 100644 (file)
@@ -200,7 +200,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   FEValues<dim> 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();
index 4796af99f653dd53814551e4d808079f09072283..0f36c94b50522a7d19d2b7561ae9aff81839a156 100644 (file)
@@ -200,7 +200,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   FEValues<dim> 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();
index fcb46a01031305161f9042c82aa94feb5e0b0778..9310693dd07425f8effde190b1925c6b148477cb 100644 (file)
@@ -199,7 +199,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   FEValues<dim> 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();
index cc3f48f908adbd4040f71c6b6ce87a9cb08d1277..6958a6a9c872c781d72c31749d41880d9f2938ed 100644 (file)
@@ -284,10 +284,10 @@ void HelmholtzProblem<dim>::assemble_system ()
 
   FEValues<dim>  x_fe_values (*fe, quadrature_formula,
                               update_values   | update_gradients |
-                              update_q_points | update_JxW_values);
+                              update_quadrature_points | update_JxW_values);
 
   FEFaceValues<dim> 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<dim> right_hand_side;
index 2851fc34b07fdc6993a4aa7371dc33fca910879d..bc09462cd97f10c4bcc96ae560775199b792cfb6 100644 (file)
@@ -205,7 +205,7 @@ void ElasticProblem<dim>::assemble_system ()
 
   FEValues<dim> 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();
index 2a60489e2b2e4e4f29e04366e25e7c939174c05c..c32689562e6406613fb756a5e79edd518613e662 100644 (file)
@@ -45,11 +45,11 @@ void check (const Triangulation<dim> &tria)
 
   FEFaceValues<dim>    fe_face_values (fe, q_face,
                                        update_normal_vectors |
-                                       update_q_points |
+                                       update_quadrature_points |
                                        update_JxW_values);
   FESubfaceValues<dim> fe_subface_values (fe, q_face,
                                           update_normal_vectors |
-                                          update_q_points |
+                                          update_quadrature_points |
                                           update_JxW_values);
 
   double v1=0, v2=0;
index c512b8885b4c0f38e1e9731033acb6aebdab80ad..2b95d6d9fc3dd94679d11c6c2c3db82e426104df 100644 (file)
@@ -55,11 +55,11 @@ void check (const Triangulation<dim> &tria,
 
   FEFaceValues<dim>    fe_face_values (mapping, fe, q_face,
                                        update_normal_vectors |
-                                       update_q_points |
+                                       update_quadrature_points |
                                        update_JxW_values);
   FESubfaceValues<dim> fe_subface_values (mapping, fe, q_face,
                                           update_normal_vectors |
-                                          update_q_points |
+                                          update_quadrature_points |
                                           update_JxW_values);
 
   double v1=0, v2=0;
index a4158fce7bd0d469b8555e825f6e2f65673f6754..cf375a7175dafd705e49a650b99a05f28190d812 100644 (file)
@@ -51,11 +51,11 @@ void check (const Triangulation<dim> &tria)
 
   FEFaceValues<dim>    fe_face_values (mapping, fe, q_face,
                                        update_normal_vectors |
-                                       update_q_points |
+                                       update_quadrature_points |
                                        update_JxW_values);
   FESubfaceValues<dim> fe_subface_values (mapping, fe, q_face,
                                           update_normal_vectors |
-                                          update_q_points |
+                                          update_quadrature_points |
                                           update_JxW_values);
 
   double v1=0, v2=0;
index 1814b03053b7e0bb0434e491e4b2134355653831..62b592a2e079a7423c3c804957bcfa7ef87b8ed1 100644 (file)
@@ -51,11 +51,11 @@ void check (const Triangulation<dim> &tria)
 
   FEFaceValues<dim>    fe_face_values (mapping, fe, q_face,
                                        update_normal_vectors |
-                                       update_q_points |
+                                       update_quadrature_points |
                                        update_JxW_values);
   FESubfaceValues<dim> fe_subface_values (mapping, fe, q_face,
                                           update_normal_vectors |
-                                          update_q_points |
+                                          update_quadrature_points |
                                           update_JxW_values);
 
   double v1=0, v2=0;
index dd848b6b6868ec44ee3775b1b2a5e8502aa7576f..6ad723b75b258ab352bc16a5e86752d6ad08b28d 100644 (file)
@@ -48,7 +48,7 @@ print_dofs (const DoFHandler<dim> &dof)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
@@ -81,7 +81,7 @@ print_dofs (const DoFHandler<dim> &dof, unsigned int level)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::cell_iterator cell=dof.begin(level);
index 65e10d80d25e0a6ba642470f0bd13fc13ba3d1bd..2a1f6680211b7623012c05d3477aa32942c80125 100644 (file)
@@ -48,7 +48,7 @@ print_dofs (const DoFHandler<dim> &dof)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
index 630ea7c7cb65a4dfaacbb9a49eb55818a12ecc32..8199bf19c32aa82b168b7f09618e19135bfedd01 100644 (file)
@@ -48,7 +48,7 @@ print_dofs (const DoFHandler<dim> &dof)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
index 8aeb9373d02ca7147903fbd1d4e8443d53ae4290..9fd57442451a66515c5009b184ef4e3af80088b1 100644 (file)
@@ -48,7 +48,7 @@ print_dofs (const DoFHandler<dim> &dof)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
index 8266e8679a12bc9b299594d9922e5d68c5d1eba7..62322508e4081525e1b8960e7b168df97eca4b81 100644 (file)
@@ -48,7 +48,7 @@ print_dofs (const DoFHandler<dim> &dof)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
index 5393468027f1f9b8f37101b2d51d04c919cf8e19..d85d22e7e9f27dddfaaa814422a83c7dc29693ec 100644 (file)
@@ -48,7 +48,7 @@ print_dofs (const DoFHandler<dim> &dof)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
index 0def4eb159df2fd4662d231765692c54607fe7e1..94c8b709c5c058ede516d6407c8dfc67e3350654 100644 (file)
@@ -48,7 +48,7 @@ print_dofs (const DoFHandler<dim> &dof)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
index 8e7890f1ddf6e68f60efe87aae38d70d53222533..1ce9325529f35221db322d52a743bd7da1ae62e8 100644 (file)
@@ -47,7 +47,7 @@ print_dofs (const DoFHandler<dim> &dof, stream &out)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
index 52ec1785532cbd88455ef12eb98c9a81d8a7d544..01f075e6c896a59cf2fc17355d0460d428752317 100644 (file)
@@ -50,7 +50,7 @@ print_dofs (const DoFHandler<dim> &dof, stream &out)
   if (fe.has_support_points())
     {
       Quadrature<dim> quad(fe.get_unit_support_points());
-      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_q_points));
+      fevalues = std_cxx11::shared_ptr<FEValues<dim> >(new FEValues<dim>(fe, quad, update_quadrature_points));
     }
 
   for (typename DoFHandler<dim>::active_cell_iterator cell=dof.begin_active();
index c72fe81c238ded8385f6434cf5fce43f858c1926..213b0368ad076c46fbe4d50db70bca8571d34827 100644 (file)
@@ -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));
index a8cf5e365e7d4ebd6e1b1db399ff6134a43d2f06..53e3fa2beab84966ece950f7107b603e2f102066 100644 (file)
@@ -200,7 +200,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hp::FEValues<dim> 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<dim> rhs_function;
 
index 9ca8b7ca385aedb103f8545acc41d8dd38b171b9..00e71c3fc0a02915a07c9f862b13e1d8acff9238 100644 (file)
@@ -190,7 +190,7 @@ namespace Evaluation
     QTrapez<dim>  vertex_quadrature;
     hp::FEValues<dim> fe_values (dof_handler.get_fe(),
                                  vertex_quadrature,
-                                 update_gradients | update_q_points);
+                                 update_gradients | update_quadrature_points);
     std::vector<Tensor<1,dim> >
     solution_gradients (vertex_quadrature.size());
 
@@ -668,7 +668,7 @@ namespace LaplaceSolver
   assemble_rhs (Vector<double> &rhs) const
   {
     hp::FEValues<dim> 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<dim> quadrature(4);
     hp::FEValues<dim>  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)
   {
index 90fc4d27da5d7fe36ae499094f8b485ba9d9bcfd..c6ce14c34d638da78628a5a5983e38cb4d3fa057 100644 (file)
@@ -192,7 +192,7 @@ void MinimizationProblem<dim>::assemble_step ()
   hp::QCollection<dim>  quadrature_formula(QGauss<dim>(4));
   hp::FEValues<dim> 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<dim> 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<dim> neighbor_fe_values (fe, quadrature,
                                         update_gradients);
@@ -521,7 +521,7 @@ MinimizationProblem<dim>::energy (const hp::DoFHandler<dim> &dof_handler,
   hp::QCollection<dim>  quadrature_formula(QGauss<dim>(4));
   hp::FEValues<dim> 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();
 
index 77f9f8086b50e3e3f7ecf11e9998be996b3f90ff..05787554a8450e4121e83e746fae625fc06276ee 100644 (file)
@@ -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();
index 4f081c2edf576223d936462dc8bab9d179b2edb1..45f245ce40ece462bf83be3538ba740f021fca53 100644 (file)
@@ -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));
index 1b3f6911d5d00ff2b0a599ed2efb6ea196224e62..7826db2b54c7ba3cbeaba4980c5d75e7c56ce1cc 100644 (file)
@@ -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<dim>       &mapping,
                          Vector<double>        &rhs_vector,
                          const Function<dim> *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<dim> fe_values (mapping, dof.get_fe(), q, update_flags);
 
@@ -344,7 +344,7 @@ void create_right_hand_side (const Mapping<dim>    &mapping,
   rhs_vector = 0;
 
   UpdateFlags update_flags = UpdateFlags(update_values   |
-                                         update_q_points |
+                                         update_quadrature_points |
                                          update_JxW_values);
   FEValues<dim> fe_values (mapping, fe, quadrature, update_flags);
 
index b86c0977c3f5996d882467e15126d9af9609f37c..62607e04f90df4145f8adb8f19dbb15e923f806f 100644 (file)
@@ -118,7 +118,7 @@ plot_shape_functions(const unsigned int degree)
       QTrapez<1> q_trapez;
       const unsigned int div=2;
       QIterated<dim> q(q_trapez, div);
-      FEValues<dim> fe(element, q, update_values|update_gradients|update_q_points);
+      FEValues<dim> 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)
index d3e05c816d072e89af628c67e8457986acd077ae..1d605a7bd70b36080bd7b6f1e21edb64b4715fa6 100644 (file)
@@ -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<dim>       &mapping,
                          Vector<double>        &rhs_vector,
                          const Function<dim> *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<dim> fe_values (mapping, dof.get_fe(), q, update_flags);
 
@@ -393,7 +393,7 @@ void create_right_hand_side (const Mapping<dim>    &mapping,
   rhs_vector = 0;
 
   UpdateFlags update_flags = UpdateFlags(update_values   |
-                                         update_q_points |
+                                         update_quadrature_points |
                                          update_JxW_values);
   FEValues<dim> fe_values (mapping, fe, quadrature, update_flags);
 
index 108b65789d190c17b4fea9a5bba92e846d7c05d9..89601bedd04ae5bc3cce8a23342245b3bea644c6 100644 (file)
@@ -55,7 +55,7 @@ plot_faces(Mapping<dim> &mapping,
   Assert (q.size() == 1, ExcInternalError());
 
   FEFaceValues<dim> 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<dim> &mapping,
   Assert (q.size() == 1, ExcInternalError());
 
   FESubfaceValues<dim> fe_values(mapping, fe, q,
-                                 UpdateFlags(update_q_points
+                                 UpdateFlags(update_quadrature_points
                                              | update_JxW_values
                                              | update_values
                                              | update_gradients
index 4472fb1abbff30477eae1e2e63caa95a30236212..5ecf1d814bbc2ebb929d225bb2437efa35e02547 100644 (file)
@@ -51,7 +51,7 @@ void test (const Triangulation<dim> &tr,
 
   const QGauss<dim> quadrature(2);
   FEValues<dim> 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
index a81a6d6f8823dea7631c6ed8c8d6e5892c86766c..1405bb349275995bbf5cdf1e3f47404cbe5eda4a 100644 (file)
@@ -51,7 +51,7 @@ void test (const Triangulation<dim> &tr,
 
   const QGauss<dim> quadrature(2);
   FEValues<dim> 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
index cf9087ddd8f70b6dd081ab58546e8762f9440d05..22369b8dd0a93c738d02dd0e037be33ee74dde97 100644 (file)
@@ -66,7 +66,7 @@ void test (const Triangulation<dim> &tr,
 
   const QGauss<dim> quadrature(2);
   FEValues<dim> 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
index 66eab34c4c69ce53a51a21f0cf833c2c8dc8a6a1..11c43622f8cdc417645427d7021be5f5d81889fe 100644 (file)
@@ -66,7 +66,7 @@ void test (const Triangulation<dim> &tr,
 
   const QGauss<dim> quadrature(2);
   FEValues<dim> 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
index a85add05be84067fb591623ae942d498bfa7503f..bdb78d9eee69cf3f15aa73c73b4facd588fc4f8f 100644 (file)
@@ -84,7 +84,7 @@ void test (const Triangulation<dim> &tr,
 
   const QGauss<dim> quadrature(2);
   FEValues<dim> 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
index 7f503332c7e689409e260e659a4f227006160810..7f0d66498f9a921aaef4847b6987c6493b2906ab 100644 (file)
@@ -85,7 +85,7 @@ void test (const Triangulation<dim> &tr,
 
   const QGauss<dim> quadrature(2);
   FEValues<dim> 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
index 7392e799e022c2c9ba28068b7d4c95ffbd7302e2..ebab9fbccc8622abfb51c6c65217cb5c4f44c2c2 100644 (file)
@@ -124,7 +124,7 @@ plot_shape_functions(const unsigned int degree)
       QTrapez<1> q_trapez;
       const unsigned int div=2;
       QIterated<dim> q(q_trapez, div);
-      FEValues<dim> fe(element, q, update_values|update_gradients|update_q_points);
+      FEValues<dim> 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)
index 183a35702bb41206d57f4ab0dfb4147d295b111d..14370979a5497f63d343360d395955f931de1032 100644 (file)
@@ -107,11 +107,11 @@ plot (const Triangulation<dim> &tr, const unsigned int p)
 
   MappingCartesian<dim> mapping;
   FEFaceValues<dim> feface(mapping, fe_ned, quadrature,
-                           update_values|update_q_points|update_normal_vectors);
+                           update_values|update_quadrature_points|update_normal_vectors);
   FEFaceValues<dim> feneighbor(mapping, fe_ned, quadrature,
-                               update_values|update_q_points|update_normal_vectors);
+                               update_values|update_quadrature_points|update_normal_vectors);
   FESubfaceValues<dim> fesubface(mapping, fe_ned, quadrature,
-                                 update_values|update_q_points|update_normal_vectors);
+                                 update_values|update_quadrature_points|update_normal_vectors);
 
 
   for (typename DoFHandler<dim>::active_cell_iterator
index f16fef3ac4977ae30a5af082798d6568f14cdaa1..92aaf2c3771fcddc22fc85c1ac20f95f890b2333 100644 (file)
@@ -82,7 +82,7 @@ check (const unsigned int p)
   std::vector<Vector<double> > shape_values (quadrature.size(),
                                              Vector<double>(dim));
   FEValues<dim> fe(fe_ned, quadrature,
-                   update_values|update_q_points);
+                   update_values|update_quadrature_points);
 
   for (typename DoFHandler<dim>::active_cell_iterator
        c = dof.begin_active();
index 38a0424696b4146dd68980bfc0384b68f5b04e0f..75ad4977e519eee5414f643a5d761d952d8c185f 100644 (file)
@@ -118,7 +118,7 @@ plot_shape_functions(const unsigned int degree)
       QTrapez<1> q_trapez;
       const unsigned int div=2;
       QIterated<dim> q(q_trapez, div);
-      FEValues<dim> fe(element, q, update_values|update_gradients|update_q_points);
+      FEValues<dim> 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)
index 0590645979b8a7055008c86a72936e990dbe498d..eeee8a4bfee9802c12c77a85e67541a3918a0bf8 100644 (file)
@@ -51,7 +51,7 @@ plot_shape_functions(const unsigned int degree)
   QTrapez<1> q_trapez;
   const unsigned int div=10;
   QIterated<dim> q(q_trapez, div);
-  FEValues<dim> fe(fe_rt, q, update_values|update_gradients|update_q_points);
+  FEValues<dim> fe(fe_rt, q, update_values|update_gradients|update_quadrature_points);
   fe.reinit(c);
 
   Assert (fe.get_fe().n_components() == dim, ExcInternalError());
index fc1607172c846e57693ce209136f4e1ec302e18d..9375e9c83ba39cb31c9d3b8043e83eb18406853c 100644 (file)
@@ -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));
index 13d18789672af63360651070dea3258d83a123c3..69408c52df73465bf757af02bc4cf836c2324998 100644 (file)
@@ -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));
index 1dbc26b134576a46387abbcbfb6b52eaf9e891b4..d381c93e043cdc9de70621e73947b563f8afb946 100644 (file)
@@ -52,7 +52,7 @@ plot_shape_functions(const unsigned int degree)
   QTrapez<1> q_trapez;
   const unsigned int div=10;
   QIterated<dim> q(q_trapez, div);
-  FEValues<dim> fe(fe_rt, q, update_values|update_gradients|update_q_points);
+  FEValues<dim> fe(fe_rt, q, update_values|update_gradients|update_quadrature_points);
   fe.reinit(c);
 
   for (unsigned int q_point=0; q_point<q.size(); ++q_point)
index 4a96a0aa3756df7b9d669ec7fde7db768e134554..5b80b6c898e5e74ae18369e277e584bb3f70d748 100644 (file)
@@ -124,8 +124,8 @@ plot_face_shape_functions(
 
   QTrapez<1> q_trapez;
   QIterated<dim-1> q(q_trapez, div);
-  FEFaceValues<dim> fe(mapping, finel, q, UpdateFlags(uflags | update_q_points));
-  FESubfaceValues<dim> sub(mapping, finel, q, UpdateFlags(uflags | update_q_points));
+  FEFaceValues<dim> fe(mapping, finel, q, UpdateFlags(uflags | update_quadrature_points));
+  FESubfaceValues<dim> sub(mapping, finel, q, UpdateFlags(uflags | update_quadrature_points));
 
   sprintf(fname, "Face%dd-%s", dim, name);
   deallog.push(fname);
index a66e17e9a2367b0259f774d18bbac105f3c405a7..14786acfed6c145257f4b018e6915e08cb7600f9 100644 (file)
@@ -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);
index 3135eb055253f1d8e33109a3665b0a581598526e..f53275f6bc1f2d8ca2c010e601493b6f13a407d6 100644 (file)
@@ -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);
index 71adf4b88d199eb23ec989e57bde7bfb1061a2e1..d4aaf6fcb6fc40e1dee903afa9e06e01781e5e16 100644 (file)
@@ -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);
index 797fb3577d4fd1ef0cfefdf6004345ca29e20a02..1f2a999146186d8b1867821ce64e4d6568c1e72e 100644 (file)
@@ -200,7 +200,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hp::FEValues<dim> 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<dim> rhs_function;
 
index 71e75f9ec52f12d83645ceeb5a5e844d034f5858..bc0c9930784586cc4e73afb8687f77511c00c73a 100644 (file)
@@ -205,7 +205,7 @@ void LaplaceProblem<dim>::assemble_system ()
   hp::FEValues<dim> 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<dim> rhs_function;
 
index 09ae107b4c896656ac61b75b9c3b96a44b85de0a..692c76d4f691f3166d6e27b2a06b39c781364323 100644 (file)
@@ -413,11 +413,11 @@ void DGMethod<dim>::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<dim>::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;
 
index 2ebad32e9282ba3866ec740701a9b9c0d90cb3cb..79c6e72a43575c29f01e6cd163dd4053ec597f8b 100644 (file)
@@ -524,7 +524,7 @@ namespace LaplaceSolver
   assemble_rhs (Vector<double> &rhs) const
   {
     hp::FEValues<dim> 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;
index 3efc197f0793eb9a166391ef20e4da080c9c90e4..5fc0b5f8f31bc3d13cde21133dddcfed34261225 100644 (file)
@@ -177,7 +177,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   hp::FEValues<dim> 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();
index 8fc42296929bc7876fa4666e3cfdb17131e07f14..3e6da0c4001e34f4a5c2debb5e603f503b361e00 100644 (file)
@@ -173,7 +173,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   hp::FEValues<dim> 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();
index 809bbc21701761bbe522cfda084ba08138e40523..61709ea87fd56e660d37c985c81c3410919a1ba5 100644 (file)
@@ -198,7 +198,7 @@ void LaplaceProblem<dim>::assemble_system ()
 
   hp::FEValues<dim> 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();
index 1c5f935a74902488bb36ea6a7ee8b6cdd7b53771..245eecc1f29a338991562e9ad8db55d0fd534ae6 100644 (file)
@@ -283,10 +283,10 @@ void HelmholtzProblem<dim>::assemble_system ()
 
   hp::FEValues<dim>  x_fe_values (*fe, quadrature_formula,
                                   update_values   | update_gradients |
-                                  update_q_points | update_JxW_values);
+                                  update_quadrature_points | update_JxW_values);
 
   hp::FEFaceValues<dim> 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<dim> right_hand_side;
index 913c7075247d561b1da7088d472c43c80ef4a71f..6465e0b6b31cd92dfd55b3c05fc2e08c6bc17a6b 100644 (file)
@@ -204,7 +204,7 @@ void ElasticProblem<dim>::assemble_system ()
 
   hp::FEValues<dim> 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();
index 0de68e1626c1255f1e128844708644ece328e651..fdd4fe4774d1fab0e7d0b94b45b0ef04f49d9b6e 100644 (file)
@@ -117,7 +117,7 @@ check ()
 
   FEValues<dim> fe (mapping, element, quadrature,
                     update_values | update_gradients
-                    | update_q_points | update_JxW_values);
+                    | update_quadrature_points | update_JxW_values);
 
   std::vector <types::global_dof_index> global_dofs (element.dofs_per_cell);
   std::vector <double> function (quadrature.size());
index c2c7827380229e85dfcb3ad892f6437e8779bbe0..a5d048bc67cbd455082add617c91bd51e26e4349 100644 (file)
@@ -54,7 +54,7 @@ plot_faces(Mapping<dim> &mapping,
   Assert (q.size() == 1, ExcInternalError());
 
   FEFaceValues<dim> 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<dim> &mapping,
   Assert (q.size() == 1, ExcInternalError());
 
   FESubfaceValues<dim> fe_values(mapping, fe, q,
-                                 UpdateFlags(update_q_points
+                                 UpdateFlags(update_quadrature_points
                                              | update_JxW_values
                                              | update_values
                                              | update_gradients
index 0878065bac8548e22f5f11ab127c6254e2a5284a..31b02c6df0dcbc0377f1f9db10a6b3bede1b0aea 100644 (file)
@@ -54,7 +54,7 @@ plot_faces(Mapping<dim> &mapping,
   Assert (q.size() == 1, ExcInternalError());
 
   FEFaceValues<dim> 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<dim> &mapping,
   Assert (q.size() == 1, ExcInternalError());
 
   FESubfaceValues<dim> fe_values(mapping, fe, q,
-                                 UpdateFlags(update_q_points
+                                 UpdateFlags(update_quadrature_points
                                              | update_JxW_values
                                              | update_values
                                              | update_gradients
index ffde9d918f71cd324ae5ee37b9688c9bd8c412a4..82e9781ba36a26392634b128e267f7239a3ac3e7 100644 (file)
@@ -53,7 +53,7 @@ plot_transformation(Mapping<dim> &mapping,
   QTrapez<1> q_trapez;
   QIterated<dim> q(q_trapez, div);
   FEValues<dim> 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<dim> &mapping,
   const unsigned int nq = (unsigned int) (.01 + std::pow(q.size(), 1./(dim-1)));
 
   FEFaceValues<dim> 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<dim> &mapping,
   const unsigned int nq = (unsigned int) (.01 + std::pow(q.size(), 1./(dim-1)));
 
   FESubfaceValues<dim> 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<dim>::faces_per_cell;
index 74c5efd2a9542b8915e164768f0a713905890ebd..9f5984a8ad133daa87f092e8043dda719b3c3370 100644 (file)
@@ -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)
index fff9f441af0bdf2815ac3e1257277b0fdc9d4547..3eafac16371d7d3f655859ec2dc0b9a562a3d6db 100644 (file)
@@ -153,7 +153,7 @@ void derivatives()
   Vector<double> solution;
   MappingQGeneric<dim> mapping(1);
   QMidpoint<dim> q_midpoint;
-  FEValues<dim> fe_values(mapping, fe, q_midpoint, update_q_points);
+  FEValues<dim> fe_values(mapping, fe, q_midpoint, update_quadrature_points);
 
   dof_handler.distribute_dofs (fe);
   solution.reinit(dof_handler.n_dofs());
index 8ad9ab879982d28a72cec8b0e404c9c932eb3695..94ab3da865493761a945b0f363a0295f351322ca 100644 (file)
@@ -65,7 +65,7 @@ check (const unsigned int level,
 
   FEValues<dim> fe (mapping, element, quadrature,
                     update_values
-                    | update_q_points | update_JxW_values);
+                    | update_quadrature_points | update_JxW_values);
 
   std::vector <types::global_dof_index> global_dofs (element.dofs_per_cell);
   std::vector <double> function (quadrature.size());
@@ -119,7 +119,7 @@ check (const unsigned int level,
   FEValues<dim> 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.;
index 0f15904ea5f4dc2c96f97512d5795a7a053a86ee..26dc4d0171908f75cb1b81fa6684c1186194e009 100644 (file)
@@ -69,7 +69,7 @@ void test (const Triangulation<dim> &tr,
   const std::vector<Point<dim-1> > &
   unit_support_points = fe.get_unit_face_support_points();
   Quadrature<dim-1> quadrature(unit_support_points);
-  FEFaceValues<dim, dim> fe_face_values(fe, quadrature, update_q_points);
+  FEFaceValues<dim, dim> fe_face_values(fe, quadrature, update_quadrature_points);
   typename DoFHandler<dim>::active_cell_iterator
   cell = dof.begin_active(),
   endc = dof.end();
index 251cb03570cdf68a13fec950f647d43adc5ebe0d..dcaff1c4636bccee1967cc5c6960c9a85d57870a 100644 (file)
@@ -70,7 +70,7 @@ void test (const Triangulation<dim> &tr,
   const std::vector<Point<dim-1> > &
   unit_support_points = fe.get_unit_face_support_points();
   Quadrature<dim-1> quadrature(unit_support_points);
-  FEFaceValues<dim, dim> fe_face_values(fe, quadrature, update_q_points);
+  FEFaceValues<dim, dim> fe_face_values(fe, quadrature, update_quadrature_points);
   typename DoFHandler<dim>::active_cell_iterator
   cell = dof.begin_active(),
   endc = dof.end();

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.