Added new SatFuncSimple fluid.

Introduced a simple fluid which has no problem with strange black oil behavior.
Intended for testing, but for now it is used in SaturationPropsFromDeck.
This commit is contained in:
Halvor Møll Nilsen 2012-08-28 16:41:06 +02:00
parent 94c04f343d
commit 6852be422c

View File

@ -24,6 +24,7 @@
#include <opm/core/utility/UniformTableLinear.hpp> #include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/fluid/SatFuncStone2.hpp> #include <opm/core/fluid/SatFuncStone2.hpp>
#include <opm/core/fluid/SatFuncSimple.hpp>
#include <vector> #include <vector>
struct UnstructuredGrid; struct UnstructuredGrid;
@ -93,10 +94,11 @@ namespace Opm
private: private:
PhaseUsage phase_usage_; PhaseUsage phase_usage_;
std::vector<SatFuncStone2> satfuncset_; typedef SatFuncSimple satfunc_t;
std::vector<satfunc_t> satfuncset_;
std::vector<int> cell_to_func_; // = SATNUM - 1 std::vector<int> cell_to_func_; // = SATNUM - 1
const SatFuncStone2& funcForCell(const int cell) const; const satfunc_t& funcForCell(const int cell) const;
}; };