Merge pull request #1049 from vkip/thconr_mpi_issue_fix

Fix thermal conductivity in parallel

Closes #726.

Author: bska

opm/grid/CpGrid.hpp

@@ -957,11 +957,13 @@ namespace Dune
                     const double* transmissibilities = nullptr, bool ownersFirst=false,
                     bool addCornerCells=false, int overlapLayers=1, int partitionMethod = Dune::PartitionMethod::zoltanGoG,
                     double imbalanceTol = 1.1,
-                    bool allowDistributedWells = false)
+                    bool allowDistributedWells = false,
+                    bool useTransToFilterOverlap = true)
         {
             auto ret = scatterGrid(method, ownersFirst, wells, possibleFutureConnections, serialPartitioning, transmissibilities,
                                    addCornerCells, overlapLayers, partitionMethod, imbalanceTol, allowDistributedWells,
-                                   /* input_cell_parts = */ std::vector<int>{}, /* level = */ 0);
+                                   /* input_cell_parts = */ std::vector<int>{}, /* level = */ 0,
+                                   useTransToFilterOverlap);
             using std::get;
             if (get<0>(ret))
             {
@@ -1478,7 +1480,8 @@ namespace Dune
                     double imbalanceTol = 1.1,
                     bool allowDistributedWells = true,
                     const std::vector<int>& input_cell_part = {},
-                    int level = -1);
+                    int level = -1,
+                    bool useTransToFilterOverlap = true);
 
         /** @brief The data stored in the grid.
          *

opm/grid/common/GridPartitioning.cpp

@@ -558,6 +558,7 @@ int addOverlapLayer([[maybe_unused]] const CpGrid& grid,
                     [[maybe_unused]] const Communication<Dune::MPIHelper::MPICommunicator>& cc,
                     [[maybe_unused]] bool addCornerCells,
                     [[maybe_unused]] const double* trans,
+                    [[maybe_unused]] bool useTransToFilterOverlap,
                     [[maybe_unused]] int layers,
                     [[maybe_unused]] int level)
 {
@@ -576,7 +577,7 @@ int addOverlapLayer([[maybe_unused]] const CpGrid& grid,
         int index = ix.index(*it);
         auto owner = cell_part[index];
         exportProcs.insert(std::make_pair(owner, 0));
-        if ( trans ) {
+        if ( trans && useTransToFilterOverlap ) {
             addOverlapLayerNoZeroTrans(grid, index, *it, owner, cell_part, exportList, addCornerCells, layers-1, trans, level);
         }
         else {

opm/grid/common/GridPartitioning.hpp

@@ -108,6 +108,7 @@ namespace Dune
     /// \param[in] cc The communication object
     /// \param[in] addCornerCells Switch for adding corner cells to overlap layer.
     /// \param[in] trans The transmissibilities on cell faces. When trans[i]==0, no overlap is added.
+    /// \param[in] useTransToFilterOverlap If true, zero transmissibility faces are skipped in overlap construction.
     /// \param[in] layers Number of overlap layers
     /// \param[in] level Indicating level grid that is partitioned. Default -1 for leaf grid view.
     int addOverlapLayer(const CpGrid& grid,
@@ -117,6 +118,7 @@ namespace Dune
                         const Communication<Dune::MPIHelper::MPICommunicator>& cc,
                         bool addCornerCells,
                         const double* trans,
+                        bool useTransToFilterOverlap = true,
                         int layers = 1,
                         int level = -1);
 

opm/grid/cpgrid/CpGrid.cpp

@@ -217,7 +217,8 @@ CpGrid::scatterGrid(EdgeWeightMethod method,
                     double imbalanceTol,
                     [[maybe_unused]] bool allowDistributedWells,
                     [[maybe_unused]] const std::vector<int>& input_cell_part,
-                    int level)
+                    int level,
+                    [[maybe_unused]] bool useTransToFilterOverlap)
 {
     // Silence any unused argument warnings that could occur with various configurations.
     static_cast<void>(wells);
@@ -397,6 +398,7 @@ CpGrid::scatterGrid(EdgeWeightMethod method,
                                                cc,
                                                addCornerCells,
                                                transmissibilities,
+                                               useTransToFilterOverlap,
                                                1 /*layers*/,
                                                level);
         // importList contains all the indices that will be here.