From: Daniel Arndt Date: Sun, 8 Jan 2017 21:56:29 +0000 (+0100) Subject: Automatically set MPI_Comm in MatrixFree X-Git-Tag: v8.5.0-rc1~279^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3750%2Fhead;p=dealii.git Automatically set MPI_Comm in MatrixFree --- diff --git a/doc/news/changes/minor/2017DanielArndt20170108DanielArndt b/doc/news/changes/minor/2017DanielArndt20170108DanielArndt new file mode 100644 index 0000000000..533ffc2aa8 --- /dev/null +++ b/doc/news/changes/minor/2017DanielArndt20170108DanielArndt @@ -0,0 +1,4 @@ +Improved: The MPI_Comm used in MatrixFree is not configurable via +AdditionalData anymore but set to the MPI_Comm of the Triangulation. +
+(Daniel Arndt, 2017/01/08) diff --git a/examples/step-37/step-37.cc b/examples/step-37/step-37.cc index a12ae9601e..4360a1f021 100644 --- a/examples/step-37/step-37.cc +++ b/examples/step-37/step-37.cc @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------- * - * Copyright (C) 2009 - 2016 by the deal.II authors + * Copyright (C) 2009 - 2017 by the deal.II authors * * This file is part of the deal.II library. * @@ -840,7 +840,6 @@ namespace Step37 MatrixFree::AdditionalData::none; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); - additional_data.mpi_communicator = MPI_COMM_WORLD; system_mf_storage.reinit (dof_handler, constraints, QGauss<1>(fe.degree+1), additional_data); } @@ -889,7 +888,6 @@ namespace Step37 MatrixFree::AdditionalData::none; additional_data.mapping_update_flags = (update_gradients | update_JxW_values | update_quadrature_points); - additional_data.mpi_communicator = MPI_COMM_WORLD; additional_data.level_mg_handler = level; mg_mf_storage[level].reinit(dof_handler, level_constraints, diff --git a/examples/step-48/step-48.cc b/examples/step-48/step-48.cc index df772ab2c1..40923dd087 100644 --- a/examples/step-48/step-48.cc +++ b/examples/step-48/step-48.cc @@ -1,6 +1,6 @@ /* --------------------------------------------------------------------- * - * Copyright (C) 2011 - 2016 by the deal.II authors + * Copyright (C) 2011 - 2017 by the deal.II authors * * This file is part of the deal.II library. * @@ -415,7 +415,6 @@ namespace Step48 QGaussLobatto<1> quadrature (fe_degree+1); typename MatrixFree::AdditionalData additional_data; - additional_data.mpi_communicator = MPI_COMM_WORLD; additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_partition; diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index b9515d756a..6538db9b1a 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2011 - 2016 by the deal.II authors +// Copyright (C) 2011 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -166,7 +166,30 @@ public: /** * Constructor for AdditionalData. */ - AdditionalData (const MPI_Comm mpi_communicator = MPI_COMM_SELF, + AdditionalData (const TasksParallelScheme tasks_parallel_scheme = partition_partition, + const unsigned int tasks_block_size = 0, + const UpdateFlags mapping_update_flags = update_gradients | update_JxW_values, + const unsigned int level_mg_handler = numbers::invalid_unsigned_int, + const bool store_plain_indices = true, + const bool initialize_indices = true, + const bool initialize_mapping = true) + : + tasks_parallel_scheme (tasks_parallel_scheme), + tasks_block_size (tasks_block_size), + mapping_update_flags (mapping_update_flags), + level_mg_handler (level_mg_handler), + store_plain_indices (store_plain_indices), + initialize_indices (initialize_indices), + initialize_mapping (initialize_mapping) + {}; + + /** + * Constructor for AdditionalData. + * + * @deprecated @p mpi_communicator should not be specified here + * since it is not used in the MatrixFree class. + */ + AdditionalData (const MPI_Comm mpi_communicator, const TasksParallelScheme tasks_parallel_scheme = partition_partition, const unsigned int tasks_block_size = 0, const UpdateFlags mapping_update_flags = update_gradients | update_JxW_values, @@ -183,15 +206,18 @@ public: store_plain_indices (store_plain_indices), initialize_indices (initialize_indices), initialize_mapping (initialize_mapping) - {}; + {} DEAL_II_DEPRECATED /** * Set the MPI communicator that the parallel layout of the operator * should be based upon. Defaults to MPI_COMM_SELF, but should be set to a * communicator similar to the one used for a distributed triangulation in * order to inform this class over all cells that are present. + * + * @deprecated This variable is not used anymore. The @p mpi_communicator + * is automatically set to the one used by the triangulation. */ - MPI_Comm mpi_communicator; + MPI_Comm mpi_communicator DEAL_II_DEPRECATED; /** * Set the scheme for task parallelism. There are four options available. diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index cf2b3bbfbc..67e5a93344 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2011 - 2016 by the deal.II authors +// Copyright (C) 2011 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -74,38 +74,6 @@ copy_from (const MatrixFree &v) -namespace internal -{ - template - void assert_communicator_equality (const dealii::Triangulation &tria, - const MPI_Comm &comm_mf) - { -#ifdef DEAL_II_WITH_MPI - const parallel::distributed::Triangulation *dist_tria = - dynamic_cast*>(&tria); - if (dist_tria != 0) - { - if (Utilities::MPI::job_supports_mpi()) - { - int communicators_same = 0; - const int ierr = MPI_Comm_compare (dist_tria->get_communicator(), comm_mf, - &communicators_same); - AssertThrowMPI (ierr); - Assert (communicators_same == MPI_IDENT || - communicators_same == MPI_CONGRUENT, - ExcMessage ("MPI communicator in parallel::distributed::Triangulation " - "and matrix free class must be the same!")); - } - } -#else - (void)tria; - (void)comm_mf; -#endif - } -} - - - template void MatrixFree:: internal_reinit(const Mapping &mapping, @@ -138,11 +106,14 @@ internal_reinit(const Mapping &mapping, AssertDimension (dof_handler.size(), locally_owned_set.size()); // set variables that are independent of FE - internal::assert_communicator_equality (dof_handler[0]->get_triangulation(), - additional_data.mpi_communicator); - size_info.communicator = additional_data.mpi_communicator; if (Utilities::MPI::job_supports_mpi() == true) { + const parallel::Triangulation *dist_tria = + dynamic_cast*> + (&(dof_handler[0]->get_triangulation())); + size_info.communicator = dist_tria != 0 ? + dist_tria->get_communicator() : + MPI_COMM_SELF; size_info.my_pid = Utilities::MPI::this_mpi_process(size_info.communicator); size_info.n_procs = @@ -150,6 +121,7 @@ internal_reinit(const Mapping &mapping, } else { + size_info.communicator = MPI_COMM_SELF; size_info.my_pid = 0; size_info.n_procs = 1; } @@ -268,11 +240,14 @@ internal_reinit(const Mapping &mapping, AssertDimension (dof_handler.size(), locally_owned_set.size()); // set variables that are independent of FE - internal::assert_communicator_equality (dof_handler[0]->get_triangulation(), - additional_data.mpi_communicator); - size_info.communicator = additional_data.mpi_communicator; if (Utilities::MPI::job_supports_mpi() == true) { + const parallel::Triangulation *dist_tria = + dynamic_cast*> + (&(dof_handler[0]->get_triangulation())); + size_info.communicator = dist_tria != 0 ? + dist_tria->get_communicator() : + MPI_COMM_SELF; size_info.my_pid = Utilities::MPI::this_mpi_process(size_info.communicator); size_info.n_procs = @@ -280,6 +255,7 @@ internal_reinit(const Mapping &mapping, } else { + size_info.communicator = MPI_COMM_SELF; size_info.my_pid = 0; size_info.n_procs = 1; } diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index a89258c0c4..920d959b71 100644 --- a/include/deal.II/numerics/vector_tools.templates.h +++ b/include/deal.II/numerics/vector_tools.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2005 - 2016 by the deal.II authors +// Copyright (C) 2005 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -935,9 +935,6 @@ namespace VectorTools typename MatrixFree::AdditionalData additional_data; additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; - if (const parallel::Triangulation *parallel_tria = - dynamic_cast*>(&dof.get_tria())) - additional_data.mpi_communicator = parallel_tria->get_communicator(); additional_data.mapping_update_flags = (update_values | update_JxW_values); MatrixFree matrix_free; matrix_free.reinit (mapping, dof, constraints, @@ -1184,9 +1181,6 @@ namespace VectorTools typename MatrixFree::AdditionalData additional_data; additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; - if (const parallel::Triangulation *parallel_tria = - dynamic_cast*>(&dof.get_tria())) - additional_data.mpi_communicator = parallel_tria->get_communicator(); additional_data.mapping_update_flags = (update_values | update_JxW_values); MatrixFree matrix_free; matrix_free.reinit (mapping, dof, constraints, diff --git a/tests/arpack/step-36_parpack_mf.cc b/tests/arpack/step-36_parpack_mf.cc index 6d2c95e04d..0bfbef63fa 100644 --- a/tests/arpack/step-36_parpack_mf.cc +++ b/tests/arpack/step-36_parpack_mf.cc @@ -95,7 +95,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = mpi_communicator; data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; data.mapping_update_flags = update_values | update_gradients | update_JxW_values; diff --git a/tests/matrix_free/laplace_operator_01.cc b/tests/matrix_free/laplace_operator_01.cc index 9675dc7bf3..6ca7be6bae 100644 --- a/tests/matrix_free/laplace_operator_01.cc +++ b/tests/matrix_free/laplace_operator_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -101,7 +101,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/laplace_operator_02.cc b/tests/matrix_free/laplace_operator_02.cc index 0d3f396bf9..0f95334d89 100644 --- a/tests/matrix_free/laplace_operator_02.cc +++ b/tests/matrix_free/laplace_operator_02.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -145,7 +145,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/mass_operator_01.cc b/tests/matrix_free/mass_operator_01.cc index 4cb4d31ba9..43d7d4cd7f 100644 --- a/tests/matrix_free/mass_operator_01.cc +++ b/tests/matrix_free/mass_operator_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -109,7 +109,6 @@ void test () { const QGauss<1> quad (fe_degree+2); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/mass_operator_02.cc b/tests/matrix_free/mass_operator_02.cc index 34a3c0c38f..9d356780a1 100644 --- a/tests/matrix_free/mass_operator_02.cc +++ b/tests/matrix_free/mass_operator_02.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -73,7 +73,6 @@ void test () { const QGauss<1> quad (fe_degree+2); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/mass_operator_03.cc b/tests/matrix_free/mass_operator_03.cc index c142f2fd6d..bd44120313 100644 --- a/tests/matrix_free/mass_operator_03.cc +++ b/tests/matrix_free/mass_operator_03.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -72,7 +72,6 @@ void test () { const QGauss<1> quad (fe_degree+2); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/matrix_vector_10.cc b/tests/matrix_free/matrix_vector_10.cc index 731fc34db6..8c0c6dea32 100644 --- a/tests/matrix_free/matrix_vector_10.cc +++ b/tests/matrix_free/matrix_vector_10.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2013 - 2015 by the deal.II authors +// Copyright (C) 2013 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -109,7 +109,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/matrix_vector_11.cc b/tests/matrix_free/matrix_vector_11.cc index e1bae7227f..cbef46fece 100644 --- a/tests/matrix_free/matrix_vector_11.cc +++ b/tests/matrix_free/matrix_vector_11.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2013 - 2015 by the deal.II authors +// Copyright (C) 2013 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -102,7 +102,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; @@ -130,7 +129,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; if (parallel_option == 0) { data.tasks_parallel_scheme = diff --git a/tests/matrix_free/matrix_vector_12.cc b/tests/matrix_free/matrix_vector_12.cc index 5e4cf2ad3a..d7b9576c35 100644 --- a/tests/matrix_free/matrix_vector_12.cc +++ b/tests/matrix_free/matrix_vector_12.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2013 - 2015 by the deal.II authors +// Copyright (C) 2013 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -164,7 +164,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/matrix_vector_13.cc b/tests/matrix_free/matrix_vector_13.cc index f8d863cc32..408efee6fb 100644 --- a/tests/matrix_free/matrix_vector_13.cc +++ b/tests/matrix_free/matrix_vector_13.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2013 - 2015 by the deal.II authors +// Copyright (C) 2013 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -164,7 +164,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/matrix_vector_19.cc b/tests/matrix_free/matrix_vector_19.cc index fd1cf7fc3b..46b23d52a8 100644 --- a/tests/matrix_free/matrix_vector_19.cc +++ b/tests/matrix_free/matrix_vector_19.cc @@ -99,7 +99,6 @@ void test () { const QGauss<1> quad (fe_degree+1); typename MatrixFree::AdditionalData data; - data.mpi_communicator = MPI_COMM_WORLD; data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; data.tasks_block_size = 7; diff --git a/tests/matrix_free/parallel_multigrid.cc b/tests/matrix_free/parallel_multigrid.cc index feebc0e546..5338d75164 100644 --- a/tests/matrix_free/parallel_multigrid.cc +++ b/tests/matrix_free/parallel_multigrid.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 - 2016 by the deal.II authors +// Copyright (C) 2014 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -62,7 +62,6 @@ public: typename MatrixFree::AdditionalData addit_data; addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.level_mg_handler = level; - addit_data.mpi_communicator = MPI_COMM_WORLD; // extract the constraints due to Dirichlet boundary conditions ConstraintMatrix constraints; diff --git a/tests/matrix_free/parallel_multigrid_02.cc b/tests/matrix_free/parallel_multigrid_02.cc index d3c49daaa0..4742e0fda6 100644 --- a/tests/matrix_free/parallel_multigrid_02.cc +++ b/tests/matrix_free/parallel_multigrid_02.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -118,7 +118,6 @@ void do_test (const DoFHandler &dof) typename MatrixFree::AdditionalData fine_level_additional_data; fine_level_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - fine_level_additional_data.mpi_communicator = MPI_COMM_WORLD; fine_level_data.reinit (mapping, dof, constraints, QGauss<1>(n_q_points_1d), fine_level_additional_data); @@ -144,7 +143,6 @@ void do_test (const DoFHandler &dof) { typename MatrixFree::AdditionalData mg_additional_data; mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; - mg_additional_data.mpi_communicator = MPI_COMM_WORLD; mg_additional_data.level_mg_handler = level; ConstraintMatrix level_constraints; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_01.cc b/tests/matrix_free/parallel_multigrid_adaptive_01.cc index f50dbf9042..c6b5ee06ea 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_01.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_01.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 - 2016 by the deal.II authors +// Copyright (C) 2014 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -65,7 +65,6 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; addit_data.level_mg_handler = level; - addit_data.mpi_communicator = MPI_COMM_WORLD; ConstraintMatrix constraints; if (level == numbers::invalid_unsigned_int) { diff --git a/tests/matrix_free/parallel_multigrid_adaptive_02.cc b/tests/matrix_free/parallel_multigrid_adaptive_02.cc index f282f8463c..bebcc0cc79 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_02.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_02.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -156,7 +156,6 @@ void do_test (const DoFHandler &dof) typename MatrixFree::AdditionalData fine_level_additional_data; fine_level_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; fine_level_additional_data.tasks_block_size = 3; - fine_level_additional_data.mpi_communicator = MPI_COMM_WORLD; fine_level_data.reinit (mapping, dof, constraints, QGauss<1>(n_q_points_1d), fine_level_additional_data); @@ -193,7 +192,6 @@ void do_test (const DoFHandler &dof) typename MatrixFree::AdditionalData mg_additional_data; mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; mg_additional_data.tasks_block_size = 3; - mg_additional_data.mpi_communicator = MPI_COMM_WORLD; mg_additional_data.level_mg_handler = level; ConstraintMatrix level_constraints; diff --git a/tests/matrix_free/parallel_multigrid_adaptive_03.cc b/tests/matrix_free/parallel_multigrid_adaptive_03.cc index 101f0bb3de..5ef83e664d 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_03.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_03.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 - 2016 by the deal.II authors +// Copyright (C) 2014 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -70,7 +70,6 @@ public: addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.tasks_block_size = 3; addit_data.level_mg_handler = level; - addit_data.mpi_communicator = MPI_COMM_WORLD; ConstraintMatrix constraints; if (level == numbers::invalid_unsigned_int) { diff --git a/tests/matrix_free/parallel_multigrid_adaptive_04.cc b/tests/matrix_free/parallel_multigrid_adaptive_04.cc index 168c2a6090..e5b9489755 100644 --- a/tests/matrix_free/parallel_multigrid_adaptive_04.cc +++ b/tests/matrix_free/parallel_multigrid_adaptive_04.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -156,7 +156,6 @@ void do_test (const DoFHandler &dof) typename MatrixFree::AdditionalData fine_level_additional_data; fine_level_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; fine_level_additional_data.tasks_block_size = 3; - fine_level_additional_data.mpi_communicator = MPI_COMM_WORLD; fine_level_data.reinit (mapping, dof, constraints, QGauss<1>(n_q_points_1d), fine_level_additional_data); @@ -193,7 +192,6 @@ void do_test (const DoFHandler &dof) typename MatrixFree::AdditionalData mg_additional_data; mg_additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; mg_additional_data.tasks_block_size = 3; - mg_additional_data.mpi_communicator = MPI_COMM_WORLD; mg_additional_data.level_mg_handler = level; ConstraintMatrix level_constraints; diff --git a/tests/matrix_free/parallel_multigrid_mf.cc b/tests/matrix_free/parallel_multigrid_mf.cc index c7dc7aaef7..1b12b6c988 100644 --- a/tests/matrix_free/parallel_multigrid_mf.cc +++ b/tests/matrix_free/parallel_multigrid_mf.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2014 - 2016 by the deal.II authors +// Copyright (C) 2014 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -61,7 +61,6 @@ public: typename MatrixFree::AdditionalData addit_data; addit_data.tasks_parallel_scheme = MatrixFree::AdditionalData::none; addit_data.level_mg_handler = level; - addit_data.mpi_communicator = MPI_COMM_WORLD; // extract the constraints due to Dirichlet boundary conditions ConstraintMatrix constraints; diff --git a/tests/matrix_free/step-48.cc b/tests/matrix_free/step-48.cc index 68409f2387..11a30b0321 100644 --- a/tests/matrix_free/step-48.cc +++ b/tests/matrix_free/step-48.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2012 - 2015 by the deal.II authors +// Copyright (C) 2012 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -295,7 +295,6 @@ namespace Step48 QGaussLobatto<1> quadrature (fe_degree+1); typename MatrixFree::AdditionalData additional_data; - additional_data.mpi_communicator = MPI_COMM_WORLD; additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_partition; diff --git a/tests/matrix_free/step-48c.cc b/tests/matrix_free/step-48c.cc index 943f261da1..d9c344c238 100644 --- a/tests/matrix_free/step-48c.cc +++ b/tests/matrix_free/step-48c.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2012 - 2015 by the deal.II authors +// Copyright (C) 2012 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -266,7 +266,6 @@ namespace Step48 QGaussLobatto<1> quadrature (fe_degree+1); typename MatrixFree::AdditionalData additional_data; - additional_data.mpi_communicator = MPI_COMM_WORLD; additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_partition; diff --git a/tests/numerics/project_parallel_qpmf_common.h b/tests/numerics/project_parallel_qpmf_common.h index 3f033ba201..6fcab64d72 100644 --- a/tests/numerics/project_parallel_qpmf_common.h +++ b/tests/numerics/project_parallel_qpmf_common.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2016 by the deal.II authors +// Copyright (C) 2016 - 2017 by the deal.II authors // // This file is part of the deal.II library. // @@ -118,7 +118,6 @@ void do_project (const parallel::distributed::Triangulation &triangulation, typename MatrixFree::AdditionalData additional_data; additional_data.tasks_parallel_scheme = MatrixFree::AdditionalData::partition_color; - additional_data.mpi_communicator = MPI_COMM_WORLD; additional_data.mapping_update_flags = update_values | update_JxW_values | update_quadrature_points; MatrixFree data; data.reinit (dof_handler, constraints, quadrature_formula_1d, additional_data);