OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #883 from jokva/relax-opm-phase-enum-constexpr

Browse Source 
Remove weak enum Opm::Phase; replace with constexpr
This commit is contained in:
Atgeirr Flø Rasmussen
2016-11-01 14:52:22 +01:00
committed by GitHub
parent da344222d9 6488cfcfe5
commit 59b7d8c8fc
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/autodiff/BlackoilModelBase.hpp
+3 -3
View File
@@ -133,9 +133,9 @@ namespace Opm {
SimulatorData(int num_phases);
enum FipId {
FIP_AQUA = Opm::Phases::Water,
FIP_LIQUID = Opm::Phases::Oil,
FIP_VAPOUR = Opm::Phases::Gas,
FIP_AQUA = Opm::Water,
FIP_LIQUID = Opm::Oil,
FIP_VAPOUR = Opm::Gas,
FIP_DISSOLVED_GAS = 3,
FIP_VAPORIZED_OIL = 4,
FIP_PV = 5, //< Pore volume
opm/autodiff/BlackoilModelEnums.hpp
+4 -6
View File
@@ -26,12 +26,10 @@
namespace Opm
{
enum Phases {
Water = BlackoilPropsAdInterface::Water,
Oil = BlackoilPropsAdInterface::Oil ,
Gas = BlackoilPropsAdInterface::Gas ,
MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases
};
constexpr const auto Water = BlackoilPropsAdInterface::Water;
constexpr const auto Oil = BlackoilPropsAdInterface::Oil;
constexpr const auto Gas = BlackoilPropsAdInterface::Gas;
constexpr const auto MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases;
enum PrimalVariables {
Sg = 0,