From: Peter Munch <peterrmuench@gmail.com> Date: Thu, 25 Jun 2020 07:57:38 +0000 (+0200) Subject: Fix two tests X-Git-Tag: v9.3.0-rc1~1372^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10602%2Fhead;p=dealii.git Fix two tests --- 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> ¤t_face_values, - const TriaIterator<DoFCellAccessor<DoFHandler<dim>, false>> - & neighbor_cell, + const TriaActiveIterator<DoFCellAccessor<dim, dim, false>> ¤t_cell, + FEFaceValues<dim> & current_face_values, + const TriaIterator<DoFCellAccessor<dim, dim, false>> &neighbor_cell, FEFaceValues<dim> & neighbor_face_values, FullMatrix<double> ¤t_to_current_flux, FullMatrix<double> ¤t_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> ¤t_face_values, - const TriaIterator<DoFCellAccessor<DoFHandler<dim>, false>> &neighbor_cell, - FEFaceValues<dim> & neighbor_face_values, + const TriaActiveIterator<DoFCellAccessor<dim, dim, false>> ¤t_cell, + FEFaceValues<dim> & current_face_values, + const TriaIterator<DoFCellAccessor<dim, dim, false>> &neighbor_cell, + FEFaceValues<dim> & neighbor_face_values, FullMatrix<double> ¤t_to_current_flux, FullMatrix<double> ¤t_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> ¤t_face_values, - const TriaIterator<DoFCellAccessor<DoFHandler<dim>, false>> - & neighbor_cell, + const TriaActiveIterator<DoFCellAccessor<dim, dim, false>> ¤t_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> ¤t_face_values, - const TriaIterator<DoFCellAccessor<DoFHandler<dim>, false>> &neighbor_cell, - FEFaceValuesBase<dim> &neighbor_face_values, + const TriaActiveIterator<DoFCellAccessor<dim, dim, false>> ¤t_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*/,