OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 09:22:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3929 from bska/remove-gridv-param

Browse Source 
Use Consistent Grid Views for Transmissibility Calculation
This commit is contained in:
Markus Blatt authored and GitHub committed 2022-06-01 16:02:16 +02:00
2 parents 26a9582ece af94be5023
commit f225521680
3 files changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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