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 of ...ResultsCacher to ...ResultsStorage. Hide Cacher from UI tree

Browse Source 
p4#: 20963
This commit is contained in:
Jacob Støren 2013-03-19 10:29:34 +01:00
parent 051710b82f
commit 75fc89e67a
10 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RigStatistics.cpp
View File

@ -156,7 +156,7 @@ void RigStatistics::buildSourceMetaData(RimDefines::ResultCatType resultType, co
{ {
RigEclipseCase* eclipseCase = m_sourceCases.at(caseIdx)->reservoirData(); RigEclipseCase* eclipseCase = m_sourceCases.at(caseIdx)->reservoirData();
RimReservoirCellResultsCacher* matrixResults = m_sourceCases[caseIdx]->results(RifReaderInterface::MATRIX_RESULTS); RimReservoirCellResultsStorage* matrixResults = m_sourceCases[caseIdx]->results(RifReaderInterface::MATRIX_RESULTS);
size_t scalarResultIndex = matrixResults->findOrLoadScalarResult(resultType, resultName); size_t scalarResultIndex = matrixResults->findOrLoadScalarResult(resultType, resultName);
if (scalarResultIndex == cvf::UNDEFINED_SIZE_T) if (scalarResultIndex == cvf::UNDEFINED_SIZE_T)
{ {

2
ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
View File

@ -143,7 +143,7 @@ void RimCellPropertyFilter::setDefaultValues()
size_t scalarIndex = resultDefinition->gridScalarIndex(); size_t scalarIndex = resultDefinition->gridScalarIndex();
if (scalarIndex != cvf::UNDEFINED_SIZE_T) if (scalarIndex != cvf::UNDEFINED_SIZE_T)
{ {
RimReservoirCellResultsCacher* results = m_parentContainer->reservoirView()->currentGridCellResults(); RimReservoirCellResultsStorage* results = m_parentContainer->reservoirView()->currentGridCellResults();
if (results) if (results)
{ {
results->cellResults()->minMaxCellScalarValues(scalarIndex, min, max); results->cellResults()->minMaxCellScalarValues(scalarIndex, min, max);

4
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp
View File

@ -191,8 +191,8 @@ bool RimInputReservoir::openEclipseGridFile()
RIApplication* app = RIApplication::instance(); RIApplication* app = RIApplication::instance();
if (app->preferences()->autocomputeDepthRelatedProperties) if (app->preferences()->autocomputeDepthRelatedProperties)
{ {
RimReservoirCellResultsCacher* matrixResults = results(RifReaderInterface::MATRIX_RESULTS); RimReservoirCellResultsStorage* matrixResults = results(RifReaderInterface::MATRIX_RESULTS);
RimReservoirCellResultsCacher* fractureResults = results(RifReaderInterface::FRACTURE_RESULTS); RimReservoirCellResultsStorage* fractureResults = results(RifReaderInterface::FRACTURE_RESULTS);
matrixResults->computeDepthRelatedResults(); matrixResults->computeDepthRelatedResults();
fractureResults->computeDepthRelatedResults(); fractureResults->computeDepthRelatedResults();

8
ApplicationCode/ProjectDataModel/RimReservoir.cpp
View File

@ -47,10 +47,12 @@ RimReservoir::RimReservoir()
CAF_PDM_InitFieldNoDefault(&reservoirViews, "ReservoirViews", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&reservoirViews, "ReservoirViews", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_matrixModelResults, "MatrixModelResults", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_matrixModelResults, "MatrixModelResults", "", "", "", "");
m_matrixModelResults.setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_fractureModelResults, "FractureModelResults", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_fractureModelResults, "FractureModelResults", "", "", "", "");
m_fractureModelResults.setUiHidden(true);
m_matrixModelResults = new RimReservoirCellResultsCacher; m_matrixModelResults = new RimReservoirCellResultsStorage;
m_fractureModelResults = new RimReservoirCellResultsCacher; m_fractureModelResults = new RimReservoirCellResultsStorage;
this->setReservoirData( NULL ); this->setReservoirData( NULL );
} }
@ -316,7 +318,7 @@ void RimReservoir::setReservoirData(RigEclipseCase* eclipseCase)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimReservoirCellResultsCacher* RimReservoir::results(RifReaderInterface::PorosityModelResultType porosityModel) RimReservoirCellResultsStorage* RimReservoir::results(RifReaderInterface::PorosityModelResultType porosityModel)
{ {
if (porosityModel == RifReaderInterface::MATRIX_RESULTS) if (porosityModel == RifReaderInterface::MATRIX_RESULTS)
{ {

6
ApplicationCode/ProjectDataModel/RimReservoir.h
View File

@ -55,7 +55,7 @@ public:
RigEclipseCase* reservoirData(); RigEclipseCase* reservoirData();
const RigEclipseCase* reservoirData() const; const RigEclipseCase* reservoirData() const;
RimReservoirCellResultsCacher* results(RifReaderInterface::PorosityModelResultType porosityModel); RimReservoirCellResultsStorage* results(RifReaderInterface::PorosityModelResultType porosityModel);
RimReservoirView* createAndAddReservoirView(); RimReservoirView* createAndAddReservoirView();
void removeReservoirView(RimReservoirView* reservoirView); void removeReservoirView(RimReservoirView* reservoirView);
@ -83,7 +83,7 @@ private:
cvf::ref<RigEclipseCase> m_rigEclipseCase; cvf::ref<RigEclipseCase> m_rigEclipseCase;
private: private:
caf::PdmField<RimReservoirCellResultsCacher*> m_matrixModelResults; caf::PdmField<RimReservoirCellResultsStorage*> m_matrixModelResults;
caf::PdmField<RimReservoirCellResultsCacher*> m_fractureModelResults; caf::PdmField<RimReservoirCellResultsStorage*> m_fractureModelResults;
}; };

40
ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
View File

@ -23,12 +23,12 @@
#include "RigMainGrid.h" #include "RigMainGrid.h"
#include "RigCell.h" #include "RigCell.h"
CAF_PDM_SOURCE_INIT(RimReservoirCellResultsCacher, "ReservoirCellResultCacher"); CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorage, "ReservoirCellResultStorage");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimReservoirCellResultsCacher::RimReservoirCellResultsCacher() RimReservoirCellResultsStorage::RimReservoirCellResultsStorage()
: m_cellResults(NULL), : m_cellResults(NULL),
m_ownerMainGrid(NULL) m_ownerMainGrid(NULL)
{ {
@ -44,7 +44,7 @@ RimReservoirCellResultsCacher::RimReservoirCellResultsCacher()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimReservoirCellResultsCacher::~RimReservoirCellResultsCacher() RimReservoirCellResultsStorage::~RimReservoirCellResultsStorage()
{ {
m_resultCacheMetaData.deleteAllChildObjects(); m_resultCacheMetaData.deleteAllChildObjects();
} }
@ -56,7 +56,7 @@ RimReservoirCellResultsCacher::~RimReservoirCellResultsCacher()
/// MagicNumber<uint32>, Version<uint32>, ResultVariables< Array < TimeStep< CellDataArraySize<uint64>, CellData< Array<double > > > > /// MagicNumber<uint32>, Version<uint32>, ResultVariables< Array < TimeStep< CellDataArraySize<uint64>, CellData< Array<double > > > >
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirCellResultsCacher::setupBeforeSave() void RimReservoirCellResultsStorage::setupBeforeSave()
{ {
if (!m_cellResults) return; if (!m_cellResults) return;
@ -90,7 +90,7 @@ void RimReservoirCellResultsCacher::setupBeforeSave()
if (timestepCount) if (timestepCount)
{ {
// Create and setup the cache information for this result // Create and setup the cache information for this result
RimReservoirCellResultsCacheEntryInfo* cacheEntry = new RimReservoirCellResultsCacheEntryInfo; RimReservoirCellResultsStorageEntryInfo* cacheEntry = new RimReservoirCellResultsStorageEntryInfo;
m_resultCacheMetaData.push_back(cacheEntry); m_resultCacheMetaData.push_back(cacheEntry);
cacheEntry->m_resultType = resInfo[rIdx].m_resultType; cacheEntry->m_resultType = resInfo[rIdx].m_resultType;
@ -132,7 +132,7 @@ void RimReservoirCellResultsCacher::setupBeforeSave()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimReservoirCellResultsCacher::getValidCacheFileName() QString RimReservoirCellResultsStorage::getValidCacheFileName()
{ {
QString cacheFileName; QString cacheFileName;
if (m_resultCacheFileName().isEmpty()) if (m_resultCacheFileName().isEmpty())
@ -155,7 +155,7 @@ QString RimReservoirCellResultsCacher::getValidCacheFileName()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimReservoirCellResultsCacher::getCacheDirectoryPath() QString RimReservoirCellResultsStorage::getCacheDirectoryPath()
{ {
QString cacheDirPath; QString cacheDirPath;
QString projectFileName = RIApplication::instance()->project()->fileName(); QString projectFileName = RIApplication::instance()->project()->fileName();
@ -168,7 +168,7 @@ QString RimReservoirCellResultsCacher::getCacheDirectoryPath()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirCellResultsCacher::setReaderInterface(RifReaderInterface* readerInterface) void RimReservoirCellResultsStorage::setReaderInterface(RifReaderInterface* readerInterface)
{ {
m_readerInterface = readerInterface; m_readerInterface = readerInterface;
} }
@ -177,7 +177,7 @@ void RimReservoirCellResultsCacher::setReaderInterface(RifReaderInterface* reade
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifReaderInterface* RimReservoirCellResultsCacher::readerInterface() RifReaderInterface* RimReservoirCellResultsStorage::readerInterface()
{ {
return m_readerInterface.p(); return m_readerInterface.p();
} }
@ -185,7 +185,7 @@ RifReaderInterface* RimReservoirCellResultsCacher::readerInterface()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RimReservoirCellResultsCacher::findOrLoadScalarResultForTimeStep(RimDefines::ResultCatType type, const QString& resultName, size_t timeStepIndex) size_t RimReservoirCellResultsStorage::findOrLoadScalarResultForTimeStep(RimDefines::ResultCatType type, const QString& resultName, size_t timeStepIndex)
{ {
// Special handling for SOIL // Special handling for SOIL
if (type == RimDefines::DYNAMIC_NATIVE && resultName.toUpper() == "SOIL") if (type == RimDefines::DYNAMIC_NATIVE && resultName.toUpper() == "SOIL")
@ -248,7 +248,7 @@ size_t RimReservoirCellResultsCacher::findOrLoadScalarResultForTimeStep(RimDefin
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RimReservoirCellResultsCacher::findOrLoadScalarResult(RimDefines::ResultCatType type, const QString& resultName) size_t RimReservoirCellResultsStorage::findOrLoadScalarResult(RimDefines::ResultCatType type, const QString& resultName)
{ {
size_t resultGridIndex = cvf::UNDEFINED_SIZE_T; size_t resultGridIndex = cvf::UNDEFINED_SIZE_T;
@ -308,7 +308,7 @@ size_t RimReservoirCellResultsCacher::findOrLoadScalarResult(RimDefines::ResultC
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirCellResultsCacher::loadOrComputeSOIL() void RimReservoirCellResultsStorage::loadOrComputeSOIL()
{ {
for (size_t timeStepIdx = 0; timeStepIdx < m_cellResults->maxTimeStepCount(); timeStepIdx++) for (size_t timeStepIdx = 0; timeStepIdx < m_cellResults->maxTimeStepCount(); timeStepIdx++)
{ {
@ -320,7 +320,7 @@ void RimReservoirCellResultsCacher::loadOrComputeSOIL()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirCellResultsCacher::loadOrComputeSOILForTimeStep(size_t timeStepIndex) void RimReservoirCellResultsStorage::loadOrComputeSOILForTimeStep(size_t timeStepIndex)
{ {
size_t scalarIndexSWAT = findOrLoadScalarResultForTimeStep(RimDefines::DYNAMIC_NATIVE, "SWAT", timeStepIndex); size_t scalarIndexSWAT = findOrLoadScalarResultForTimeStep(RimDefines::DYNAMIC_NATIVE, "SWAT", timeStepIndex);
size_t scalarIndexSGAS = findOrLoadScalarResultForTimeStep(RimDefines::DYNAMIC_NATIVE, "SGAS", timeStepIndex); size_t scalarIndexSGAS = findOrLoadScalarResultForTimeStep(RimDefines::DYNAMIC_NATIVE, "SGAS", timeStepIndex);
@ -404,7 +404,7 @@ void RimReservoirCellResultsCacher::loadOrComputeSOILForTimeStep(size_t timeStep
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirCellResultsCacher::computeDepthRelatedResults() void RimReservoirCellResultsStorage::computeDepthRelatedResults()
{ {
size_t depthResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DEPTH"); size_t depthResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DEPTH");
size_t dxResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DX"); size_t dxResultGridIndex = findOrLoadScalarResult(RimDefines::STATIC_NATIVE, "DX");
@ -509,7 +509,7 @@ void RimReservoirCellResultsCacher::computeDepthRelatedResults()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RimReservoirCellResultsCacher::findOrLoadScalarResult(const QString& resultName) size_t RimReservoirCellResultsStorage::findOrLoadScalarResult(const QString& resultName)
{ {
size_t scalarResultIndex = cvf::UNDEFINED_SIZE_T; size_t scalarResultIndex = cvf::UNDEFINED_SIZE_T;
@ -536,7 +536,7 @@ size_t RimReservoirCellResultsCacher::findOrLoadScalarResult(const QString& resu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirCellResultsCacher::setCellResults(RigReservoirCellResults* cellResults) void RimReservoirCellResultsStorage::setCellResults(RigReservoirCellResults* cellResults)
{ {
m_cellResults = cellResults; m_cellResults = cellResults;
} }
@ -544,18 +544,18 @@ void RimReservoirCellResultsCacher::setCellResults(RigReservoirCellResults* cell
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirCellResultsCacher::setMainGrid(RigMainGrid* mainGrid) void RimReservoirCellResultsStorage::setMainGrid(RigMainGrid* mainGrid)
{ {
m_ownerMainGrid = mainGrid; m_ownerMainGrid = mainGrid;
} }
CAF_PDM_SOURCE_INIT(RimReservoirCellResultsCacheEntryInfo, "ResultCacheEntryInfo"); CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorageEntryInfo, "ResultStorageEntryInfo");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimReservoirCellResultsCacheEntryInfo::RimReservoirCellResultsCacheEntryInfo() RimReservoirCellResultsStorageEntryInfo::RimReservoirCellResultsStorageEntryInfo()
{ {
CAF_PDM_InitObject("Cache Entry", "", "", ""); CAF_PDM_InitObject("Cache Entry", "", "", "");
@ -569,7 +569,7 @@ RimReservoirCellResultsCacheEntryInfo::RimReservoirCellResultsCacheEntryInfo()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimReservoirCellResultsCacheEntryInfo::~RimReservoirCellResultsCacheEntryInfo() RimReservoirCellResultsStorageEntryInfo::~RimReservoirCellResultsStorageEntryInfo()
{ {
} }

16
ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.h
View File

@ -24,21 +24,21 @@
#include "cafAppEnum.h" #include "cafAppEnum.h"
#include "RimDefines.h" #include "RimDefines.h"
class RimReservoirCellResultsCacheEntryInfo; class RimReservoirCellResultsStorageEntryInfo;
class RigReservoirCellResults; class RigReservoirCellResults;
class RifReaderInterface; class RifReaderInterface;
class RigMainGrid; class RigMainGrid;
class RimReservoirCellResultsCacher : public caf::PdmObject class RimReservoirCellResultsStorage : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimReservoirCellResultsCacher(); RimReservoirCellResultsStorage();
virtual ~RimReservoirCellResultsCacher(); virtual ~RimReservoirCellResultsStorage();
// Fields // Fields
caf::PdmField<QString> m_resultCacheFileName; caf::PdmField<QString> m_resultCacheFileName;
caf::PdmPointersField<RimReservoirCellResultsCacheEntryInfo*> caf::PdmPointersField<RimReservoirCellResultsStorageEntryInfo*>
m_resultCacheMetaData; m_resultCacheMetaData;
RigReservoirCellResults* cellResults() { return m_cellResults; } RigReservoirCellResults* cellResults() { return m_cellResults; }
@ -70,12 +70,12 @@ private:
RigMainGrid* m_ownerMainGrid; RigMainGrid* m_ownerMainGrid;
}; };
class RimReservoirCellResultsCacheEntryInfo : public caf::PdmObject class RimReservoirCellResultsStorageEntryInfo : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimReservoirCellResultsCacheEntryInfo(); RimReservoirCellResultsStorageEntryInfo();
virtual ~RimReservoirCellResultsCacheEntryInfo(); virtual ~RimReservoirCellResultsStorageEntryInfo();
caf::PdmField<caf::AppEnum< RimDefines::ResultCatType> > m_resultType; caf::PdmField<caf::AppEnum< RimDefines::ResultCatType> > m_resultType;
caf::PdmField<QString> m_resultName; caf::PdmField<QString> m_resultName;

4
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -711,7 +711,7 @@ void RimReservoirView::loadDataAndUpdate()
RIApplication* app = RIApplication::instance(); RIApplication* app = RIApplication::instance();
if (app->preferences()->autocomputeSOIL) if (app->preferences()->autocomputeSOIL)
{ {
RimReservoirCellResultsCacher* results = currentGridCellResults(); RimReservoirCellResultsStorage* results = currentGridCellResults();
CVF_ASSERT(results); CVF_ASSERT(results);
results->loadOrComputeSOIL(); results->loadOrComputeSOIL();
} }
@ -970,7 +970,7 @@ void RimReservoirView::setupBeforeSave()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Convenience for quick access to results /// Convenience for quick access to results
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimReservoirCellResultsCacher* RimReservoirView::currentGridCellResults() RimReservoirCellResultsStorage* RimReservoirView::currentGridCellResults()
{ {
if (m_reservoir) if (m_reservoir)
{ {

2
ApplicationCode/ProjectDataModel/RimReservoirView.h
View File

@ -117,7 +117,7 @@ public:
caf::PdmField<bool> animationMode; caf::PdmField<bool> animationMode;
// Access internal objects // Access internal objects
RimReservoirCellResultsCacher* currentGridCellResults(); RimReservoirCellResultsStorage* currentGridCellResults();
RigActiveCellInfo* currentActiveCellInfo(); RigActiveCellInfo* currentActiveCellInfo();
void setEclipseCase(RimReservoir* reservoir); void setEclipseCase(RimReservoir* reservoir);

6
ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
View File

@ -119,7 +119,7 @@ size_t RimResultDefinition::gridScalarIndex() const
{ {
if (m_gridScalarResultIndex == cvf::UNDEFINED_SIZE_T) if (m_gridScalarResultIndex == cvf::UNDEFINED_SIZE_T)
{ {
const RimReservoirCellResultsCacher* gridCellResults = m_reservoirView->currentGridCellResults(); const RimReservoirCellResultsStorage* gridCellResults = m_reservoirView->currentGridCellResults();
if (gridCellResults) m_gridScalarResultIndex = gridCellResults->cellResults()->findScalarResultIndex(resultType(), resultVariable()); if (gridCellResults) m_gridScalarResultIndex = gridCellResults->cellResults()->findScalarResultIndex(resultType(), resultVariable());
} }
return m_gridScalarResultIndex; return m_gridScalarResultIndex;
@ -130,7 +130,7 @@ size_t RimResultDefinition::gridScalarIndex() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimResultDefinition::loadResult() void RimResultDefinition::loadResult()
{ {
RimReservoirCellResultsCacher* gridCellResults = m_reservoirView->currentGridCellResults(); RimReservoirCellResultsStorage* gridCellResults = m_reservoirView->currentGridCellResults();
if (gridCellResults) if (gridCellResults)
{ {
m_gridScalarResultIndex = gridCellResults->findOrLoadScalarResult(resultType(), resultVariable); m_gridScalarResultIndex = gridCellResults->findOrLoadScalarResult(resultType(), resultVariable);
@ -148,7 +148,7 @@ void RimResultDefinition::loadResult()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimResultDefinition::hasStaticResult() const bool RimResultDefinition::hasStaticResult() const
{ {
const RimReservoirCellResultsCacher* gridCellResults = m_reservoirView->currentGridCellResults(); const RimReservoirCellResultsStorage* gridCellResults = m_reservoirView->currentGridCellResults();
if (hasResult() && gridCellResults->cellResults()->timeStepCount(m_gridScalarResultIndex) == 1 ) if (hasResult() && gridCellResults->cellResults()->timeStepCount(m_gridScalarResultIndex) == 1 )
{ {
return true; return true;