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

Update to shared_ptr-less parser interface.

Browse Source
This commit is contained in:
Jørgen Kvalsvik
2016-10-14 09:23:26 +02:00
parent 93ffb318cd
commit 1c6a4b34da
54 changed files with 410 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/autodiff/RedistributeDataHandles.hpp
View File

@@ -38,8 +38,8 @@ namespace Opm
template <class Grid>
inline std::unordered_set<std::string>
distributeGridAndData( Grid& ,
Opm::DeckConstPtr ,
EclipseStateConstPtr ,
const Opm::Deck& ,
const EclipseState& ,
BlackoilState& ,
BlackoilPropsAdFromDeck& ,
DerivedGeology&,
@@ -420,8 +420,8 @@ private:
inline
std::unordered_set<std::string>
distributeGridAndData( Dune::CpGrid& grid,
Opm::DeckConstPtr deck,
EclipseStateConstPtr eclipseState,
const Opm::Deck& deck,
const EclipseState& eclipseState,
BlackoilState& state,
BlackoilPropsAdFromDeck& properties,
DerivedGeology& geology,
@@ -435,7 +435,7 @@ distributeGridAndData( Dune::CpGrid& grid,
// distribute the grid and switch to the distributed view
using std::get;
auto my_defunct_wells = get<1>(grid.loadBalance(eclipseState,
auto my_defunct_wells = get<1>(grid.loadBalance(&eclipseState,
geology.transmissibility().data()));
grid.switchToDistributedView();
std::vector<int> compressedToCartesianIdx;