OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #277 from blattms/fix-phaseindex

Browse Source 
Unifies the phase indices with the ones in opm-core.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-01-20 09:31:59 +01:00
commit bfe5f57c9a
5 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/BlackoilPropsAd.hpp
View File

@ -84,12 +84,6 @@ namespace Opm
/// \return Object describing the active phases. /// \return Object describing the active phases.
virtual PhaseUsage phaseUsage() const; virtual PhaseUsage phaseUsage() const;
// ------ Canonical named indices for each phase ------
/// Canonical named indices for each phase.
enum PhaseIndex { Water = 0, Oil = 1, Gas = 2 };
// ------ Density ------ // ------ Density ------
/// Densities of stock components at surface conditions. /// Densities of stock components at surface conditions.

3
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -41,9 +41,6 @@ namespace Opm
typedef BlackoilPropsAdFromDeck::ADB ADB; typedef BlackoilPropsAdFromDeck::ADB ADB;
typedef BlackoilPropsAdFromDeck::V V; typedef BlackoilPropsAdFromDeck::V V;
typedef Eigen::Array<double, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> Block; 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. /// Constructor wrapping an opm-core black oil interface.
BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(Opm::DeckConstPtr deck, BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(Opm::DeckConstPtr deck,

6
opm/autodiff/BlackoilPropsAdFromDeck.hpp
View File

@ -109,12 +109,6 @@ namespace Opm
/// \return Object describing the active phases. /// \return Object describing the active phases.
PhaseUsage phaseUsage() const; PhaseUsage phaseUsage() const;
// ------ Canonical named indices for each phase ------
/// Canonical named indices for each phase.
enum PhaseIndex { Water = 0, Oil = 1, Gas = 2 };
// ------ Density ------ // ------ Density ------
/// Densities of stock components at surface conditions. /// Densities of stock components at surface conditions.

7
opm/autodiff/BlackoilPropsAdInterface.hpp
View File

@ -78,7 +78,12 @@ namespace Opm
// ------ Canonical named indices for each phase ------ // ------ Canonical named indices for each phase ------
/// Canonical named indices for each phase. /// Canonical named indices for each phase.
enum PhaseIndex { Water = 0, Oil = 1, Gas = 2 }; enum PhaseIndex { Water = BlackoilPhases::Aqua, Oil = BlackoilPhases::Liquid,
Gas = BlackoilPhases::Vapour,
Aqua = BlackoilPhases::Aqua,
Liquid = BlackoilPhases::Liquid,
Vapour = BlackoilPhases::Vapour,
MaxNumPhases = BlackoilPhases::MaxNumPhases};
// ------ Density ------ // ------ Density ------

8
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -156,9 +156,11 @@ namespace Opm {
M p2w; // perf -> well (gather) M p2w; // perf -> well (gather)
}; };
enum { Water = BlackoilPropsAdInterface::Water, enum { Water = BlackoilPropsAdInterface::Water,
Oil = BlackoilPropsAdInterface::Oil , Oil = BlackoilPropsAdInterface::Oil ,
Gas = BlackoilPropsAdInterface::Gas }; Gas = BlackoilPropsAdInterface::Gas ,
MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases
};
enum PrimalVariables { Sg = 0, RS = 1, RV = 2 }; enum PrimalVariables { Sg = 0, RS = 1, RV = 2 };