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

#1755 Move porosity model enum to separate file

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-11 10:25:33 +02:00
parent 56afc497b3
commit c4aa625d33
52 changed files with 334 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@@ -60,10 +60,10 @@ public:
QString propertyName = args[2];
QString porosityModelName = args[3];
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::MATRIX_MODEL;
RiaPorosityModel::PorosityModelType porosityModelEnum = RiaPorosityModel::MATRIX_MODEL;
if (porosityModelName == "Fracture")
{
porosityModelEnum = RiaDefines::FRACTURE_MODEL;
porosityModelEnum = RiaPorosityModel::FRACTURE_MODEL;
}
// Find the requested data
@@ -233,10 +233,10 @@ public:
return true;
}
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::MATRIX_MODEL;
RiaPorosityModel::PorosityModelType porosityModelEnum = RiaPorosityModel::MATRIX_MODEL;
if (porosityModelName == "Fracture")
{
porosityModelEnum = RiaDefines::FRACTURE_MODEL;
porosityModelEnum = RiaPorosityModel::FRACTURE_MODEL;
}
size_t scalarResultIndex = cvf::UNDEFINED_SIZE_T;
@@ -383,7 +383,7 @@ public:
m_bytesPerTimeStepToRead(0),
m_currentTimeStepNumberToRead(0),
m_invalidActiveCellCountDetected(false),
m_porosityModelEnum(RiaDefines::MATRIX_MODEL)
m_porosityModelEnum(RiaPorosityModel::MATRIX_MODEL)
{}
static QString commandName () { return QString("SetActiveCellProperty"); }
@@ -397,7 +397,7 @@ public:
if (porosityModelName == "Fracture")
{
m_porosityModelEnum = RiaDefines::FRACTURE_MODEL;
m_porosityModelEnum = RiaPorosityModel::FRACTURE_MODEL;
}
// Find the requested data, Or create a set if we are setting data and it is not found
@@ -697,7 +697,7 @@ private:
size_t m_currentScalarIndex;
QString m_currentPropertyName;
std::vector<size_t> m_requestedTimesteps;
RiaDefines::PorosityModelType m_porosityModelEnum;
RiaPorosityModel::PorosityModelType m_porosityModelEnum;
quint64 m_timeStepCountToRead;
quint64 m_bytesPerTimeStepToRead;
@@ -724,7 +724,7 @@ public:
m_bytesPerTimeStepToRead(0),
m_currentTimeStepNumberToRead(0),
m_invalidDataDetected(false),
m_porosityModelEnum(RiaDefines::MATRIX_MODEL)
m_porosityModelEnum(RiaPorosityModel::MATRIX_MODEL)
{}
static QString commandName () { return QString("SetGridProperty"); }
@@ -746,7 +746,7 @@ public:
if (porosityModelName == "Fracture")
{
m_porosityModelEnum = RiaDefines::FRACTURE_MODEL;
m_porosityModelEnum = RiaPorosityModel::FRACTURE_MODEL;
}
RigGridBase* grid = rimCase->eclipseCaseData()->grid(m_currentGridIndex);
@@ -1061,7 +1061,7 @@ private:
size_t m_currentScalarIndex;
QString m_currentPropertyName;
std::vector<size_t> m_requestedTimesteps;
RiaDefines::PorosityModelType m_porosityModelEnum;
RiaPorosityModel::PorosityModelType m_porosityModelEnum;
quint64 m_timeStepCountToRead;
quint64 m_bytesPerTimeStepToRead;
@@ -1092,11 +1092,11 @@ public:
}
QString porosityModelName = args[2];
RiaDefines::PorosityModelType porosityModelEnum = RiaDefines::MATRIX_MODEL;
RiaPorosityModel::PorosityModelType porosityModelEnum = RiaPorosityModel::MATRIX_MODEL;
if (porosityModelName == "Fracture")
{
porosityModelEnum = RiaDefines::FRACTURE_MODEL;
porosityModelEnum = RiaPorosityModel::FRACTURE_MODEL;
}
std::vector<QString> propNames;