From 0e83cd68fface613272a904375efec5b3f33ef53 Mon Sep 17 00:00:00 2001
From: Alexander Grayver <agrayver@erdw.ethz.ch>
Date: Fri, 9 Oct 2015 18:07:20 +0200
Subject: [PATCH] Minor fixes

---
 source/dofs/dof_tools_constraints.cc            | 17 ++++++++++++-----
 ...ntergrid_transfer_representation_parallel.cc |  2 +-
 ...fer_representation_parallel.mpirun=3.output} |  0
 3 files changed, 13 insertions(+), 6 deletions(-)
 rename tests/distributed_grids/{intergrid_transfer_representation_parallel.output => intergrid_transfer_representation_parallel.mpirun=3.output} (100%)

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<dim,spacedim>                      &coarse_fe,
                                     const std::vector<types::global_dof_index>             &weight_mapping,
-                                    std::vector<std::map<types::global_dof_index, float> > &weights)
+                                    std::vector<std::map<types::global_dof_index, float> > &weights,
+                                    bool is_called_in_parallel)
       {
         unsigned int pos = 0;
         for (unsigned int local_dof=0; local_dof<copy_data.dofs_per_cell; ++local_dof)
@@ -2667,9 +2668,12 @@ namespace DoFTools
                         weights[wi][wj] = copy_data.global_parameter_representation[pos](i);
                       }
                   }
-              //else
-              //  Assert (copy_data.global_parameter_representation[pos](i) == 0,
-              //          ExcInternalError());
+                else
+                  // Note that when this function operates with distributed
+                  // fine grid, this assertion is switched off since the
+                  // condition does not necessarily hold
+                  Assert (copy_data.global_parameter_representation[pos](i) == 0 || is_called_in_parallel,
+                          ExcInternalError());
               ++pos;
             }
 
@@ -2704,6 +2708,7 @@ namespace DoFTools
 
         copy_data.global_parameter_representation.resize(n_interesting_dofs);
 
+        bool is_called_in_parallel = false;
         for (size_t i=0; i<copy_data.global_parameter_representation.size(); ++i)
           {
 #ifdef DEAL_II_WITH_MPI
@@ -2714,6 +2719,7 @@ namespace DoFTools
                   dynamic_cast<const typename dealii::parallel::Triangulation<dim, spacedim>&>
                   (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
-- 
2.39.5