OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-23 01:36:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1356 from dr-robertk/PR/fix-minor-issue-gridview

Browse Source 
[bugfix] make code compile when GridView is not Grid::LeafGridView.
This commit is contained in:
Atgeirr Flø Rasmussen 2017-12-04 09:25:43 +01:00 committed by GitHub
commit 65034250d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/autodiff/FlowMainEbos.hpp
View File

@ -481,7 +481,7 @@ namespace Opm
const SummaryConfig& summaryConfig() const const SummaryConfig& summaryConfig() const
{ return ebosSimulator_->gridManager().summaryConfig(); } { return ebosSimulator_->gridManager().summaryConfig(); }
// Initialise the reservoir state. Updated fluid props for SWATINIT. // Initialise the reservoir state. Updated fluid props for SWATINIT.
// Writes to: // Writes to:
// state_ // state_
@ -827,11 +827,14 @@ namespace Opm
if( output && output_ecl && grid().comm().size() > 1 ) if( output && output_ecl && grid().comm().size() > 1 )
{ {
typedef typename Grid::LeafGridView GridView;
using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout>;
// Get the owner rank number for each cell // Get the owner rank number for each cell
using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView, Dune::MCMGElementLayout>;
using Handle = CellOwnerDataHandle<ElementMapper>; using Handle = CellOwnerDataHandle<ElementMapper>;
ElementMapper globalMapper(this->globalGrid().leafGridView()); const Grid& globalGrid = this->globalGrid();
const auto globalSize = this->globalGrid().size(0); const auto& globalGridView = globalGrid.leafGridView();
ElementMapper globalMapper(globalGridView);
const auto globalSize = globalGrid.size(0);
std::vector<int> ranks(globalSize, -1); std::vector<int> ranks(globalSize, -1);
Handle handle(globalMapper, ranks); Handle handle(globalMapper, ranks);
this->grid().gatherData(handle); this->grid().gatherData(handle);