From: Peter Munch Date: Wed, 19 Jan 2022 16:19:29 +0000 (+0100) Subject: Merge pull request #13252 from peterrum/fe_eval_quadrature_points X-Git-Tag: v9.4.0-rc1~586 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bda81b45f2dd5a97a9701614a69677ac55d7805d;p=dealii.git Merge pull request #13252 from peterrum/fe_eval_quadrature_points Move quadrature_points into FEEvalData --- bda81b45f2dd5a97a9701614a69677ac55d7805d diff --cc include/deal.II/matrix_free/fe_evaluation.h index c8ddf1ea76,7e4bcae909..6d9b4290a7 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@@ -6887,13 -6861,14 +6881,18 @@@ FEEvaluationjacobian_gradients = this->mapping_data->jacobian_gradients[0].data() + offsets; - for (unsigned int i = 0; i < VectorizedArrayType::size(); ++i) + unsigned int i = 0; + for (; i < this->matrix_free->n_active_entries_per_cell_batch(this->cell); + ++i) this->cell_ids[i] = cell_index * VectorizedArrayType::size() + i; + for (; i < VectorizedArrayType::size(); ++i) + this->cell_ids[i] = numbers::invalid_unsigned_int; + if (this->mapping_data->quadrature_points.empty() == false) + this->quadrature_points = + &this->mapping_data->quadrature_points + [this->mapping_data->quadrature_point_offsets[this->cell]]; + # ifdef DEBUG this->is_reinitialized = true; this->dof_values_initialized = false;