From af94be50236484013f5270562f8ca58825ac4457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= <Bard.Skaflestad@sintef.no>
Date: Wed, 1 Jun 2022 14:34:28 +0200
Subject: [PATCH] Use Consistent Grid Views for Transmissibility Calculation

There was an implied assumption that the "gridv" parameter would
coincide with "grid_->leafGridView()".  Make this assumption
explicit.
---
 ebos/eclcpgridvanguard.hh        | 2 +-
 ebos/eclgenericcpgridvanguard.cc | 3 +--
 ebos/eclgenericcpgridvanguard.hh | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ebos/eclcpgridvanguard.hh b/ebos/eclcpgridvanguard.hh
index 34b0439c8..c11541955 100644
--- a/ebos/eclcpgridvanguard.hh
+++ b/ebos/eclcpgridvanguard.hh
@@ -134,7 +134,7 @@ public:
 #if HAVE_MPI
         this->doLoadBalance_(this->edgeWeightsMethod(), this->ownersFirst(),
                              this->serialPartitioning(), this->enableDistributedWells(),
-                             this->zoltanImbalanceTol(), this->gridView(),
+                             this->zoltanImbalanceTol(),
                              this->schedule(), this->centroids_,
                              this->eclState(), this->parallelWells_, this->numJacobiBlocks());
 #endif
diff --git a/ebos/eclgenericcpgridvanguard.cc b/ebos/eclgenericcpgridvanguard.cc
index 2692c3cb4..4116a245b 100644
--- a/ebos/eclgenericcpgridvanguard.cc
+++ b/ebos/eclgenericcpgridvanguard.cc
@@ -78,7 +78,6 @@ void EclGenericCpGridVanguard<ElementMapper,GridView,Scalar>::doLoadBalance_(Dun
                                                                              bool serialPartitioning,
                                                                              bool enableDistributedWells,
                                                                              double zoltanImbalanceTol,
-                                                                             const GridView& gridv,
                                                                              const Schedule& schedule,
                                                                              std::vector<double>& centroids,
                                                                              EclipseState& eclState1,
@@ -108,7 +107,7 @@ void EclGenericCpGridVanguard<ElementMapper,GridView,Scalar>::doLoadBalance_(Dun
         grid_->comm().broadcast(&loadBalancerSet, 1, 0);
         if (!loadBalancerSet){
             faceTrans.resize(numFaces, 0.0);
-            ElementMapper elemMapper(gridv, Dune::mcmgElementLayout());
+            ElementMapper elemMapper(gridView, Dune::mcmgElementLayout());
             auto elemIt = gridView.template begin</*codim=*/0>();
             const auto& elemEndIt = gridView.template end</*codim=*/0>();
             for (; elemIt != elemEndIt; ++ elemIt) {
diff --git a/ebos/eclgenericcpgridvanguard.hh b/ebos/eclgenericcpgridvanguard.hh
index 13a7172e0..29320beab 100644
--- a/ebos/eclgenericcpgridvanguard.hh
+++ b/ebos/eclgenericcpgridvanguard.hh
@@ -115,7 +115,7 @@ protected:
     void doLoadBalance_(Dune::EdgeWeightMethod edgeWeightsMethod,
                         bool ownersFirst, bool serialPartitioning,
                         bool enableDistributedWells, double zoltanImbalanceTol,
-                        const GridView& gridv, const Schedule& schedule,
+                        const Schedule& schedule,
                         std::vector<double>& centroids,
                         EclipseState& eclState,
                         EclGenericVanguard::ParallelWellStruct& parallelWells,