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

Cherry-pick Atgeirr's Remove Deck parameter patch

Browse Source 
Remove Deck parameter from GridInit constructor.

Possible because we now use the EclipseGrid-taking
overload of processEclipseFormat() for CpGrid.
This commit is contained in:
Atgeirr Flø Rasmussen 2016-04-20 14:55:01 +02:00 committed by Pål Grønås Drange
parent 18f6672df0
commit 07fec302f4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/FlowMain.hpp
View File

@ -424,7 +424,7 @@ namespace Opm
// Create grid. // Create grid.
const std::vector<double>& porv = const std::vector<double>& porv =
eclipse_state_->get3DProperties().getDoubleGridProperty("PORV").getData(); eclipse_state_->get3DProperties().getDoubleGridProperty("PORV").getData();
grid_init_.reset(new GridInit<Grid>(deck_, eclipse_state_, porv)); grid_init_.reset(new GridInit<Grid>(eclipse_state_, porv));
const Grid& grid = grid_init_->grid(); const Grid& grid = grid_init_->grid();
// Create material law manager. // Create material law manager.

8
opm/autodiff/GridInit.hpp
View File

@ -40,7 +40,7 @@ namespace Opm
{ {
public: public:
/// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes. /// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes.
GridInit(DeckConstPtr, EclipseStateConstPtr, const std::vector<double>&) GridInit(EclipseStateConstPtr, const std::vector<double>&)
{ {
OPM_THROW(std::logic_error, "Found no specialization for GridInit for the requested Grid class."); OPM_THROW(std::logic_error, "Found no specialization for GridInit for the requested Grid class.");
} }
@ -53,7 +53,7 @@ namespace Opm
{ {
public: public:
/// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes. /// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes.
GridInit(DeckConstPtr, EclipseStateConstPtr eclipse_state, const std::vector<double>& porv) GridInit(EclipseStateConstPtr eclipse_state, const std::vector<double>& porv)
: grid_manager_(eclipse_state->getInputGrid(), porv) : grid_manager_(eclipse_state->getInputGrid(), porv)
{ {
} }
@ -74,9 +74,9 @@ namespace Opm
{ {
public: public:
/// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes. /// Initialize from a deck and/or an eclipse state and (logical cartesian) specified pore volumes.
GridInit(DeckConstPtr deck, EclipseStateConstPtr, const std::vector<double>& porv) GridInit(EclipseStateConstPtr eclipse_state, const std::vector<double>& porv)
{ {
grid_.processEclipseFormat(deck, false, false, false, porv); grid_.processEclipseFormat(eclipse_state->getInputGrid(), false, false, false, porv);
} }
/// Access the created grid. Note that mutable access may be required for load balancing. /// Access the created grid. Note that mutable access may be required for load balancing.
Dune::CpGrid& grid() Dune::CpGrid& grid()