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

Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2015-11-05 09:03:57 +01:00
parent 7db6835075
commit b30604edd1
3 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp
View File

@ -38,7 +38,8 @@ RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigCaseData* eclipseC
m_porosityModel(porosityModel) m_porosityModel(porosityModel)
{ {
m_face = cvf::StructGridInterface::NO_FACE; m_face = cvf::StructGridInterface::NO_FACE;
m_nncIndex = cvf::UNDEFINED_SIZE_T;
computeTimeHistoryData();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -47,28 +48,22 @@ RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigCaseData* eclipseC
void RigTimeHistoryResultAccessor::setFace(cvf::StructGridInterface::FaceType face) void RigTimeHistoryResultAccessor::setFace(cvf::StructGridInterface::FaceType face)
{ {
m_face = face; m_face = face;
computeTimeHistoryData();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigTimeHistoryResultAccessor::setNncIndex(size_t nncIndex) std::vector<double> RigTimeHistoryResultAccessor::timeHistoryValues() const
{ {
m_nncIndex = nncIndex; return m_timeHistoryValues;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<double> RigTimeHistoryResultAccessor::yValues() const QString RigTimeHistoryResultAccessor::topologyText() const
{
return m_yValues;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigTimeHistoryResultAccessor::topologyText()
{ {
QString text; QString text;
@ -99,9 +94,9 @@ QString RigTimeHistoryResultAccessor::topologyText()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigTimeHistoryResultAccessor::computeCurveData() void RigTimeHistoryResultAccessor::computeTimeHistoryData()
{ {
if (m_yValues.size() != 0) return; m_timeHistoryValues.clear();
if (m_eclipseCaseData) if (m_eclipseCaseData)
{ {
@ -111,7 +106,7 @@ void RigTimeHistoryResultAccessor::computeCurveData()
{ {
cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createResultAccessor(m_eclipseCaseData, m_gridIndex, m_porosityModel, i, m_scalarResultIndex); cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createResultAccessor(m_eclipseCaseData, m_gridIndex, m_porosityModel, i, m_scalarResultIndex);
m_yValues.push_back(resultAccessor->cellScalar(m_cellIndex)); m_timeHistoryValues.push_back(resultAccessor->cellScalar(m_cellIndex));
} }
} }
} }

16
ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h
View File

@ -29,30 +29,24 @@ class RigTimeHistoryResultAccessor
{ {
public: public:
RigTimeHistoryResultAccessor(RigCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel); RigTimeHistoryResultAccessor(RigCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel);
void setFace(cvf::StructGridInterface::FaceType face); void setFace(cvf::StructGridInterface::FaceType face);
void setNncIndex(size_t nncIndex);
void computeCurveData(); QString topologyText() const;
QString topologyText(); std::vector<double> timeHistoryValues() const;
QString curveName() const;
std::vector<double> yValues() const;
private: private:
void computeTimeHistoryData();
private: private:
RigCaseData* m_eclipseCaseData; RigCaseData* m_eclipseCaseData;
size_t m_gridIndex; size_t m_gridIndex;
size_t m_cellIndex; size_t m_cellIndex;
size_t m_nncIndex;
size_t m_scalarResultIndex; size_t m_scalarResultIndex;
cvf::StructGridInterface::FaceType m_face; cvf::StructGridInterface::FaceType m_face;
RifReaderInterface::PorosityModelResultType m_porosityModel; RifReaderInterface::PorosityModelResultType m_porosityModel;
std::vector<double> m_yValues; std::vector<double> m_timeHistoryValues;
}; };

4
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -540,7 +540,7 @@ void RiuViewerCommands::addTimeHistoryCurve(RimEclipseView* eclipseView, size_t
std::vector<QDateTime> timeStepDates = eclipseView->eclipseCase()->reservoirData()->results(porosityModel)->timeStepDates(eclipseView->cellResult()->scalarResultIndex()); std::vector<QDateTime> timeStepDates = eclipseView->eclipseCase()->reservoirData()->results(porosityModel)->timeStepDates(eclipseView->cellResult()->scalarResultIndex());
RigTimeHistoryResultAccessor timeHistResultAccessor(eclipseView->eclipseCase()->reservoirData(), gridIndex, cellIndex, eclipseView->cellResult()->scalarResultIndex(), porosityModel); RigTimeHistoryResultAccessor timeHistResultAccessor(eclipseView->eclipseCase()->reservoirData(), gridIndex, cellIndex, eclipseView->cellResult()->scalarResultIndex(), porosityModel);
timeHistResultAccessor.computeCurveData(); timeHistResultAccessor.computeTimeHistoryData();
QString curveName = eclipseView->eclipseCase()->caseUserDescription(); QString curveName = eclipseView->eclipseCase()->caseUserDescription();
curveName += " - Result : "; curveName += " - Result : ";
@ -548,7 +548,7 @@ void RiuViewerCommands::addTimeHistoryCurve(RimEclipseView* eclipseView, size_t
curveName += " - "; curveName += " - ";
curveName += timeHistResultAccessor.topologyText(); curveName += timeHistResultAccessor.topologyText();
std::vector<double> yValues = timeHistResultAccessor.yValues(); std::vector<double> yValues = timeHistResultAccessor.timeHistoryValues();
CVF_ASSERT(timeStepDates.size() == yValues.size()); CVF_ASSERT(timeStepDates.size() == yValues.size());