diff --git a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp index dc90e0cf4..82063b693 100644 --- a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp +++ b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp @@ -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() << ")."); diff --git a/opm/core/fluid/IncompPropertiesFromDeck.cpp b/opm/core/fluid/IncompPropertiesFromDeck.cpp index 53f2370af..9febc0857 100644 --- a/opm/core/fluid/IncompPropertiesFromDeck.cpp +++ b/opm/core/fluid/IncompPropertiesFromDeck.cpp @@ -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() << ")."); diff --git a/opm/core/fluid/SaturationPropsFromDeck.hpp b/opm/core/fluid/SaturationPropsFromDeck.hpp index a43e14af5..7c8be8d45 100644 --- a/opm/core/fluid/SaturationPropsFromDeck.hpp +++ b/opm/core/fluid/SaturationPropsFromDeck.hpp @@ -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& global_cell); /// \return P, the number of phases. int numPhases() const;