mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-12-18 21:43:27 -06:00
03f6f43160
Conflicts: Makefile.am opm/core/fluid/BlackoilPropertiesFromDeck.hpp opm/core/fluid/SaturationPropsFromDeck.cpp opm/core/fluid/SaturationPropsFromDeck.hpp opm/core/fluid/blackoil/BlackoilPvtProperties.cpp opm/core/fluid/blackoil/BlackoilPvtProperties.hpp opm/core/fluid/blackoil/SinglePvtDead.cpp This merge combines three more-or-less orthogonal features for saturation tables: the option to use StoneII or Simple three-phase behaviour, the option to fit a spline or not, and finally setting the number of samples used (if spline fitting). Interfaces have changed, the most top-level one being that BlackoilPropertiesFromDeck::init() now also takes a ParameterGroup argument. |
||
|---|---|---|
| .. | ||
| blackoil | ||
| BlackoilPropertiesBasic.cpp | ||
| BlackoilPropertiesBasic.hpp | ||
| BlackoilPropertiesFromDeck.cpp | ||
| BlackoilPropertiesFromDeck.hpp | ||
| BlackoilPropertiesInterface.hpp | ||
| IncompPropertiesBasic.cpp | ||
| IncompPropertiesBasic.hpp | ||
| IncompPropertiesFromDeck.cpp | ||
| IncompPropertiesFromDeck.hpp | ||
| IncompPropertiesInterface.hpp | ||
| PvtPropertiesBasic.cpp | ||
| PvtPropertiesBasic.hpp | ||
| PvtPropertiesIncompFromDeck.cpp | ||
| PvtPropertiesIncompFromDeck.hpp | ||
| RockBasic.hpp | ||
| RockCompressibility.cpp | ||
| RockCompressibility.hpp | ||
| RockFromDeck.cpp | ||
| RockFromDeck.hpp | ||
| SaturationPropsBasic.cpp | ||
| SaturationPropsBasic.hpp | ||
| SaturationPropsFromDeck_impl.hpp | ||
| SaturationPropsFromDeck.hpp | ||
| SaturationPropsInterface.hpp | ||