Merge pull request #14903 from bergbauer/neighboring_cell_code_path

Select correct code path for neighbor elements in FEEvaluation
dealii · Mar 20, 2023 · 722c55a · 722c55a
2 parents 772fa16 + e458bde
commit 722c55a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
@@ -3422,9 +3422,7 @@ FEEvaluationBase<dim, n_components_, Number, is_face, VectorizedArrayType>::
                          internal::is_vectorizable<VectorType, Number>::value>
     vector_selector;
 
-  const bool is_neighbor_cells = !is_face && !this->is_interior_face();
-  const bool use_vectorized_path =
-    !(masking_is_active || is_neighbor_cells || has_hn_constraints);
+  const bool use_vectorized_path = !(masking_is_active || has_hn_constraints);
 
   const std::size_t dofs_per_component = this->data->dofs_per_component_on_cell;
   std::array<VectorizedArrayType *, n_components> values_dofs;

diff --git a/tests/matrix_free/fe_evaluation_shift.cc b/tests/matrix_free/fe_evaluation_shift.cc
@@ -185,7 +185,7 @@ namespace dealii
 
     this->cell_type =
       this->matrix_free->get_mapping_info().cell_type[cell_batch_index];
-    this->cell                 = cell_batch_index;
+    this->cell                 = numbers::invalid_unsigned_int;
     this->face_orientations[0] = 0;
     this->subface_index        = GeometryInfo<dim>::max_children_per_cell;
     this->face_numbers[0]      = face_number;