Support familyII in the SatfuncInitializer

- Moves saturation function family check from EclipseState to
SatfuncPropertyInitializers
- Add tests in SatfuncPropertyInitializersTests
- Fixes error in the SatfuncPropertyInitializers implementation for
familyII
This commit is contained in:
Tor Harald Sandve
2015-08-17 11:25:20 +02:00
parent 641ff37832
commit f59ca7f392
6 changed files with 204 additions and 121 deletions

View File

@@ -153,12 +153,6 @@ namespace Opm {
const std::map<int, VFPInjTable>& getVFPInjTables() const;
size_t getNumPhases() const;
// The saturation function family.
// If SWOF and SGOF are specified in the deck it return 1
// If SWFN, SGFN and SOF3 are specified in the deck it return 2
// If keywords are missing or mixed, an error is given.
const size_t getSaturationFunctionFamily() const;
// the unit system used by the deck. note that it is rarely needed to convert
// units because internally to opm-parser everything is represented by SI
// units...