Read RS,RV,PRESSURE,SWAT,SGAS from EclipseState

Prefer reading these values from EclipseState rather than the Deck type.
This commit is contained in:
Jørgen Kvalsvik
2016-12-19 13:54:18 +01:00
parent e53b0a58fa
commit 8cc624fd0d
3 changed files with 42 additions and 29 deletions

View File

@@ -20,8 +20,7 @@
#ifndef OPM_INITSTATE_HEADER_INCLUDED
#define OPM_INITSTATE_HEADER_INCLUDED
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
struct UnstructuredGrid;
@@ -181,7 +180,7 @@ namespace Opm
template <class Props, class State>
void initStateFromDeck(const UnstructuredGrid& grid,
const Props& props,
const Opm::Deck& deck,
const EclipseState& es,
const double gravity,
State& state);
@@ -196,7 +195,7 @@ namespace Opm
template <class Props, class State>
void initBlackoilStateFromDeck(const UnstructuredGrid& grid,
const Props& props,
const Opm::Deck& deck,
const Opm::EclipseState& es,
const double gravity,
State& state);
/// Initialize a blackoil state from input deck.
@@ -209,7 +208,7 @@ namespace Opm
CCI begin_cell_centroids,
int dimensions,
const Props& props,
const Opm::Deck& deck,
const Opm::EclipseState& es,
const double gravity,
State& state);
} // namespace Opm