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 06:53:06 +02:00
parent 3f88fe197a
commit 83914006fd
64 changed files with 406 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
View File

@@ -101,14 +101,14 @@ public:
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs( server, args );
if ( !rimCase ) return true;
RiaDefines::PorosityModelType porosityModel = RiaDefines::MATRIX_MODEL;
RiaDefines::PorosityModelType porosityModel = RiaDefines::PorosityModelType::MATRIX_MODEL;
if ( args.size() > 2 )
{
QString prorosityModelString = args[2];
if ( prorosityModelString.toUpper() == "FRACTURE" )
{
porosityModel = RiaDefines::FRACTURE_MODEL;
porosityModel = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
}
@@ -428,7 +428,9 @@ public:
RigEclipseResultAddress addrToMaxTimeStepCountResult;
if ( rimCase && rimCase->eclipseCaseData() )
{
rimCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->maxTimeStepCount( &addrToMaxTimeStepCountResult );
rimCase->eclipseCaseData()
->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
->maxTimeStepCount( &addrToMaxTimeStepCountResult );
if ( !addrToMaxTimeStepCountResult.isValid() )
{
canFetchData = false;
@@ -449,7 +451,7 @@ public:
std::vector<QDateTime> timeStepDates =
rimCase->eclipseCaseData()
->results( RiaDefines::MATRIX_MODEL )
->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
->timeStepDates( RigEclipseResultAddress( addrToMaxTimeStepCountResult ) );
quint64 timeStepCount = timeStepDates.size();
@@ -516,7 +518,9 @@ public:
RigEclipseResultAddress addrToMaxTimeStepCountResult;
if ( rimCase && rimCase->eclipseCaseData() )
{
rimCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->maxTimeStepCount( &addrToMaxTimeStepCountResult );
rimCase->eclipseCaseData()
->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
->maxTimeStepCount( &addrToMaxTimeStepCountResult );
if ( !addrToMaxTimeStepCountResult.isValid() )
{
canFetchData = false;
@@ -535,8 +539,9 @@ public:
return true;
}
std::vector<double> daysSinceSimulationStart =
rimCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->daysSinceSimulationStart( addrToMaxTimeStepCountResult );
std::vector<double> daysSinceSimulationStart = rimCase->eclipseCaseData()
->results( RiaDefines::PorosityModelType::MATRIX_MODEL )
->daysSinceSimulationStart( addrToMaxTimeStepCountResult );
quint64 timeStepCount = daysSinceSimulationStart.size();
quint64 byteCount = sizeof( quint64 ) + timeStepCount * sizeof( qint32 );

8
ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
View File

@@ -165,10 +165,10 @@ public:
QString porosityModelName;
porosityModelName = args[2];
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::MATRIX_MODEL;
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::PorosityModelType::MATRIX_MODEL;
if ( porosityModelName.toUpper() == "FRACTURE" )
{
porosityModelEnum = RiaDefines::FRACTURE_MODEL;
porosityModelEnum = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
if ( !rimCase || !rimCase->eclipseCaseData() )
@@ -338,10 +338,10 @@ public:
QString porosityModelName;
porosityModelName = args[2];
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::MATRIX_MODEL;
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::PorosityModelType::MATRIX_MODEL;
if ( porosityModelName.toUpper() == "FRACTURE" )
{
porosityModelEnum = RiaDefines::FRACTURE_MODEL;
porosityModelEnum = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
if ( !rimCase || !rimCase->eclipseCaseData() )

2
ApplicationCode/SocketInterface/RiaNNCCommands.cpp
View File

@@ -316,7 +316,7 @@ public:
, m_bytesPerTimeStepToRead( 0 )
, m_currentTimeStepNumberToRead( 0 )
, m_invalidConnectionCountDetected( false )
, m_porosityModelEnum( RiaDefines::MATRIX_MODEL )
, m_porosityModelEnum( RiaDefines::PorosityModelType::MATRIX_MODEL )
{
}

24
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@@ -63,10 +63,10 @@ public:
QString propertyName = args[2];
QString porosityModelName = args[3];
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::MATRIX_MODEL;
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::PorosityModelType::MATRIX_MODEL;
if ( porosityModelName == "Fracture" )
{
porosityModelEnum = RiaDefines::FRACTURE_MODEL;
porosityModelEnum = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
// Find the requested data
@@ -242,10 +242,10 @@ public:
return true;
}
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::MATRIX_MODEL;
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::PorosityModelType::MATRIX_MODEL;
if ( porosityModelName == "Fracture" )
{
porosityModelEnum = RiaDefines::FRACTURE_MODEL;
porosityModelEnum = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
bool isResultsLoaded = false;
@@ -403,7 +403,7 @@ public:
, m_bytesPerTimeStepToRead( 0 )
, m_currentTimeStepNumberToRead( 0 )
, m_invalidActiveCellCountDetected( false )
, m_porosityModelEnum( RiaDefines::MATRIX_MODEL )
, m_porosityModelEnum( RiaDefines::PorosityModelType::MATRIX_MODEL )
{
}
@@ -418,7 +418,7 @@ public:
if ( porosityModelName == "Fracture" )
{
m_porosityModelEnum = RiaDefines::FRACTURE_MODEL;
m_porosityModelEnum = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
// Find the requested data, Or create a set if we are setting data and it is not found
@@ -770,7 +770,7 @@ public:
, m_bytesPerTimeStepToRead( 0 )
, m_currentTimeStepNumberToRead( 0 )
, m_invalidDataDetected( false )
, m_porosityModelEnum( RiaDefines::MATRIX_MODEL )
, m_porosityModelEnum( RiaDefines::PorosityModelType::MATRIX_MODEL )
{
}
@@ -794,7 +794,7 @@ public:
if ( porosityModelName == "Fracture" )
{
m_porosityModelEnum = RiaDefines::FRACTURE_MODEL;
m_porosityModelEnum = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
RigGridBase* grid = rimCase->eclipseCaseData()->grid( m_currentGridIndex );
@@ -1165,11 +1165,11 @@ public:
}
QString porosityModelName = args[2];
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::MATRIX_MODEL;
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::PorosityModelType::MATRIX_MODEL;
if ( porosityModelName == "Fracture" )
{
porosityModelEnum = RiaDefines::FRACTURE_MODEL;
porosityModelEnum = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
std::vector<QString> propNames;
@@ -1246,14 +1246,14 @@ public:
QString propertyName = args[2];
RiaDefines::PorosityModelType porosityModel = RiaDefines::MATRIX_MODEL;
RiaDefines::PorosityModelType porosityModel = RiaDefines::PorosityModelType::MATRIX_MODEL;
if ( args.size() > 1 )
{
QString prorosityModelString = args[3];
if ( prorosityModelString.toUpper() == "FRACTURE" )
{
porosityModel = RiaDefines::FRACTURE_MODEL;
porosityModel = RiaDefines::PorosityModelType::FRACTURE_MODEL;
}
}