Added class SinglePvtDead, add parameter 'props_use_spline' to simulators.

Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
This commit is contained in:
Atgeirr Flø Rasmussen committed 2012-08-27 16:48:21 +02:00
1 parent 5182fef48d
commit d9cff689b4
3 files changed
+6 -4

No files matched your search

@@ -23,10 +23,11 @@ namespace Opm
{
BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
const UnstructuredGrid& grid)
const UnstructuredGrid& grid,
const bool use_spline)
{
rock_.init(deck, grid);
pvt_.init(deck);
pvt_.init(deck, use_spline);
satprops_.init(deck, grid);
if (pvt_.numPhases() != satprops_.numPhases()) {
THROW("BlackoilPropertiesBasic::BlackoilPropertiesBasic() - Inconsistent number of phases in pvt data ("
@@ -43,7 +43,8 @@ namespace Opm
/// mapping from cell indices (typically from a processed grid)
/// to logical cartesian indices consistent with the deck.
BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
const UnstructuredGrid& grid);
const UnstructuredGrid& grid,
const bool use_spline);
/// Destructor.
virtual ~BlackoilPropertiesFromDeck();
@@ -47,7 +47,7 @@ namespace Opm
BlackoilPvtProperties();
/// Initialize from deck.
void init(const EclipseGridParser& deck);
void init(const EclipseGridParser& deck, const bool use_spline);
/// Number of active phases.
int numPhases() const;