From: Martin Kronbichler Date: Mon, 31 Oct 2016 19:46:45 +0000 (+0100) Subject: Avoid using deprecated functions in initialization X-Git-Tag: v8.5.0-rc1~447^2~5 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1081dcf611622ccbc8b75e7158172dee18db4790;p=dealii.git Avoid using deprecated functions in initialization --- diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index f43b59cd9e..cbcdc6fbb4 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -1478,8 +1478,12 @@ reinit(const DoFHandlerType &dof_handler, std::vector locally_owned_sets = internal::MatrixFree::extract_locally_owned_index_sets (dof_handlers, additional_data.level_mg_handler); - reinit(StaticMappingQ1::mapping, dof_handlers,constraints, locally_owned_sets, quads, - additional_data); + + std::vector > quad_hp; + quad_hp.push_back (hp::QCollection<1>(quad)); + + internal_reinit(StaticMappingQ1::mapping, dof_handlers,constraints, + locally_owned_sets, quad_hp, additional_data); } @@ -1495,17 +1499,19 @@ reinit(const Mapping &mapping, { std::vector dof_handlers; std::vector constraints; - std::vector quads; dof_handlers.push_back(&dof_handler); constraints.push_back (&constraints_in); - quads.push_back (quad); std::vector locally_owned_sets = internal::MatrixFree::extract_locally_owned_index_sets (dof_handlers, additional_data.level_mg_handler); - reinit(mapping, dof_handlers,constraints,locally_owned_sets, quads, - additional_data); + + std::vector > quad_hp; + quad_hp.push_back (hp::QCollection<1>(quad)); + + internal_reinit(mapping, dof_handlers,constraints,locally_owned_sets, + quad_hp, additional_data); } @@ -1521,9 +1527,11 @@ reinit(const std::vector &dof_handler, std::vector locally_owned_set = internal::MatrixFree::extract_locally_owned_index_sets (dof_handler, additional_data.level_mg_handler); - reinit(StaticMappingQ1::mapping, dof_handler,constraint,locally_owned_set, - static_cast >&>(quad), - additional_data); + std::vector > quad_hp; + for (unsigned int q=0; q(quad[q])); + internal_reinit(StaticMappingQ1::mapping, dof_handler,constraint, + locally_owned_set, quad_hp, additional_data); } @@ -1536,13 +1544,13 @@ reinit(const std::vector &dof_handler, const QuadratureType &quad, const typename MatrixFree::AdditionalData additional_data) { - std::vector quads; - quads.push_back(quad); std::vector locally_owned_set = internal::MatrixFree::extract_locally_owned_index_sets (dof_handler, additional_data.level_mg_handler); - reinit(StaticMappingQ1::mapping, dof_handler,constraint,locally_owned_set, quads, - additional_data); + std::vector > quad_hp; + quad_hp.push_back (hp::QCollection<1>(quad)); + internal_reinit(StaticMappingQ1::mapping, dof_handler,constraint, + locally_owned_set, quad_hp, additional_data); } @@ -1556,13 +1564,13 @@ reinit(const Mapping &mapping, const QuadratureType &quad, const typename MatrixFree::AdditionalData additional_data) { - std::vector quads; - quads.push_back(quad); std::vector locally_owned_set = internal::MatrixFree::extract_locally_owned_index_sets (dof_handler, additional_data.level_mg_handler); - reinit(mapping, dof_handler,constraint,locally_owned_set, quads, - additional_data); + std::vector > quad_hp; + quad_hp.push_back (hp::QCollection<1>(quad)); + internal_reinit(mapping, dof_handler,constraint, + locally_owned_set, quad_hp, additional_data); } @@ -1579,8 +1587,11 @@ reinit(const Mapping &mapping, std::vector locally_owned_set = internal::MatrixFree::extract_locally_owned_index_sets (dof_handler, additional_data.level_mg_handler); - reinit(mapping, dof_handler,constraint,locally_owned_set, - quad, additional_data); + std::vector > quad_hp; + for (unsigned int q=0; q(quad[q])); + internal_reinit(mapping, dof_handler,constraint,locally_owned_set, + quad_hp, additional_data); }