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

Bugfix: in SATNUM treatment, allow for inactive cells.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-04-19 15:00:56 +02:00
parent 844ccf3562
commit 3fcdb1f412
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ namespace Opm
{
rock_.init(deck, global_cell);
pvt_.init(deck);
satprops_.init(deck);
satprops_.init(deck, global_cell);
if (pvt_.numPhases() != satprops_.numPhases()) {
THROW("BlackoilPropertiesBasic::BlackoilPropertiesBasic() - Inconsistent number of phases in pvt data ("
<< pvt_.numPhases() << ") and saturation-dependent function data (" << satprops_.numPhases() << ").");

2
opm/core/fluid/IncompPropertiesFromDeck.cpp
View File

@ -31,7 +31,7 @@ namespace Opm
{
rock_.init(deck, global_cell);
pvt_.init(deck);
satprops_.init(deck);
satprops_.init(deck, global_cell);
if (pvt_.numPhases() != satprops_.numPhases()) {
THROW("IncompPropertiesFromDeck::IncompPropertiesFromDeck() - Inconsistent number of phases in pvt data ("
<< pvt_.numPhases() << ") and saturation-dependent function data (" << satprops_.numPhases() << ").");

4
opm/core/fluid/SaturationPropsFromDeck.hpp
View File

@ -35,7 +35,9 @@ namespace Opm
SaturationPropsFromDeck();
/// Initialize from deck.
void init(const EclipseGridParser& deck);
/// global_cell maps from grid cells to their original logical Cartesian indices.
void init(const EclipseGridParser& deck,
const std::vector<int>& global_cell);
/// \return P, the number of phases.
int numPhases() const;