From 33cfbc48b86a7171d6763dd25caaf4df806a04ba Mon Sep 17 00:00:00 2001
From: Peter Munch <peterrmuench@gmail.com>
Date: Thu, 25 Jun 2020 09:57:38 +0200
Subject: [PATCH] Fix two tests

---
 tests/mpi/distribute_flux_sparsity_pattern.cc | 17 +++++++----------
 tests/trilinos/elide_zeros.cc                 | 17 +++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/tests/mpi/distribute_flux_sparsity_pattern.cc b/tests/mpi/distribute_flux_sparsity_pattern.cc
index 6340718f53..924b0afcde 100644
--- a/tests/mpi/distribute_flux_sparsity_pattern.cc
+++ b/tests/mpi/distribute_flux_sparsity_pattern.cc
@@ -63,11 +63,9 @@ namespace LinearAdvectionTest
     assemble_system();
     void
     calculate_flux_terms(
-      const TriaActiveIterator<DoFCellAccessor<DoFHandler<dim>, false>>
-        &                current_cell,
-      FEFaceValues<dim> &current_face_values,
-      const TriaIterator<DoFCellAccessor<DoFHandler<dim>, false>>
-        &                 neighbor_cell,
+      const TriaActiveIterator<DoFCellAccessor<dim, dim, false>> &current_cell,
+      FEFaceValues<dim> &                                   current_face_values,
+      const TriaIterator<DoFCellAccessor<dim, dim, false>> &neighbor_cell,
       FEFaceValues<dim> & neighbor_face_values,
       FullMatrix<double> &current_to_current_flux,
       FullMatrix<double> &current_to_neighbor_flux,
@@ -146,11 +144,10 @@ namespace LinearAdvectionTest
   template <int dim>
   void
   AdvectionProblem<dim>::calculate_flux_terms(
-    const TriaActiveIterator<DoFCellAccessor<DoFHandler<dim>, false>>
-      &                current_cell,
-    FEFaceValues<dim> &current_face_values,
-    const TriaIterator<DoFCellAccessor<DoFHandler<dim>, false>> &neighbor_cell,
-    FEFaceValues<dim> & neighbor_face_values,
+    const TriaActiveIterator<DoFCellAccessor<dim, dim, false>> &current_cell,
+    FEFaceValues<dim> &                                   current_face_values,
+    const TriaIterator<DoFCellAccessor<dim, dim, false>> &neighbor_cell,
+    FEFaceValues<dim> &                                   neighbor_face_values,
     FullMatrix<double> &current_to_current_flux,
     FullMatrix<double> &current_to_neighbor_flux,
     FullMatrix<double> &neighbor_to_current_flux,
diff --git a/tests/trilinos/elide_zeros.cc b/tests/trilinos/elide_zeros.cc
index 14dfd3b093..4fded865db 100644
--- a/tests/trilinos/elide_zeros.cc
+++ b/tests/trilinos/elide_zeros.cc
@@ -103,11 +103,9 @@ namespace LinearAdvectionTest
     assemble_system();
     void
     calculate_flux_terms(
-      const TriaActiveIterator<DoFCellAccessor<DoFHandler<dim>, false>>
-        &                current_cell,
-      FEFaceValues<dim> &current_face_values,
-      const TriaIterator<DoFCellAccessor<DoFHandler<dim>, false>>
-        &                    neighbor_cell,
+      const TriaActiveIterator<DoFCellAccessor<dim, dim, false>> &current_cell,
+      FEFaceValues<dim> &                                   current_face_values,
+      const TriaIterator<DoFCellAccessor<dim, dim, false>> &neighbor_cell,
       FEFaceValuesBase<dim> &neighbor_face_values,
       FullMatrix<double> &   current_to_current_flux,
       FullMatrix<double> &   current_to_neighbor_flux,
@@ -184,11 +182,10 @@ namespace LinearAdvectionTest
   template <int dim>
   void
   AdvectionProblem<dim>::calculate_flux_terms(
-    const TriaActiveIterator<DoFCellAccessor<DoFHandler<dim>, false>>
-      &                current_cell,
-    FEFaceValues<dim> &current_face_values,
-    const TriaIterator<DoFCellAccessor<DoFHandler<dim>, false>> &neighbor_cell,
-    FEFaceValuesBase<dim> &neighbor_face_values,
+    const TriaActiveIterator<DoFCellAccessor<dim, dim, false>> &current_cell,
+    FEFaceValues<dim> &                                   current_face_values,
+    const TriaIterator<DoFCellAccessor<dim, dim, false>> &neighbor_cell,
+    FEFaceValuesBase<dim> &                               neighbor_face_values,
     FullMatrix<double> & /*current_to_current_flux*/,
     FullMatrix<double> & /*current_to_neighbor_flux*/,
     FullMatrix<double> & /*neighbor_to_current_flux*/,
-- 
2.39.5