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

Remove weak enum Opm::Phase

Browse Source 
This weak enum is really just an alias for four other constants which in
turn alias another enum. Since they're mostly used for indexing they're
relaxed to constexpr ints.
This commit is contained in:
Jørgen Kvalsvik
2016-11-01 12:56:05 +01:00
parent 732786f014
commit 6488cfcfe5
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/BlackoilModelBase.hpp
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

10
opm/autodiff/BlackoilModelEnums.hpp
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,