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

changes to be able to use black oil properties even if rock do not match current grid

Browse Source
This commit is contained in:
Halvor Møll Nilsen 2012-10-30 13:28:22 +01:00
parent 0f3423cbf4
commit 036cfacea4
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/core/fluid/BlackoilPropertiesFromDeck.cpp
View File

@ -23,9 +23,12 @@ namespace Opm
{ {
BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck, BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
const UnstructuredGrid& grid) const UnstructuredGrid& grid,
bool init_rock)
{ {
rock_.init(deck, grid); if (init_rock){
rock_.init(deck, grid);
}
pvt_.init(deck); pvt_.init(deck);
satprops_.init(deck, grid); satprops_.init(deck, grid);
if (pvt_.numPhases() != satprops_.numPhases()) { if (pvt_.numPhases() != satprops_.numPhases()) {
@ -36,9 +39,12 @@ namespace Opm
BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck, BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
const UnstructuredGrid& grid, const UnstructuredGrid& grid,
const parameter::ParameterGroup& param) const parameter::ParameterGroup& param,
bool init_rock)
{ {
rock_.init(deck, grid); if(init_rock){
rock_.init(deck, grid);
}
const int samples = param.getDefault("dead_tab_size", 1025); const int samples = param.getDefault("dead_tab_size", 1025);
pvt_.init(deck, samples); pvt_.init(deck, samples);
satprops_.init(deck, grid, param); satprops_.init(deck, grid, param);

5
opm/core/fluid/BlackoilPropertiesFromDeck.hpp
View File

@ -44,7 +44,7 @@ namespace Opm
/// mapping from cell indices (typically from a processed grid) /// mapping from cell indices (typically from a processed grid)
/// to logical cartesian indices consistent with the deck. /// to logical cartesian indices consistent with the deck.
BlackoilPropertiesFromDeck(const EclipseGridParser& deck, BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
const UnstructuredGrid& grid); const UnstructuredGrid& grid, bool init_rock=true );
/// Initialize from deck, grid and parameters. /// Initialize from deck, grid and parameters.
/// \param[in] deck Deck input parser /// \param[in] deck Deck input parser
@ -56,7 +56,8 @@ namespace Opm
/// tab_size_kr (200) number of uniform sample points for saturation tables. /// tab_size_kr (200) number of uniform sample points for saturation tables.
BlackoilPropertiesFromDeck(const EclipseGridParser& deck, BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
const UnstructuredGrid& grid, const UnstructuredGrid& grid,
const parameter::ParameterGroup& param); const parameter::ParameterGroup& param,
bool init_rock=true);
/// Destructor. /// Destructor.
virtual ~BlackoilPropertiesFromDeck(); virtual ~BlackoilPropertiesFromDeck();