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

#1691 Rename to RigEclipseResultInfo

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-11 15:10:08 +02:00
parent 21fd00389c
commit c1fe8a7e6c
11 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -30,7 +30,7 @@
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigSingleWellResultsData.h" #include "RigSingleWellResultsData.h"
#include "RigResultInfo.h" #include "RigEclipseResultInfo.h"
#include "cafProgressInfo.h" #include "cafProgressInfo.h"
@@ -647,7 +647,7 @@ void RifReaderEclipseOutput::buildMetaData()
RigCaseCellResultsData* matrixModelResults = m_eclipseCase->results(RiaDefines::MATRIX_MODEL); RigCaseCellResultsData* matrixModelResults = m_eclipseCase->results(RiaDefines::MATRIX_MODEL);
RigCaseCellResultsData* fractureModelResults = m_eclipseCase->results(RiaDefines::FRACTURE_MODEL); RigCaseCellResultsData* fractureModelResults = m_eclipseCase->results(RiaDefines::FRACTURE_MODEL);
std::vector<RigTimeStepInfo> timeStepInfos; std::vector<RigEclipseTimeStepInfo> timeStepInfos;
// Create access object for dynamic results // Create access object for dynamic results
m_dynamicResultsAccess = createDynamicResultsAccess(); m_dynamicResultsAccess = createDynamicResultsAccess();
@@ -721,7 +721,7 @@ void RifReaderEclipseOutput::buildMetaData()
RifEclipseOutputFileTools::findKeywordsAndItemCount(filesUsedToFindAvailableKeywords, &resultNames, &resultNamesDataItemCounts); RifEclipseOutputFileTools::findKeywordsAndItemCount(filesUsedToFindAvailableKeywords, &resultNames, &resultNamesDataItemCounts);
std::vector<RigTimeStepInfo> staticTimeStepInfo; std::vector<RigEclipseTimeStepInfo> staticTimeStepInfo;
if (!timeStepInfos.empty()) if (!timeStepInfos.empty())
{ {
staticTimeStepInfo.push_back(timeStepInfos.front()); staticTimeStepInfo.push_back(timeStepInfos.front());
@@ -1639,7 +1639,7 @@ void RifReaderEclipseOutput::readWellCells(const ecl_grid_type* mainEclGrid, boo
std::vector<QDateTime> filteredTimeSteps; std::vector<QDateTime> filteredTimeSteps;
{ {
std::vector<RigTimeStepInfo> filteredTimeStepInfos = createFilteredTimeStepInfos(); std::vector<RigEclipseTimeStepInfo> filteredTimeStepInfos = createFilteredTimeStepInfos();
for (auto a : filteredTimeStepInfos) for (auto a : filteredTimeStepInfos)
{ {
filteredTimeSteps.push_back(a.m_date); filteredTimeSteps.push_back(a.m_date);
@@ -1765,9 +1765,9 @@ QStringList RifReaderEclipseOutput::validKeywordsForPorosityModel(const QStringL
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RigTimeStepInfo> RifReaderEclipseOutput::createFilteredTimeStepInfos() std::vector<RigEclipseTimeStepInfo> RifReaderEclipseOutput::createFilteredTimeStepInfos()
{ {
std::vector<RigTimeStepInfo> timeStepInfos; std::vector<RigEclipseTimeStepInfo> timeStepInfos;
if (m_dynamicResultsAccess.notNull()) if (m_dynamicResultsAccess.notNull())
{ {
@@ -1782,7 +1782,7 @@ std::vector<RigTimeStepInfo> RifReaderEclipseOutput::createFilteredTimeStepInfos
{ {
if (this->isTimeStepIncludedByFilter(i)) if (this->isTimeStepIncludedByFilter(i))
{ {
timeStepInfos.push_back(RigTimeStepInfo(timeStepsOnFile[i], reportNumbersOnFile[i], daysSinceSimulationStartOnFile[i])); timeStepInfos.push_back(RigEclipseTimeStepInfo(timeStepsOnFile[i], reportNumbersOnFile[i], daysSinceSimulationStartOnFile[i]));
} }
} }
} }

4
ApplicationCode/FileInterface/RifReaderEclipseOutput.h
View File

@@ -30,7 +30,7 @@ class RigGridBase;
class RigMainGrid; class RigMainGrid;
class RigActiveCellInfo; class RigActiveCellInfo;
class RigFault; class RigFault;
class RigTimeStepInfo; class RigEclipseTimeStepInfo;
struct RigWellResultPoint; struct RigWellResultPoint;
@@ -81,7 +81,7 @@ private:
QStringList validKeywordsForPorosityModel(const QStringList& keywords, const std::vector<size_t>& keywordDataItemCounts, const RigActiveCellInfo* activeCellInfo, const RigActiveCellInfo* fractureActiveCellInfo, RiaDefines::PorosityModelType matrixOrFracture, size_t timeStepCount) const; QStringList validKeywordsForPorosityModel(const QStringList& keywords, const std::vector<size_t>& keywordDataItemCounts, const RigActiveCellInfo* activeCellInfo, const RigActiveCellInfo* fractureActiveCellInfo, RiaDefines::PorosityModelType matrixOrFracture, size_t timeStepCount) const;
std::vector<RigTimeStepInfo> createFilteredTimeStepInfos(); std::vector<RigEclipseTimeStepInfo> createFilteredTimeStepInfos();
private: private:
QString m_fileName; // Name of file used to start accessing Eclipse output files QString m_fileName; // Name of file used to start accessing Eclipse output files

8
ApplicationCode/FileInterface/RifReaderMockModel.cpp
View File

@@ -22,7 +22,7 @@
#include "RigCaseCellResultsData.h" #include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigResultInfo.h" #include "RigEclipseResultInfo.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -35,7 +35,7 @@ bool RifReaderMockModel::open(const QString& fileName, RigEclipseCaseData* eclip
RigCaseCellResultsData* cellResults = eclipseCase->results(RiaDefines::MATRIX_MODEL); RigCaseCellResultsData* cellResults = eclipseCase->results(RiaDefines::MATRIX_MODEL);
std::vector<RigTimeStepInfo> timeStepInfos; std::vector<RigEclipseTimeStepInfo> timeStepInfos;
{ {
std::vector<QDateTime> dates; std::vector<QDateTime> dates;
std::vector<double> days; std::vector<double> days;
@@ -48,7 +48,7 @@ bool RifReaderMockModel::open(const QString& fileName, RigEclipseCaseData* eclip
repNumbers.push_back(i); repNumbers.push_back(i);
} }
timeStepInfos = RigTimeStepInfo::createTimeStepInfos(dates, repNumbers, days); timeStepInfos = RigEclipseTimeStepInfo::createTimeStepInfos(dates, repNumbers, days);
} }
for (size_t i = 0; i < m_reservoirBuilder.resultCount(); i++) for (size_t i = 0; i < m_reservoirBuilder.resultCount(); i++)
@@ -59,7 +59,7 @@ bool RifReaderMockModel::open(const QString& fileName, RigEclipseCaseData* eclip
if (m_reservoirBuilder.timeStepCount() == 0) return true; if (m_reservoirBuilder.timeStepCount() == 0) return true;
std::vector<RigTimeStepInfo> staticResultTimeStepInfos; std::vector<RigEclipseTimeStepInfo> staticResultTimeStepInfos;
staticResultTimeStepInfos.push_back(timeStepInfos[0]); staticResultTimeStepInfos.push_back(timeStepInfos[0]);
for (int i = 0; i < static_cast<int>(m_reservoirBuilder.resultCount()); i++) for (int i = 0; i < static_cast<int>(m_reservoirBuilder.resultCount()); i++)

4
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp
View File

@@ -24,7 +24,7 @@
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigResultAccessorFactory.h" #include "RigResultAccessorFactory.h"
#include "RigResultInfo.h" #include "RigEclipseResultInfo.h"
#include "RigResultModifier.h" #include "RigResultModifier.h"
#include "RigResultModifierFactory.h" #include "RigResultModifierFactory.h"
#include "RigStatisticsMath.h" #include "RigStatisticsMath.h"
@@ -44,7 +44,7 @@ void RimEclipseStatisticsCaseEvaluator::addNamedResult(RigCaseCellResultsData* d
// Use time step dates from first result in first source case // Use time step dates from first result in first source case
CVF_ASSERT(m_sourceCases.size() > 0); CVF_ASSERT(m_sourceCases.size() > 0);
std::vector<RigTimeStepInfo> sourceTimeStepInfos = m_sourceCases[0]->results(RiaDefines::MATRIX_MODEL)->cellResults()->timeStepInfos(0); std::vector<RigEclipseTimeStepInfo> sourceTimeStepInfos = m_sourceCases[0]->results(RiaDefines::MATRIX_MODEL)->cellResults()->timeStepInfos(0);
size_t destinationScalarResultIndex = destinationCellResults->addEmptyScalarResult(resultType, resultName, true); size_t destinationScalarResultIndex = destinationCellResults->addEmptyScalarResult(resultType, resultName, true);
CVF_ASSERT(destinationScalarResultIndex != cvf::UNDEFINED_SIZE_T); CVF_ASSERT(destinationScalarResultIndex != cvf::UNDEFINED_SIZE_T);

6
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@@ -25,7 +25,7 @@
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigGridManager.h" #include "RigGridManager.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigResultInfo.h" #include "RigEclipseResultInfo.h"
#include "RimCaseCollection.h" #include "RimCaseCollection.h"
#include "RimCellEdgeColors.h" #include "RimCellEdgeColors.h"
@@ -238,9 +238,9 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo()
{ {
RiaDefines::PorosityModelType poroModel = RiaDefines::MATRIX_MODEL; RiaDefines::PorosityModelType poroModel = RiaDefines::MATRIX_MODEL;
std::vector<RigTimeStepInfo> timeStepInfos = rigCaseData->results(poroModel)->timeStepInfos(0); std::vector<RigEclipseTimeStepInfo> timeStepInfos = rigCaseData->results(poroModel)->timeStepInfos(0);
const std::vector<RigResultInfo> resultInfos = rigCaseData->results(poroModel)->infoForEachResultIndex(); const std::vector<RigEclipseResultInfo> resultInfos = rigCaseData->results(poroModel)->infoForEachResultIndex();
for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++) for (size_t i = 1; i < caseCollection()->reservoirs.size(); i++)
{ {

6
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
View File

@@ -24,7 +24,7 @@
#include "RigCell.h" #include "RigCell.h"
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigResultInfo.h" #include "RigEclipseResultInfo.h"
#include "RimEclipseCase.h" #include "RimEclipseCase.h"
#include "RimTools.h" #include "RimTools.h"
@@ -91,7 +91,7 @@ void RimReservoirCellResultsStorage::setupBeforeSave()
if (!m_cellResults) return; if (!m_cellResults) return;
const std::vector<RigResultInfo>& resInfo = m_cellResults->infoForEachResultIndex(); const std::vector<RigEclipseResultInfo>& resInfo = m_cellResults->infoForEachResultIndex();
bool hasResultsToStore = false; bool hasResultsToStore = false;
for (size_t rIdx = 0; rIdx < resInfo.size(); ++rIdx) for (size_t rIdx = 0; rIdx < resInfo.size(); ++rIdx)
@@ -1496,7 +1496,7 @@ void RimReservoirCellResultsStorage::setCellResults(RigCaseCellResultsData* cell
std::vector<int> reportNumbers; // Hack: Using no report step numbers. Not really used except for Flow Diagnostics... std::vector<int> reportNumbers; // Hack: Using no report step numbers. Not really used except for Flow Diagnostics...
reportNumbers.resize(resInfo->m_timeStepDates().size()); reportNumbers.resize(resInfo->m_timeStepDates().size());
std::vector<RigTimeStepInfo> timeStepInfos = RigTimeStepInfo::createTimeStepInfos(resInfo->m_timeStepDates(), reportNumbers, resInfo->m_daysSinceSimulationStart()); std::vector<RigEclipseTimeStepInfo> timeStepInfos = RigEclipseTimeStepInfo::createTimeStepInfos(resInfo->m_timeStepDates(), reportNumbers, resInfo->m_daysSinceSimulationStart());
m_cellResults->setTimeStepInfos(resultIndex, timeStepInfos); m_cellResults->setTimeStepInfos(resultIndex, timeStepInfos);

4
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
View File

@@ -58,7 +58,7 @@ ${CEE_CURRENT_LIST_DIR}RigSimulationWellCoordsAndMD.h
${CEE_CURRENT_LIST_DIR}RigFishbonesGeometry.h ${CEE_CURRENT_LIST_DIR}RigFishbonesGeometry.h
${CEE_CURRENT_LIST_DIR}RigWellPathIntersectionTools.h ${CEE_CURRENT_LIST_DIR}RigWellPathIntersectionTools.h
${CEE_CURRENT_LIST_DIR}RigTransmissibilityEquations.h ${CEE_CURRENT_LIST_DIR}RigTransmissibilityEquations.h
${CEE_CURRENT_LIST_DIR}RigResultInfo.h ${CEE_CURRENT_LIST_DIR}RigEclipseResultInfo.h
${CEE_CURRENT_LIST_DIR}RigTofAccumulatedPhaseFractionsCalculator.h ${CEE_CURRENT_LIST_DIR}RigTofAccumulatedPhaseFractionsCalculator.h
@@ -113,7 +113,7 @@ ${CEE_CURRENT_LIST_DIR}RigSimulationWellCoordsAndMD.cpp
${CEE_CURRENT_LIST_DIR}RigFishbonesGeometry.cpp ${CEE_CURRENT_LIST_DIR}RigFishbonesGeometry.cpp
${CEE_CURRENT_LIST_DIR}RigWellPathIntersectionTools.cpp ${CEE_CURRENT_LIST_DIR}RigWellPathIntersectionTools.cpp
${CEE_CURRENT_LIST_DIR}RigTransmissibilityEquations.cpp ${CEE_CURRENT_LIST_DIR}RigTransmissibilityEquations.cpp
${CEE_CURRENT_LIST_DIR}RigResultInfo.cpp ${CEE_CURRENT_LIST_DIR}RigEclipseResultInfo.cpp
${CEE_CURRENT_LIST_DIR}RigTofAccumulatedPhaseFractionsCalculator.cpp ${CEE_CURRENT_LIST_DIR}RigTofAccumulatedPhaseFractionsCalculator.cpp
) )

18
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@@ -23,7 +23,7 @@
#include "RigEclipseMultiPropertyStatCalc.h" #include "RigEclipseMultiPropertyStatCalc.h"
#include "RigEclipseNativeStatCalc.h" #include "RigEclipseNativeStatCalc.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigResultInfo.h" #include "RigEclipseResultInfo.h"
#include "RigStatisticsDataCache.h" #include "RigStatisticsDataCache.h"
#include "RigStatisticsMath.h" #include "RigStatisticsMath.h"
@@ -207,7 +207,7 @@ std::vector<double>& RigCaseCellResultsData::cellScalarResults(size_t scalarResu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RigCaseCellResultsData::findScalarResultIndex(RiaDefines::ResultCatType type, const QString& resultName) const size_t RigCaseCellResultsData::findScalarResultIndex(RiaDefines::ResultCatType type, const QString& resultName) const
{ {
std::vector<RigResultInfo>::const_iterator it; std::vector<RigEclipseResultInfo>::const_iterator it;
for (it = m_resultInfos.begin(); it != m_resultInfos.end(); ++it) for (it = m_resultInfos.begin(); it != m_resultInfos.end(); ++it)
{ {
if (it->m_resultType == type && it->m_resultName == resultName) if (it->m_resultType == type && it->m_resultName == resultName)
@@ -268,7 +268,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RiaDefines::ResultCatType ty
scalarResultIndex = this->resultCount(); scalarResultIndex = this->resultCount();
m_cellScalarResults.push_back(std::vector<std::vector<double> >()); m_cellScalarResults.push_back(std::vector<std::vector<double> >());
RigResultInfo resInfo(type, needsToBeStored, false, resultName, scalarResultIndex); RigEclipseResultInfo resInfo(type, needsToBeStored, false, resultName, scalarResultIndex);
m_resultInfos.push_back(resInfo); m_resultInfos.push_back(resInfo);
// Create statistics calculator and add statistics cache object // Create statistics calculator and add statistics cache object
@@ -341,7 +341,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RiaDefines::ResultCatType ty
QStringList RigCaseCellResultsData::resultNames(RiaDefines::ResultCatType resType) const QStringList RigCaseCellResultsData::resultNames(RiaDefines::ResultCatType resType) const
{ {
QStringList varList; QStringList varList;
std::vector<RigResultInfo>::const_iterator it; std::vector<RigEclipseResultInfo>::const_iterator it;
for (it = m_resultInfos.begin(); it != m_resultInfos.end(); ++it) for (it = m_resultInfos.begin(); it != m_resultInfos.end(); ++it)
{ {
if (it->m_resultType == resType ) if (it->m_resultType == resType )
@@ -475,18 +475,18 @@ std::vector<int> RigCaseCellResultsData::reportStepNumbers(size_t scalarResultIn
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RigTimeStepInfo> RigCaseCellResultsData::timeStepInfos(size_t scalarResultIndex) const std::vector<RigEclipseTimeStepInfo> RigCaseCellResultsData::timeStepInfos(size_t scalarResultIndex) const
{ {
if (scalarResultIndex < m_resultInfos.size()) if (scalarResultIndex < m_resultInfos.size())
return m_resultInfos[scalarResultIndex].m_timeStepInfos; return m_resultInfos[scalarResultIndex].m_timeStepInfos;
else else
return std::vector<RigTimeStepInfo>(); return std::vector<RigEclipseTimeStepInfo>();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::setTimeStepInfos(size_t scalarResultIndex, const std::vector<RigTimeStepInfo>& timeStepInfos) void RigCaseCellResultsData::setTimeStepInfos(size_t scalarResultIndex, const std::vector<RigEclipseTimeStepInfo>& timeStepInfos)
{ {
CVF_ASSERT(scalarResultIndex < m_resultInfos.size() ); CVF_ASSERT(scalarResultIndex < m_resultInfos.size() );
@@ -621,7 +621,7 @@ bool RigCaseCellResultsData::updateResultName(RiaDefines::ResultCatType resultTy
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RigCaseCellResultsData::mustBeCalculated(size_t scalarResultIndex) const bool RigCaseCellResultsData::mustBeCalculated(size_t scalarResultIndex) const
{ {
std::vector<RigResultInfo>::const_iterator it; std::vector<RigEclipseResultInfo>::const_iterator it;
for (it = m_resultInfos.begin(); it != m_resultInfos.end(); ++it) for (it = m_resultInfos.begin(); it != m_resultInfos.end(); ++it)
{ {
if (it->m_gridScalarResultIndex == scalarResultIndex) if (it->m_gridScalarResultIndex == scalarResultIndex)
@@ -638,7 +638,7 @@ bool RigCaseCellResultsData::mustBeCalculated(size_t scalarResultIndex) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::setMustBeCalculated(size_t scalarResultIndex) void RigCaseCellResultsData::setMustBeCalculated(size_t scalarResultIndex)
{ {
std::vector<RigResultInfo>::iterator it; std::vector<RigEclipseResultInfo>::iterator it;
for (it = m_resultInfos.begin(); it != m_resultInfos.end(); ++it) for (it = m_resultInfos.begin(); it != m_resultInfos.end(); ++it)
{ {
if (it->m_gridScalarResultIndex == scalarResultIndex) if (it->m_gridScalarResultIndex == scalarResultIndex)

12
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
View File

@@ -34,9 +34,9 @@
class RifReaderInterface; class RifReaderInterface;
class RigActiveCellInfo; class RigActiveCellInfo;
class RigMainGrid; class RigMainGrid;
class RigResultInfo; class RigEclipseResultInfo;
class RigStatisticsDataCache; class RigStatisticsDataCache;
class RigTimeStepInfo; class RigEclipseTimeStepInfo;
//================================================================================================== //==================================================================================================
/// Class containing the results for the complete number of active cells. Both main grid and LGR's /// Class containing the results for the complete number of active cells. Both main grid and LGR's
@@ -83,8 +83,8 @@ public:
int reportStepNumber(size_t scalarResultIndex, size_t timeStepIndex) const; int reportStepNumber(size_t scalarResultIndex, size_t timeStepIndex) const;
std::vector<int> reportStepNumbers(size_t scalarResultIndex) const; std::vector<int> reportStepNumbers(size_t scalarResultIndex) const;
std::vector<RigTimeStepInfo> timeStepInfos(size_t scalarResultIndex) const; std::vector<RigEclipseTimeStepInfo> timeStepInfos(size_t scalarResultIndex) const;
void setTimeStepInfos(size_t scalarResultIndex, const std::vector<RigTimeStepInfo>& timeStepInfos); void setTimeStepInfos(size_t scalarResultIndex, const std::vector<RigEclipseTimeStepInfo>& timeStepInfos);
// Find or create a slot for the results // Find or create a slot for the results
@@ -109,7 +109,7 @@ public:
bool updateResultName(RiaDefines::ResultCatType resultType, QString& oldName, const QString& newName); bool updateResultName(RiaDefines::ResultCatType resultType, QString& oldName, const QString& newName);
public: public:
const std::vector<RigResultInfo>& infoForEachResultIndex() { return m_resultInfos;} const std::vector<RigEclipseResultInfo>& infoForEachResultIndex() { return m_resultInfos;}
bool mustBeCalculated(size_t scalarResultIndex) const; bool mustBeCalculated(size_t scalarResultIndex) const;
void setMustBeCalculated(size_t scalarResultIndex); void setMustBeCalculated(size_t scalarResultIndex);
@@ -128,7 +128,7 @@ private:
cvf::Collection<RigStatisticsDataCache> m_statisticsDataCache; cvf::Collection<RigStatisticsDataCache> m_statisticsDataCache;
private: private:
std::vector<RigResultInfo> m_resultInfos; std::vector<RigEclipseResultInfo> m_resultInfos;
RigMainGrid* m_ownerMainGrid; RigMainGrid* m_ownerMainGrid;
RigActiveCellInfo* m_activeCellInfo; RigActiveCellInfo* m_activeCellInfo;

18
ApplicationCode/ReservoirDataModel/RigResultInfo.cpp → ApplicationCode/ReservoirDataModel/RigEclipseResultInfo.cpp
View File

@@ -16,14 +16,14 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RigResultInfo.h" #include "RigEclipseResultInfo.h"
#include "cvfAssert.h" #include "cvfAssert.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigTimeStepInfo::RigTimeStepInfo(const QDateTime& date, int reportNumber, double daysSinceSimulationStart) RigEclipseTimeStepInfo::RigEclipseTimeStepInfo(const QDateTime& date, int reportNumber, double daysSinceSimulationStart)
: m_date(date), : m_date(date),
m_reportNumber(reportNumber), m_reportNumber(reportNumber),
m_daysSinceSimulationStart(daysSinceSimulationStart) m_daysSinceSimulationStart(daysSinceSimulationStart)
@@ -33,18 +33,18 @@ RigTimeStepInfo::RigTimeStepInfo(const QDateTime& date, int reportNumber, double
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RigTimeStepInfo> RigTimeStepInfo::createTimeStepInfos(std::vector<QDateTime> dates, std::vector<RigEclipseTimeStepInfo> RigEclipseTimeStepInfo::createTimeStepInfos(std::vector<QDateTime> dates,
std::vector<int> reportNumbers, std::vector<int> reportNumbers,
std::vector<double> daysSinceSimulationStarts) std::vector<double> daysSinceSimulationStarts)
{ {
CVF_ASSERT(dates.size() == reportNumbers.size()); CVF_ASSERT(dates.size() == reportNumbers.size());
CVF_ASSERT(dates.size() == daysSinceSimulationStarts.size()); CVF_ASSERT(dates.size() == daysSinceSimulationStarts.size());
std::vector<RigTimeStepInfo> timeStepInfos; std::vector<RigEclipseTimeStepInfo> timeStepInfos;
for (size_t i = 0; i < dates.size(); i++) for (size_t i = 0; i < dates.size(); i++)
{ {
timeStepInfos.push_back(RigTimeStepInfo(dates[i], reportNumbers[i], daysSinceSimulationStarts[i])); timeStepInfos.push_back(RigEclipseTimeStepInfo(dates[i], reportNumbers[i], daysSinceSimulationStarts[i]));
} }
return timeStepInfos; return timeStepInfos;
@@ -53,7 +53,7 @@ std::vector<RigTimeStepInfo> RigTimeStepInfo::createTimeStepInfos(std::vector<QD
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigResultInfo::RigResultInfo(RiaDefines::ResultCatType resultType, bool needsToBeStored, bool mustBeCalculated, RigEclipseResultInfo::RigEclipseResultInfo(RiaDefines::ResultCatType resultType, bool needsToBeStored, bool mustBeCalculated,
QString resultName, size_t gridScalarResultIndex) QString resultName, size_t gridScalarResultIndex)
: m_resultType(resultType), : m_resultType(resultType),
m_needsToBeStored(needsToBeStored), m_needsToBeStored(needsToBeStored),
@@ -66,7 +66,7 @@ RigResultInfo::RigResultInfo(RiaDefines::ResultCatType resultType, bool needsToB
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<QDateTime> RigResultInfo::dates() const std::vector<QDateTime> RigEclipseResultInfo::dates() const
{ {
std::vector<QDateTime> values; std::vector<QDateTime> values;
@@ -81,7 +81,7 @@ std::vector<QDateTime> RigResultInfo::dates() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<double> RigResultInfo::daysSinceSimulationStarts() const std::vector<double> RigEclipseResultInfo::daysSinceSimulationStarts() const
{ {
std::vector<double> values; std::vector<double> values;
@@ -96,7 +96,7 @@ std::vector<double> RigResultInfo::daysSinceSimulationStarts() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<int> RigResultInfo::reportNumbers() const std::vector<int> RigEclipseResultInfo::reportNumbers() const
{ {
std::vector<int> values; std::vector<int> values;

12
ApplicationCode/ReservoirDataModel/RigResultInfo.h → ApplicationCode/ReservoirDataModel/RigEclipseResultInfo.h
View File

@@ -28,12 +28,12 @@
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RigTimeStepInfo class RigEclipseTimeStepInfo
{ {
public: public:
RigTimeStepInfo(const QDateTime& date, int reportNumber, double daysSinceSimulationStart); RigEclipseTimeStepInfo(const QDateTime& date, int reportNumber, double daysSinceSimulationStart);
static std::vector<RigTimeStepInfo> createTimeStepInfos(std::vector<QDateTime> dates, static std::vector<RigEclipseTimeStepInfo> createTimeStepInfos(std::vector<QDateTime> dates,
std::vector<int> reportNumbers, std::vector<int> reportNumbers,
std::vector<double> daysSinceSimulationStarts); std::vector<double> daysSinceSimulationStarts);
public: public:
@@ -46,10 +46,10 @@ public:
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RigResultInfo class RigEclipseResultInfo
{ {
public: public:
RigResultInfo(RiaDefines::ResultCatType resultType, bool needsToBeStored, bool mustBeCalculated, RigEclipseResultInfo(RiaDefines::ResultCatType resultType, bool needsToBeStored, bool mustBeCalculated,
QString resultName, size_t gridScalarResultIndex); QString resultName, size_t gridScalarResultIndex);
std::vector<QDateTime> dates() const; std::vector<QDateTime> dates() const;
@@ -63,5 +63,5 @@ public:
QString m_resultName; QString m_resultName;
size_t m_gridScalarResultIndex; size_t m_gridScalarResultIndex;
std::vector<RigTimeStepInfo> m_timeStepInfos; std::vector<RigEclipseTimeStepInfo> m_timeStepInfos;
}; };