mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Unifies the phase indices with the ones in opm-core.
The initial definition of the phase indices seems to be in opm/core/props/BlackoilPhases.hpp. Nevertheless there were several redefinitions of the same or similar enums (either Aqua, Liquid, and Vapor, or Water, Oil, and Gas). Surprisingly most often these definitions did not use the original values. This is bound to break if there is a change upstream. This patch limits the definition to one place in opm-autodiff, namely opm/autodiff/BlackoilPropsAdInterface.hpp. To avoid downstream confusion we define both the Water and Aqua triplets. In addition we define the maximum number of phases to use at compile time.
This commit is contained in:
@@ -41,9 +41,6 @@ namespace Opm
|
||||
typedef BlackoilPropsAdFromDeck::ADB ADB;
|
||||
typedef BlackoilPropsAdFromDeck::V V;
|
||||
typedef Eigen::Array<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> Block;
|
||||
enum { Aqua = BlackoilPhases::Aqua,
|
||||
Liquid = BlackoilPhases::Liquid,
|
||||
Vapour = BlackoilPhases::Vapour };
|
||||
|
||||
/// Constructor wrapping an opm-core black oil interface.
|
||||
BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(Opm::DeckConstPtr deck,
|
||||
|
||||
Reference in New Issue
Block a user