From 61f80f0815123495125256e8383177f5854e0de6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 1 Dec 2017 16:39:46 -0700 Subject: [PATCH] Fix a number of failing tests. These tests, for a variety of reasons, no longer compiled. I believe that most of the issues were introduced in #5547. This fixes them. --- tests/matrix_free/matrix_vector_19.cc | 8 ++++---- tests/mpi/locally_owned_subdomain_01.cc | 4 ++-- tests/physics/step-18-rotation_matrix.cc | 24 ++++++++++++------------ tests/physics/step-18.cc | 24 ++++++++++++------------ 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/matrix_free/matrix_vector_19.cc b/tests/matrix_free/matrix_vector_19.cc index 95c846ff36..cf53451faf 100644 --- a/tests/matrix_free/matrix_vector_19.cc +++ b/tests/matrix_free/matrix_vector_19.cc @@ -47,10 +47,10 @@ void test () typedef double number; parallel::shared::Triangulation - triangulation (MPI_COMM_WORLD, - ::Triangulation::none, - false, - parallel::shared::Triangulation::partition_metis); + tria (MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis); GridGenerator::hyper_cube (tria); tria.refine_global(1); typename Triangulation::active_cell_iterator diff --git a/tests/mpi/locally_owned_subdomain_01.cc b/tests/mpi/locally_owned_subdomain_01.cc index 1f9944f2c3..6e655c485d 100644 --- a/tests/mpi/locally_owned_subdomain_01.cc +++ b/tests/mpi/locally_owned_subdomain_01.cc @@ -37,9 +37,9 @@ int main (int argc, char *argv[]) { parallel::shared::Triangulation<1> tria (MPI_COMM_WORLD, - ::Triangulation::none, + ::Triangulation<1>::none, false, - parallel::shared::Triangulation::partition_metis); + parallel::shared::Triangulation<1>::partition_metis); deallog << tria.locally_owned_subdomain() << std::endl; } diff --git a/tests/physics/step-18-rotation_matrix.cc b/tests/physics/step-18-rotation_matrix.cc index c7fef61124..e7fd5e81fa 100644 --- a/tests/physics/step-18-rotation_matrix.cc +++ b/tests/physics/step-18-rotation_matrix.cc @@ -281,18 +281,18 @@ namespace Step18 template TopLevel::TopLevel () : - triangulation((MPI_COMM_WORLD, - ::Triangulation::none, - false, - parallel::shared::Triangulation::partition_metis), - fe (FE_Q(1), dim), - dof_handler (triangulation), - quadrature_formula (2), - mpi_communicator (MPI_COMM_WORLD), - n_mpi_processes (Utilities::MPI::n_mpi_processes(mpi_communicator)), - this_mpi_process (Utilities::MPI::this_mpi_process(mpi_communicator)), - pcout (std::cout, this_mpi_process == 0), - monitored_vertex_first_dof(0) + triangulation(MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis), + fe (FE_Q(1), dim), + dof_handler (triangulation), + quadrature_formula (2), + mpi_communicator (MPI_COMM_WORLD), + n_mpi_processes (Utilities::MPI::n_mpi_processes(mpi_communicator)), + this_mpi_process (Utilities::MPI::this_mpi_process(mpi_communicator)), + pcout (std::cout, this_mpi_process == 0), + monitored_vertex_first_dof(0) {} template TopLevel::~TopLevel () diff --git a/tests/physics/step-18.cc b/tests/physics/step-18.cc index 061afa0145..9419b37055 100644 --- a/tests/physics/step-18.cc +++ b/tests/physics/step-18.cc @@ -308,18 +308,18 @@ namespace Step18 template TopLevel::TopLevel () : - triangulation((MPI_COMM_WORLD, - ::Triangulation::none, - false, - parallel::shared::Triangulation::partition_metis), - fe (FE_Q(1), dim), - dof_handler (triangulation), - quadrature_formula (2), - mpi_communicator (MPI_COMM_WORLD), - n_mpi_processes (Utilities::MPI::n_mpi_processes(mpi_communicator)), - this_mpi_process (Utilities::MPI::this_mpi_process(mpi_communicator)), - pcout (std::cout, this_mpi_process == 0), - monitored_vertex_first_dof(0) + triangulation(MPI_COMM_WORLD, + ::Triangulation::none, + false, + parallel::shared::Triangulation::partition_metis), + fe (FE_Q(1), dim), + dof_handler (triangulation), + quadrature_formula (2), + mpi_communicator (MPI_COMM_WORLD), + n_mpi_processes (Utilities::MPI::n_mpi_processes(mpi_communicator)), + this_mpi_process (Utilities::MPI::this_mpi_process(mpi_communicator)), + pcout (std::cout, this_mpi_process == 0), + monitored_vertex_first_dof(0) {} template TopLevel::~TopLevel () -- 2.39.5