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/FileInterface/RifColumnBasedUserData.cpp
View File

@@ -137,7 +137,7 @@ std::string RifColumnBasedUserData::unitName( const RifEclipseSummaryAddress& re
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifColumnBasedUserData::unitSystem() const
{
return RiaEclipseUnitTools::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/FileInterface/RifCsvUserData.cpp
View File

@@ -142,7 +142,7 @@ std::string RifCsvUserData::unitName( const RifEclipseSummaryAddress& resultAddr
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifCsvUserData::unitSystem() const
{
return RiaEclipseUnitTools::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/FileInterface/RifDerivedEnsembleReader.cpp
View File

@@ -100,5 +100,5 @@ std::string RifDerivedEnsembleReader::unitName( const RifEclipseSummaryAddress&
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifDerivedEnsembleReader::unitSystem() const
{
return RiaEclipseUnitTools::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
}

14
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -121,7 +121,7 @@ bool RifEclipseInputFileTools::openGridFile( const QString& fileName,
if ( gridFile.open( QFile::ReadOnly ) )
{
RiaEclipseUnitTools::UnitSystem units = readUnitSystem( gridFile, gridunitPos );
if ( units != RiaEclipseUnitTools::UNITS_UNKNOWN )
if ( units != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
{
eclipseCase->setUnitsType( units );
}
@@ -417,9 +417,9 @@ bool RifEclipseInputFileTools::exportGrid( const QString& fileName,
}
ert_ecl_unit_enum ecl_units = ECL_METRIC_UNITS;
if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UNITS_FIELD )
if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
ecl_units = ECL_FIELD_UNITS;
else if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UNITS_LAB )
else if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_LAB )
ecl_units = ECL_LAB_UNITS;
ecl_grid_fprintf_grdecl2( mainEclGrid, filePtr, ecl_units );
@@ -1639,18 +1639,18 @@ RiaEclipseUnitTools::UnitSystem RifEclipseInputFileTools::readUnitSystem( QFile&
{
if ( unitString.contains( "FEET", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UNITS_FIELD;
return RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
}
else if ( unitString.contains( "CM", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UNITS_LAB;
return RiaEclipseUnitTools::UnitSystem::UNITS_LAB;
}
else if ( unitString.contains( "MET", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UNITS_METRIC;
return RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
}
}
return RiaEclipseUnitTools::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/FileInterface/RifKeywordVectorUserData.cpp
View File

@@ -232,7 +232,7 @@ std::string RifKeywordVectorUserData::unitName( const RifEclipseSummaryAddress&
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifKeywordVectorUserData::unitSystem() const
{
return RiaEclipseUnitTools::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -998,7 +998,7 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid )
// Unit system
{
// Default units type is METRIC
RiaEclipseUnitTools::UnitSystem unitsType = RiaEclipseUnitTools::UNITS_METRIC;
RiaEclipseUnitTools::UnitSystem unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
int unitsTypeValue;
if ( m_dynamicResultsAccess.notNull() )
@@ -1019,11 +1019,11 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid )
if ( unitsTypeValue == 2 )
{
unitsType = RiaEclipseUnitTools::UNITS_FIELD;
unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
}
else if ( unitsTypeValue == 3 )
{
unitsType = RiaEclipseUnitTools::UNITS_LAB;
unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_LAB;
}
m_eclipseCase->setUnitsType( unitsType );
}

10
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -66,13 +66,13 @@ RiaEclipseUnitTools::UnitSystem readUnitSystem( ecl_sum_type* ecl_sum )
switch ( eclUnitEnum )
{
case ECL_METRIC_UNITS:
return RiaEclipseUnitTools::UNITS_METRIC;
return RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
case ECL_FIELD_UNITS:
return RiaEclipseUnitTools::UNITS_FIELD;
return RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
case ECL_LAB_UNITS:
return RiaEclipseUnitTools::UNITS_LAB;
return RiaEclipseUnitTools::UnitSystem::UNITS_LAB;
default:
return RiaEclipseUnitTools::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
}
}
@@ -124,7 +124,7 @@ void closeEclSum( ecl_sum_type* ecl_sum )
RifReaderEclipseSummary::RifReaderEclipseSummary()
: m_ecl_sum( nullptr )
, m_ecl_SmSpec( nullptr )
, m_unitSystem( RiaEclipseUnitTools::UNITS_METRIC )
, m_unitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
m_valuesCache.reset( new ValuesCache() );
}

2
ApplicationCode/FileInterface/RifReaderObservedData.cpp
View File

@@ -215,5 +215,5 @@ std::string RifReaderObservedData::unitName( const RifEclipseSummaryAddress& res
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifReaderObservedData::unitSystem() const
{
return RiaEclipseUnitTools::UNITS_UNKNOWN;
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
}

26
ApplicationCode/FileInterface/RifStimPlanXmlReader.cpp
View File

@@ -67,7 +67,7 @@ cvf::ref<RigStimPlanFractureDefinition>
RiaEclipseUnitTools::UnitSystemType unitSystem = stimPlanFileData->unitSet();
if ( unitSystem != RiaEclipseUnitTools::UNITS_UNKNOWN )
if ( unitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
RiaLogging::info( QString( "Setting unit system for StimPlan fracture template %1 to %2" )
.arg( stimPlanFileName )
.arg( unitSystem.uiText() ) );
@@ -197,13 +197,13 @@ void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader&
gridunit = getAttributeValueString( xmlStream, "uom" );
if ( gridunit == "m" )
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UNITS_METRIC;
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
else if ( gridunit == "ft" )
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UNITS_FIELD;
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
else
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UNITS_UNKNOWN;
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
if ( destinationUnit == RiaEclipseUnitTools::UNITS_UNKNOWN )
if ( destinationUnit == RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
{
// Use file unit set if requested unit is unknown
destinationUnit = stimPlanFileData->m_unitSet;
@@ -213,11 +213,11 @@ void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader&
double tvdToBotPerfFt = getAttributeValueDouble( xmlStream, "TVDToBottomPerfFt" );
double tvdToTopPerfRequestedUnit =
RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UNITS_FIELD,
RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD,
destinationUnit,
tvdToTopPerfFt );
double tvdToBotPerfRequestedUnit =
RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UNITS_FIELD,
RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD,
destinationUnit,
tvdToBotPerfFt );
@@ -323,7 +323,8 @@ std::vector<double> RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaEclipse
RiaEclipseUnitTools::UnitSystem requiredUnit,
const std::vector<double>& values )
{
if ( sourceUnit == RiaEclipseUnitTools::UNITS_FIELD && requiredUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
std::vector<double> convertedValues;
for ( const auto& valueInFeet : values )
@@ -333,7 +334,8 @@ std::vector<double> RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaEclipse
return convertedValues;
}
else if ( sourceUnit == RiaEclipseUnitTools::UNITS_METRIC && requiredUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
std::vector<double> convertedValues;
for ( const auto& valueInMeter : values )
@@ -354,11 +356,13 @@ double RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::Uni
RiaEclipseUnitTools::UnitSystem requiredUnit,
double value )
{
if ( sourceUnit == RiaEclipseUnitTools::UNITS_FIELD && requiredUnit == RiaEclipseUnitTools::UNITS_METRIC )
if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::feetToMeter( value );
}
else if ( sourceUnit == RiaEclipseUnitTools::UNITS_METRIC && requiredUnit == RiaEclipseUnitTools::UNITS_FIELD )
else if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( value );
}