From: Alexander Grayver Date: Fri, 9 Oct 2015 16:07:20 +0000 (+0200) Subject: Minor fixes X-Git-Tag: v8.4.0-rc2~327^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e83cd68fface613272a904375efec5b3f33ef53;p=dealii.git Minor fixes --- diff --git a/source/dofs/dof_tools_constraints.cc b/source/dofs/dof_tools_constraints.cc index 81128949c8..cf74c4b2c6 100644 --- a/source/dofs/dof_tools_constraints.cc +++ b/source/dofs/dof_tools_constraints.cc @@ -2623,7 +2623,8 @@ namespace DoFTools const unsigned int coarse_component, const FiniteElement &coarse_fe, const std::vector &weight_mapping, - std::vector > &weights) + std::vector > &weights, + bool is_called_in_parallel) { unsigned int pos = 0; for (unsigned int local_dof=0; local_dof&> (coarse_to_fine_grid_map.get_destination_grid().get_tria ()); communicator = tria.get_communicator (); + is_called_in_parallel = true; } catch (std::bad_cast &exp) { @@ -2750,7 +2756,8 @@ namespace DoFTools coarse_component, std_cxx11::cref(coarse_grid.get_fe()), std_cxx11::cref(weight_mapping), - std_cxx11::ref(weights)), + std_cxx11::ref(weights), + is_called_in_parallel), scratch, copy_data); } diff --git a/tests/distributed_grids/intergrid_transfer_representation_parallel.cc b/tests/distributed_grids/intergrid_transfer_representation_parallel.cc index 3b4a7c8c38..03c63ed11e 100644 --- a/tests/distributed_grids/intergrid_transfer_representation_parallel.cc +++ b/tests/distributed_grids/intergrid_transfer_representation_parallel.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2013 - 2014 by the deal.II authors +// Copyright (C) 2013 - 2015 by the deal.II authors // // This file is part of the deal.II library. // diff --git a/tests/distributed_grids/intergrid_transfer_representation_parallel.output b/tests/distributed_grids/intergrid_transfer_representation_parallel.mpirun=3.output similarity index 100% rename from tests/distributed_grids/intergrid_transfer_representation_parallel.output rename to tests/distributed_grids/intergrid_transfer_representation_parallel.mpirun=3.output