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

Removed obsolete code and renamed functions

Browse Source
This commit is contained in:
Magne Sjaastad 2014-08-19 14:02:21 +02:00
parent 72daff665d
commit f98a909e51
5 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp
View File

@ -720,15 +720,6 @@ size_t RimReservoirCellResultsStorage::storedResultsCount()
return m_resultCacheMetaData.size(); return m_resultCacheMetaData.size();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReservoirCellResultsStorage::createCombinedTransmissibilityResults()
{
if (!m_cellResults) return;
m_cellResults->createCombinedTransmissibilityResult();
}
CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorageEntryInfo, "ResultStorageEntryInfo"); CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorageEntryInfo, "ResultStorageEntryInfo");

1
ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h
View File

@ -53,7 +53,6 @@ public:
RifReaderInterface* readerInterface(); RifReaderInterface* readerInterface();
void loadOrComputeSOIL(); void loadOrComputeSOIL();
void createCombinedTransmissibilityResults();
void computeDepthRelatedResults(); void computeDepthRelatedResults();
size_t findOrLoadScalarResultForTimeStep(RimDefines::ResultCatType type, const QString& resultName, size_t timeStepIndex); size_t findOrLoadScalarResultForTimeStep(RimDefines::ResultCatType type, const QString& resultName, size_t timeStepIndex);

4
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -920,12 +920,12 @@ void RimReservoirView::loadDataAndUpdate()
{ {
RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::MATRIX_RESULTS); RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::MATRIX_RESULTS);
results->loadOrComputeSOIL(); results->loadOrComputeSOIL();
results->createCombinedTransmissibilityResults(); if (results->cellResults()) results->cellResults()->createPerFaceCombinedResults();
} }
{ {
RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::FRACTURE_RESULTS); RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::FRACTURE_RESULTS);
results->loadOrComputeSOIL(); results->loadOrComputeSOIL();
results->createCombinedTransmissibilityResults(); if (results->cellResults()) results->cellResults()->createPerFaceCombinedResults();
} }
} }
} }

2
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@ -506,7 +506,7 @@ void RigCaseCellResultsData::setMustBeCalculated(size_t scalarResultIndex)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::createCombinedTransmissibilityResult() void RigCaseCellResultsData::createPerFaceCombinedResults()
{ {
{ {
size_t combinedTransmissibilityIndex = findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedTransmissibilityResultName()); size_t combinedTransmissibilityIndex = findScalarResultIndex(RimDefines::STATIC_NATIVE, RimDefines::combinedTransmissibilityResultName());

2
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
View File

@ -70,7 +70,7 @@ public:
size_t addEmptyScalarResult(RimDefines::ResultCatType type, const QString& resultName, bool needsToBeStored); size_t addEmptyScalarResult(RimDefines::ResultCatType type, const QString& resultName, bool needsToBeStored);
QString makeResultNameUnique(const QString& resultNameProposal) const; QString makeResultNameUnique(const QString& resultNameProposal) const;
void createCombinedTransmissibilityResult(); void createPerFaceCombinedResults();
void removeResult(const QString& resultName); void removeResult(const QString& resultName);
void clearAllResults(); void clearAllResults();