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

#3958 Refactoring: Remove resultIndex in maxTimeStepResult

Browse Source
This commit is contained in:
Jacob Støren
2019-01-22 12:32:14 +01:00
parent 8e16d3ff20
commit e21a0da543
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@@ -539,10 +539,10 @@ std::vector<QDateTime> RigCaseCellResultsData::timeStepDates(const RigEclipseRes
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<QDateTime> RigCaseCellResultsData::timeStepDates() const std::vector<QDateTime> RigCaseCellResultsData::timeStepDates() const
{ {
size_t scalarResWithMostTimeSteps = cvf::UNDEFINED_SIZE_T; RigEclipseResultAddress scalarResWithMostTimeSteps;
maxTimeStepCount(&scalarResWithMostTimeSteps); maxTimeStepCount(&scalarResWithMostTimeSteps);
return timeStepDates(RigEclipseResultAddress(scalarResWithMostTimeSteps)); return timeStepDates(scalarResWithMostTimeSteps);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -550,10 +550,10 @@ std::vector<QDateTime> RigCaseCellResultsData::timeStepDates() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<double> RigCaseCellResultsData::daysSinceSimulationStart() const std::vector<double> RigCaseCellResultsData::daysSinceSimulationStart() const
{ {
size_t scalarResWithMostTimeSteps = cvf::UNDEFINED_SIZE_T; RigEclipseResultAddress scalarResWithMostTimeSteps;
maxTimeStepCount(&scalarResWithMostTimeSteps); maxTimeStepCount(&scalarResWithMostTimeSteps);
return daysSinceSimulationStart(RigEclipseResultAddress(scalarResWithMostTimeSteps)); return daysSinceSimulationStart(scalarResWithMostTimeSteps);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -609,7 +609,7 @@ void RigCaseCellResultsData::setTimeStepInfos(const RigEclipseResultAddress& res
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RigCaseCellResultsData::maxTimeStepCount(size_t* scalarResultIndexWithMostTimeSteps) const size_t RigCaseCellResultsData::maxTimeStepCount(RigEclipseResultAddress* resultAddressWithMostTimeSteps) const
{ {
size_t maxTsCount = 0; size_t maxTsCount = 0;
size_t scalarResultIndexWithMaxTsCount = cvf::UNDEFINED_SIZE_T; size_t scalarResultIndexWithMaxTsCount = cvf::UNDEFINED_SIZE_T;
@@ -623,9 +623,9 @@ size_t RigCaseCellResultsData::maxTimeStepCount(size_t* scalarResultIndexWithMos
} }
} }
if (scalarResultIndexWithMostTimeSteps) if (resultAddressWithMostTimeSteps)
{ {
*scalarResultIndexWithMostTimeSteps = scalarResultIndexWithMaxTsCount; *resultAddressWithMostTimeSteps = RigEclipseResultAddress(scalarResultIndexWithMaxTsCount);
} }
return maxTsCount; return maxTsCount;

2
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
View File

@@ -109,7 +109,7 @@ public:
// Access meta-information about the results // Access meta-information about the results
size_t resultCount() const; size_t resultCount() const;
size_t timeStepCount(const RigEclipseResultAddress& resVarAddr) const; size_t timeStepCount(const RigEclipseResultAddress& resVarAddr) const;
size_t maxTimeStepCount(size_t* scalarResultIndex = nullptr) const; size_t maxTimeStepCount(RigEclipseResultAddress* resultAddressWithMostTimeSteps = nullptr) const;
QStringList resultNames(RiaDefines::ResultCatType type) const; QStringList resultNames(RiaDefines::ResultCatType type) const;
bool isUsingGlobalActiveIndex(const RigEclipseResultAddress& resVarAddr) const; bool isUsingGlobalActiveIndex(const RigEclipseResultAddress& resVarAddr) const;
bool hasFlowDiagUsableFluxes() const; bool hasFlowDiagUsableFluxes() const;

6
ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp
View File

@@ -321,10 +321,10 @@ RigFlowDiagTimeStepResult RigFlowDiagSolverInterface::calculate(size_t timeStepI
CVF_ASSERT(currentRestartData); CVF_ASSERT(currentRestartData);
size_t resultIndexWithMaxTimeSteps = cvf::UNDEFINED_SIZE_T; RigEclipseResultAddress addrToMaxTimeStepCountResult;
m_eclipseCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->maxTimeStepCount(&resultIndexWithMaxTimeSteps); m_eclipseCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->maxTimeStepCount(&addrToMaxTimeStepCountResult);
int reportStepNumber = m_eclipseCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->reportStepNumber(RigEclipseResultAddress(resultIndexWithMaxTimeSteps), timeStepIndex); int reportStepNumber = m_eclipseCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->reportStepNumber(addrToMaxTimeStepCountResult, timeStepIndex);
if ( !currentRestartData->selectReportStep(reportStepNumber) ) if ( !currentRestartData->selectReportStep(reportStepNumber) )
{ {

16
ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
View File

@@ -419,11 +419,11 @@ public:
canFetchData = false; canFetchData = false;
} }
size_t scalarIndexWithMaxTimeStepCount = cvf::UNDEFINED_SIZE_T; RigEclipseResultAddress addrToMaxTimeStepCountResult;
if (rimCase && rimCase->eclipseCaseData()) if (rimCase && rimCase->eclipseCaseData())
{ {
rimCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->maxTimeStepCount(&scalarIndexWithMaxTimeStepCount); rimCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->maxTimeStepCount(&addrToMaxTimeStepCountResult);
if (scalarIndexWithMaxTimeStepCount == cvf::UNDEFINED_SIZE_T) if ( !addrToMaxTimeStepCountResult.isValid())
{ {
canFetchData = false; canFetchData = false;
} }
@@ -441,7 +441,7 @@ public:
return true; return true;
} }
std::vector<QDateTime> timeStepDates = rimCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->timeStepDates(RigEclipseResultAddress(scalarIndexWithMaxTimeStepCount)); std::vector<QDateTime> timeStepDates = rimCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->timeStepDates(RigEclipseResultAddress(addrToMaxTimeStepCountResult));
quint64 timeStepCount = timeStepDates.size(); quint64 timeStepCount = timeStepDates.size();
quint64 byteCount = sizeof(quint64) + 6 * timeStepCount * sizeof(qint32); quint64 byteCount = sizeof(quint64) + 6 * timeStepCount * sizeof(qint32);
@@ -506,11 +506,11 @@ public:
canFetchData = false; canFetchData = false;
} }
size_t scalarIndexWithMaxTimeStepCount = cvf::UNDEFINED_SIZE_T; RigEclipseResultAddress addrToMaxTimeStepCountResult;
if (rimCase && rimCase->eclipseCaseData()) if (rimCase && rimCase->eclipseCaseData())
{ {
rimCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->maxTimeStepCount(&scalarIndexWithMaxTimeStepCount); rimCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->maxTimeStepCount(&addrToMaxTimeStepCountResult);
if (scalarIndexWithMaxTimeStepCount == cvf::UNDEFINED_SIZE_T) if (!addrToMaxTimeStepCountResult.isValid() )
{ {
canFetchData = false; canFetchData = false;
} }
@@ -528,7 +528,7 @@ public:
return true; return true;
} }
std::vector<double> daysSinceSimulationStart = rimCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->daysSinceSimulationStart(RigEclipseResultAddress(scalarIndexWithMaxTimeStepCount)); std::vector<double> daysSinceSimulationStart = rimCase->eclipseCaseData()->results(RiaDefines::MATRIX_MODEL)->daysSinceSimulationStart(addrToMaxTimeStepCountResult);
quint64 timeStepCount = daysSinceSimulationStart.size(); quint64 timeStepCount = daysSinceSimulationStart.size();
quint64 byteCount = sizeof(quint64) + timeStepCount * sizeof(qint32); quint64 byteCount = sizeof(quint64) + timeStepCount * sizeof(qint32);

6
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
View File

@@ -419,9 +419,9 @@ public:
{ {
scalarResultIndex = rimCase->results(m_porosityModelEnum)->findOrCreateScalarResultIndex(RiaDefines::GENERATED, propertyName, true); scalarResultIndex = rimCase->results(m_porosityModelEnum)->findOrCreateScalarResultIndex(RiaDefines::GENERATED, propertyName, true);
size_t scalarResWithMostTimeSteps = cvf::UNDEFINED_SIZE_T; RigEclipseResultAddress addrToMaxTimeStepCountResult;
rimCase->results(m_porosityModelEnum)->maxTimeStepCount(&scalarResWithMostTimeSteps); rimCase->results(m_porosityModelEnum)->maxTimeStepCount(&addrToMaxTimeStepCountResult);
const std::vector<RigEclipseTimeStepInfo> timeStepInfos = rimCase->results(m_porosityModelEnum)->timeStepInfos(RigEclipseResultAddress(scalarResWithMostTimeSteps)); const std::vector<RigEclipseTimeStepInfo> timeStepInfos = rimCase->results(m_porosityModelEnum)->timeStepInfos(addrToMaxTimeStepCountResult);
rimCase->results(m_porosityModelEnum)->setTimeStepInfos(RigEclipseResultAddress(scalarResultIndex), timeStepInfos); rimCase->results(m_porosityModelEnum)->setTimeStepInfos(RigEclipseResultAddress(scalarResultIndex), timeStepInfos);
} }