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-23 23:25:22 +02:00
parent 8aa36ee31e
commit 3f88fe197a
56 changed files with 696 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/SocketInterface/RiaNNCCommands.cpp
View File

@@ -444,7 +444,7 @@ private:
static bool scalarResultExistsOrCreate( RigCaseCellResultsData* results, QString propertyName )
{
RigEclipseResultAddress resAddr( RiaDefines::GENERATED, propertyName );
RigEclipseResultAddress resAddr( RiaDefines::ResultCatType::GENERATED, propertyName );
if ( !results->ensureKnownResultLoaded( resAddr ) )
{

16
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@@ -427,7 +427,7 @@ public:
if ( rimCase && rimCase->results( m_porosityModelEnum ) )
{
RigEclipseResultAddress eclResAddr( RiaDefines::GENERATED, propertyName );
RigEclipseResultAddress eclResAddr( RiaDefines::ResultCatType::GENERATED, propertyName );
if ( !rimCase->results( m_porosityModelEnum )->ensureKnownResultLoaded( eclResAddr ) )
{
@@ -844,7 +844,7 @@ public:
if ( rimCase && rimCase->results( m_porosityModelEnum ) )
{
RigEclipseResultAddress resAddr( RiaDefines::GENERATED, propertyName );
RigEclipseResultAddress resAddr( RiaDefines::ResultCatType::GENERATED, propertyName );
if ( !rimCase->results( m_porosityModelEnum )->ensureKnownResultLoaded( resAddr ) )
{
@@ -1179,18 +1179,18 @@ public:
std::vector<RiaDefines::ResultCatType> resTypes;
std::vector<QString> resTypeNames;
resTypes.push_back( RiaDefines::DYNAMIC_NATIVE );
resTypes.push_back( RiaDefines::ResultCatType::DYNAMIC_NATIVE );
resTypeNames.push_back( "DynamicNative" );
resTypes.push_back( RiaDefines::SOURSIMRL );
resTypes.push_back( RiaDefines::ResultCatType::SOURSIMRL );
resTypeNames.push_back( "SourSimRL" );
resTypes.push_back( RiaDefines::STATIC_NATIVE );
resTypes.push_back( RiaDefines::ResultCatType::STATIC_NATIVE );
resTypeNames.push_back( "StaticNative" );
resTypes.push_back( RiaDefines::GENERATED );
resTypes.push_back( RiaDefines::ResultCatType::GENERATED );
resTypeNames.push_back( "Generated" );
resTypes.push_back( RiaDefines::INPUT_PROPERTY );
resTypes.push_back( RiaDefines::ResultCatType::INPUT_PROPERTY );
resTypeNames.push_back( "Input" );
#ifdef ENABLE_SOURING
resTypes.push_back( RiaDefines::INJECTION_FLOODING );
resTypes.push_back( RiaDefines::ResultCatType::INJECTION_FLOODING );
resTypeNames.push_back( "Injection Flooding" );
#endif /* ENABLE_SOURING */