OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3238 from akva2/fix_equil_cart_mapper_regression

Browse Source 
fix regression: do not unconditionally dereference equilCartMapper
This commit is contained in:
Bård Skaflestad
2021-05-11 16:36:56 +02:00
committed by GitHub
parent a192ccb417 c7c29483e7
commit aea80db23a
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ebos/collecttoiorank.cc
View File

@@ -672,10 +672,10 @@ private:
template <class Grid, class EquilGrid, class GridView>
CollectDataToIORank<Grid,EquilGrid,GridView>::
CollectDataToIORank(const Grid& grid, const EquilGrid& equilGrid,
CollectDataToIORank(const Grid& grid, const EquilGrid* equilGrid,
const GridView& localGridView,
const Dune::CartesianIndexMapper<Grid>& cartMapper,
const Dune::CartesianIndexMapper<EquilGrid>& equilCartMapper)
const Dune::CartesianIndexMapper<EquilGrid>* equilCartMapper)
: toIORankComm_()
{
// index maps only have to be build when reordering is needed
@@ -706,9 +706,9 @@ CollectDataToIORank(const Grid& grid, const EquilGrid& equilGrid,
// We need a mapping from local to global grid, here we
// use equilGrid which represents a view on the global grid
// reserve memory
const size_t globalSize = equilGrid.leafGridView().size(0);
const size_t globalSize = equilGrid->leafGridView().size(0);
globalCartesianIndex_.resize(globalSize, -1);
const EquilGridView equilGridView = equilGrid.leafGridView();
const EquilGridView equilGridView = equilGrid->leafGridView();
using EquilElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<EquilGridView>;
EquilElementMapper equilElemMapper(equilGridView, Dune::mcmgElementLayout());
@@ -718,11 +718,11 @@ CollectDataToIORank(const Grid& grid, const EquilGrid& equilGrid,
grid.scatterData(handle);
// loop over all elements (global grid) and store Cartesian index
auto elemIt = equilGrid.leafGridView().template begin<0>();
const auto& elemEndIt = equilGrid.leafGridView().template end<0>();
auto elemIt = equilGrid->leafGridView().template begin<0>();
const auto& elemEndIt = equilGrid->leafGridView().template end<0>();
for (; elemIt != elemEndIt; ++elemIt) {
int elemIdx = equilElemMapper.index(*elemIt);
int cartElemIdx = equilCartMapper.cartesianIndex(elemIdx);
int cartElemIdx = equilCartMapper->cartesianIndex(elemIdx);
globalCartesianIndex_[elemIdx] = cartElemIdx;
}