Remove deprecated UpdateFlags

diff --git a/examples/step-27/doc/intro.dox b/examples/step-27/doc/intro.dox
index 0597da67891a27f40f6045b82c60b51977435c43..150654dbbfbe354e34b2f56c960fb1c0513140ec 100644 (file)
--- a/examples/step-27/doc/intro.dox
+++ b/examples/step-27/doc/intro.dox
@@ -212,7 +212,7 @@ i.e. the interesting part of the loop over all cells would look like this:
                                  fe_collection,
                                  quadrature_collection,
                                  update_values   | update_gradients |
-                                 update_q_points | update_JxW_values);
+                                 update_quadrature_points | update_JxW_values);
 
   for (const auto &cell : dof_handler.active_cell_iterators())
     {

diff --git a/include/deal.II/fe/fe_update_flags.h b/include/deal.II/fe/fe_update_flags.h
index dcc57c08aa36cb1c9ad637adae858b21817278e5..433998686d26b820fa30a4cb5c351e51965b539b 100644 (file)
--- a/include/deal.II/fe/fe_update_flags.h
+++ b/include/deal.II/fe/fe_update_flags.h
@@ -134,14 +134,6 @@ enum UpdateFlags
    * error.
    */
   update_normal_vectors = 0x0080,
-  /**
-   * @deprecated Use #update_normal_vectors instead.
-   */
-  update_face_normal_vectors DEAL_II_DEPRECATED = update_normal_vectors,
-  /**
-   * @deprecated Use #update_normal_vectors instead.
-   */
-  update_cell_normal_vectors DEAL_II_DEPRECATED = update_normal_vectors,
   //! Volume element
   /**
    * Compute the Jacobian of the transformation from the reference cell to the
@@ -213,14 +205,6 @@ enum UpdateFlags
    * pushed forward to the real cell coordinates.
    */
   update_jacobian_pushed_forward_3rd_derivatives = 0x1000000,
-  /**
-   * @deprecated Use #update_quadrature_points instead.
-   */
-  update_q_points DEAL_II_DEPRECATED = update_quadrature_points,
-  /**
-   * @deprecated Use #update_hessians instead.
-   */
-  update_second_derivatives DEAL_II_DEPRECATED = update_hessians,
   //! Values needed for Piola transform
   /**
    * Combination of the flags needed for Piola transform of Hdiv elements.

diff --git a/source/fe/fe_p1nc.cc b/source/fe/fe_p1nc.cc
index 54323a09c4c019c73f65955428c9ac4995aac766..6b5215786ecade7ea086127aa7148697befc4e08 100644 (file)
--- a/source/fe/fe_p1nc.cc
+++ b/source/fe/fe_p1nc.cc
@@ -55,8 +55,8 @@ FE_P1NC::requires_update_flags(const UpdateFlags flags) const
     out |= update_values | update_quadrature_points;
   if (flags & update_gradients)
     out |= update_gradients;
-  if (flags & update_cell_normal_vectors)
-    out |= update_cell_normal_vectors | update_JxW_values;
+  if (flags & update_normal_vectors)
+    out |= update_normal_vectors | update_JxW_values;
   if (flags & update_hessians)
     out |= update_hessians;
 

diff --git a/tests/fe/fe_enriched_step-36b.cc b/tests/fe/fe_enriched_step-36b.cc
index 201858b51b49b7efa20b0207e7b78b85c38ff0c9..8c739fe982e1328d5512879f4ef0b2d35f023479 100644 (file)
--- a/tests/fe/fe_enriched_step-36b.cc
+++ b/tests/fe/fe_enriched_step-36b.cc
@@ -761,7 +761,7 @@ namespace Step36
   template <int dim>
   Postprocessor<dim>::Postprocessor(const EnrichmentFunction<dim> &enrichment)
     : DataPostprocessorScalar<dim>("total_solution",
-                                   update_values | update_q_points)
+                                   update_values | update_quadrature_points)
     , enrichment(enrichment)
   {}
 

diff --git a/tests/fe/p1nc_01.cc b/tests/fe/p1nc_01.cc
index 2feb06f9ff6deb41b5171fad04b3b74e30fe4cb4..5237111c600cc754e240d2d7cda4e5216cb04b01 100644 (file)
--- a/tests/fe/p1nc_01.cc
+++ b/tests/fe/p1nc_01.cc
@@ -45,7 +45,9 @@ check()
   dof_handler.distribute_dofs(fe);
 
   QGauss<dim>   quadrature(3);
-  FEValues<dim> fe_values(fe, quadrature, update_values | update_q_points);
+  FEValues<dim> fe_values(fe,
+                          quadrature,
+                          update_values | update_quadrature_points);
   fe_values.reinit(dof_handler.begin_active());
 
   for (unsigned int q = 0; q < quadrature.size(); ++q)

diff --git a/tests/fe/p1nc_02.cc b/tests/fe/p1nc_02.cc
index 83010b1870fa61e0fb8a32c3ba41e30a6420cad3..a48dd8856815ae2d05c1452bee2aa6e300865c32 100644 (file)
--- a/tests/fe/p1nc_02.cc
+++ b/tests/fe/p1nc_02.cc
@@ -59,7 +59,9 @@ check()
   dof_handler.distribute_dofs(fe);
 
   QGauss<dim>   quadrature(3);
-  FEValues<dim> fe_values(fe, quadrature, update_values | update_q_points);
+  FEValues<dim> fe_values(fe,
+                          quadrature,
+                          update_values | update_quadrature_points);
   fe_values.reinit(dof_handler.begin_active());
 
   for (unsigned int q = 0; q < quadrature.size(); ++q)

diff --git a/tests/fe/p1nc_03.cc b/tests/fe/p1nc_03.cc
index 5b8a0b2e19202e4943ad1cb1e86270761d8f6a61..62319d531d736563b0d18af403831c1e3868bc07 100644 (file)
--- a/tests/fe/p1nc_03.cc
+++ b/tests/fe/p1nc_03.cc
@@ -63,7 +63,9 @@ check()
   dof_handler.distribute_dofs(fe);
 
   QGauss<dim>   quadrature(3);
-  FEValues<dim> fe_values(fe, quadrature, update_values | update_q_points);
+  FEValues<dim> fe_values(fe,
+                          quadrature,
+                          update_values | update_quadrature_points);
   fe_values.reinit(dof_handler.begin_active());
 
   for (unsigned int q = 0; q < quadrature.size(); ++q)

diff --git a/tests/fe/p1nc_04.cc b/tests/fe/p1nc_04.cc
index b0925ad0bbc927da1f637a9ab5d1a8b0c1360660..4bd10c66dcafcba10d626310afd8a4c2650b743f 100644 (file)
--- a/tests/fe/p1nc_04.cc
+++ b/tests/fe/p1nc_04.cc
@@ -63,7 +63,9 @@ check()
   dof_handler.distribute_dofs(fe);
 
   QGauss<dim>   quadrature(3);
-  FEValues<dim> fe_values(fe, quadrature, update_values | update_q_points);
+  FEValues<dim> fe_values(fe,
+                          quadrature,
+                          update_values | update_quadrature_points);
   fe_values.reinit(dof_handler.begin_active());
 
   for (unsigned int q = 0; q < quadrature.size(); ++q)

diff --git a/tests/fe/p1nc_05.cc b/tests/fe/p1nc_05.cc
index e6cbaac4568ac6847d14921e53cfb983dca1e15b..975971c69ffccd0fb8a311e1f42f7e7cefae844f 100644 (file)
--- a/tests/fe/p1nc_05.cc
+++ b/tests/fe/p1nc_05.cc
@@ -45,7 +45,9 @@ check()
   dof_handler.distribute_dofs(fe);
 
   QGauss<dim>   quadrature(3);
-  FEValues<dim> fe_values(fe, quadrature, update_gradients | update_q_points);
+  FEValues<dim> fe_values(fe,
+                          quadrature,
+                          update_gradients | update_quadrature_points);
   fe_values.reinit(dof_handler.begin_active());
 
   for (unsigned int q = 0; q < quadrature.size(); ++q)

diff --git a/tests/fe/p1nc_06.cc b/tests/fe/p1nc_06.cc
index 7587ca700a593274a6938f9cf9cdd59e2f459110..4013329384233fd6fed9c97ac84fb04c90779a0f 100644 (file)
--- a/tests/fe/p1nc_06.cc
+++ b/tests/fe/p1nc_06.cc
@@ -59,7 +59,9 @@ check()
   dof_handler.distribute_dofs(fe);
 
   QGauss<dim>   quadrature(3);
-  FEValues<dim> fe_values(fe, quadrature, update_gradients | update_q_points);
+  FEValues<dim> fe_values(fe,
+                          quadrature,
+                          update_gradients | update_quadrature_points);
   fe_values.reinit(dof_handler.begin_active());
 
   for (unsigned int q = 0; q < quadrature.size(); ++q)

diff --git a/tests/fe/p1nc_07.cc b/tests/fe/p1nc_07.cc
index a45203878796e8cb648f9632f32d6bb224e6ea11..087a4156f5457340bd281f337a5dcc0f7cefa86d 100644 (file)
--- a/tests/fe/p1nc_07.cc
+++ b/tests/fe/p1nc_07.cc
@@ -63,7 +63,9 @@ check()
   dof_handler.distribute_dofs(fe);
 
   QGauss<dim>   quadrature(3);
-  FEValues<dim> fe_values(fe, quadrature, update_gradients | update_q_points);
+  FEValues<dim> fe_values(fe,
+                          quadrature,
+                          update_gradients | update_quadrature_points);
   fe_values.reinit(dof_handler.begin_active());
 
   for (unsigned int q = 0; q < quadrature.size(); ++q)

diff --git a/tests/fe/p1nc_08.cc b/tests/fe/p1nc_08.cc
index 340eeaf8e34ad53c7a4bec90d63888c5b6b05e77..d2cc99038aa85f4f01cbab04e7faa31de9caa96c 100644 (file)
--- a/tests/fe/p1nc_08.cc
+++ b/tests/fe/p1nc_08.cc
@@ -63,7 +63,9 @@ check()
   dof_handler.distribute_dofs(fe);
 
   QGauss<dim>   quadrature(3);
-  FEValues<dim> fe_values(fe, quadrature, update_gradients | update_q_points);
+  FEValues<dim> fe_values(fe,
+                          quadrature,
+                          update_gradients | update_quadrature_points);
   fe_values.reinit(dof_handler.begin_active());
 
   for (unsigned int q = 0; q < quadrature.size(); ++q)

diff --git a/tests/matrix_free/interpolate_functions_common.h b/tests/matrix_free/interpolate_functions_common.h
index f3a08b3e8818d65bb19a195bc8f30a009a07167d..a5ec16e84236dfaef96c5e09ed17b037af488d0a 100644 (file)
--- a/tests/matrix_free/interpolate_functions_common.h
+++ b/tests/matrix_free/interpolate_functions_common.h
@@ -330,11 +330,11 @@ do_test(const DoFHandler<dim> &          dof,
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.mapping_update_flags =
-      update_gradients | update_second_derivatives | update_quadrature_points;
+      update_gradients | update_hessians | update_quadrature_points;
     data.mapping_update_flags_boundary_faces =
-      update_gradients | update_second_derivatives | update_quadrature_points;
+      update_gradients | update_hessians | update_quadrature_points;
     data.mapping_update_flags_inner_faces =
-      update_gradients | update_second_derivatives | update_quadrature_points;
+      update_gradients | update_hessians | update_quadrature_points;
     mf_data.reinit(dof, constraints, quad, data);
   }
 

diff --git a/tests/meshworker/scratch_data_03.cc b/tests/meshworker/scratch_data_03.cc
index 590be1f25364c692b5a5a0173847ced841c5ecb3..b9f4805390f657917f202d2abcb1d31e14cbdd77 100644 (file)
--- a/tests/meshworker/scratch_data_03.cc
+++ b/tests/meshworker/scratch_data_03.cc
@@ -91,8 +91,8 @@ test()
   UpdateFlags cell_flags = update_values | update_gradients |
                            update_quadrature_points | update_JxW_values;
   UpdateFlags face_flags = update_values | update_gradients |
-                           update_quadrature_points |
-                           update_face_normal_vectors | update_JxW_values;
+                           update_quadrature_points | update_normal_vectors |
+                           update_JxW_values;
 
   // Stabilization for SIPG
   double gamma = 100;