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

Convert to enum class

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-24 08:10:48 +02:00
parent e85c36b4a4
commit 95fc63fe7c
76 changed files with 363 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/RigEclipseCaseData.cpp
View File

@@ -56,7 +56,7 @@ RigEclipseCaseData::RigEclipseCaseData( RimEclipseCase* ownerCase )
m_matrixModelResults->setActiveCellInfo( m_activeCellInfo.p() );
m_fractureModelResults->setActiveCellInfo( m_fractureActiveCellInfo.p() );
m_unitsType = RiaEclipseUnitTools::UNITS_METRIC;
m_unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
View File

@@ -148,11 +148,11 @@ public:
// Try and set output unit system to the same system as the eclipse case system
std::unique_ptr<const Opm::ECLUnits::UnitSystem> eclUnitSystem;
if ( caseUnitSystem == RiaEclipseUnitTools::UNITS_METRIC )
if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
eclUnitSystem = Opm::ECLUnits::metricUnitConventions();
else if ( caseUnitSystem == RiaEclipseUnitTools::UNITS_FIELD )
else if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
eclUnitSystem = Opm::ECLUnits::fieldUnitConventions();
else if ( caseUnitSystem == RiaEclipseUnitTools::UNITS_LAB )
else if ( caseUnitSystem == RiaEclipseUnitTools::UnitSystem::UNITS_LAB )
eclUnitSystem = Opm::ECLUnits::labUnitConventions();
if ( eclUnitSystem )

6
ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@@ -45,7 +45,7 @@ const double RigStimPlanFractureDefinition::THRESHOLD_VALUE = 1e-5;
///
//--------------------------------------------------------------------------------------------------
RigStimPlanFractureDefinition::RigStimPlanFractureDefinition()
: m_unitSet( RiaEclipseUnitTools::UNITS_UNKNOWN )
: m_unitSet( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
, m_topPerfTvd( HUGE_VAL )
, m_bottomPerfTvd( HUGE_VAL )
, m_xMirrorMode( false )
@@ -316,11 +316,11 @@ std::vector<std::vector<double>>
{
for ( auto& xVal : yValues )
{
if ( requiredUnitSet == RiaEclipseUnitTools::UNITS_FIELD )
if ( requiredUnitSet == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
xVal = RiaEclipseUnitTools::convertToFeet( xVal, conductivityUnitTextOnFile );
}
else if ( requiredUnitSet == RiaEclipseUnitTools::UNITS_METRIC )
else if ( requiredUnitSet == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
xVal = RiaEclipseUnitTools::convertToMeter( xVal, conductivityUnitTextOnFile );
}