From aaecf87fcc57353351b3033f09894a0b660619eb Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 23 Jun 2020 10:39:26 -0400 Subject: [PATCH] Remove deprecated UpdateFlags --- examples/step-27/doc/intro.dox | 2 +- include/deal.II/fe/fe_update_flags.h | 16 ---------------- source/fe/fe_p1nc.cc | 4 ++-- tests/fe/fe_enriched_step-36b.cc | 2 +- tests/fe/p1nc_01.cc | 4 +++- tests/fe/p1nc_02.cc | 4 +++- tests/fe/p1nc_03.cc | 4 +++- tests/fe/p1nc_04.cc | 4 +++- tests/fe/p1nc_05.cc | 4 +++- tests/fe/p1nc_06.cc | 4 +++- tests/fe/p1nc_07.cc | 4 +++- tests/fe/p1nc_08.cc | 4 +++- tests/matrix_free/interpolate_functions_common.h | 6 +++--- tests/meshworker/scratch_data_03.cc | 4 ++-- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/examples/step-27/doc/intro.dox b/examples/step-27/doc/intro.dox index 0597da6789..150654dbbf 100644 --- 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 dcc57c08aa..433998686d 100644 --- 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 54323a09c4..6b5215786e 100644 --- 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 201858b51b..8c739fe982 100644 --- a/tests/fe/fe_enriched_step-36b.cc +++ b/tests/fe/fe_enriched_step-36b.cc @@ -761,7 +761,7 @@ namespace Step36 template Postprocessor::Postprocessor(const EnrichmentFunction &enrichment) : DataPostprocessorScalar("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 2feb06f9ff..5237111c60 100644 --- a/tests/fe/p1nc_01.cc +++ b/tests/fe/p1nc_01.cc @@ -45,7 +45,9 @@ check() dof_handler.distribute_dofs(fe); QGauss quadrature(3); - FEValues fe_values(fe, quadrature, update_values | update_q_points); + FEValues 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 83010b1870..a48dd88568 100644 --- a/tests/fe/p1nc_02.cc +++ b/tests/fe/p1nc_02.cc @@ -59,7 +59,9 @@ check() dof_handler.distribute_dofs(fe); QGauss quadrature(3); - FEValues fe_values(fe, quadrature, update_values | update_q_points); + FEValues 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 5b8a0b2e19..62319d531d 100644 --- a/tests/fe/p1nc_03.cc +++ b/tests/fe/p1nc_03.cc @@ -63,7 +63,9 @@ check() dof_handler.distribute_dofs(fe); QGauss quadrature(3); - FEValues fe_values(fe, quadrature, update_values | update_q_points); + FEValues 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 b0925ad0bb..4bd10c66dc 100644 --- a/tests/fe/p1nc_04.cc +++ b/tests/fe/p1nc_04.cc @@ -63,7 +63,9 @@ check() dof_handler.distribute_dofs(fe); QGauss quadrature(3); - FEValues fe_values(fe, quadrature, update_values | update_q_points); + FEValues 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 e6cbaac456..975971c69f 100644 --- a/tests/fe/p1nc_05.cc +++ b/tests/fe/p1nc_05.cc @@ -45,7 +45,9 @@ check() dof_handler.distribute_dofs(fe); QGauss quadrature(3); - FEValues fe_values(fe, quadrature, update_gradients | update_q_points); + FEValues 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 7587ca700a..4013329384 100644 --- a/tests/fe/p1nc_06.cc +++ b/tests/fe/p1nc_06.cc @@ -59,7 +59,9 @@ check() dof_handler.distribute_dofs(fe); QGauss quadrature(3); - FEValues fe_values(fe, quadrature, update_gradients | update_q_points); + FEValues 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 a452038787..087a4156f5 100644 --- a/tests/fe/p1nc_07.cc +++ b/tests/fe/p1nc_07.cc @@ -63,7 +63,9 @@ check() dof_handler.distribute_dofs(fe); QGauss quadrature(3); - FEValues fe_values(fe, quadrature, update_gradients | update_q_points); + FEValues 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 340eeaf8e3..d2cc99038a 100644 --- a/tests/fe/p1nc_08.cc +++ b/tests/fe/p1nc_08.cc @@ -63,7 +63,9 @@ check() dof_handler.distribute_dofs(fe); QGauss quadrature(3); - FEValues fe_values(fe, quadrature, update_gradients | update_q_points); + FEValues 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 f3a08b3e88..a5ec16e842 100644 --- a/tests/matrix_free/interpolate_functions_common.h +++ b/tests/matrix_free/interpolate_functions_common.h @@ -330,11 +330,11 @@ do_test(const DoFHandler & dof, typename MatrixFree::AdditionalData data; data.tasks_parallel_scheme = MatrixFree::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 590be1f253..b9f4805390 100644 --- 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; -- 2.39.5