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

Fixed missing result names when auto SOIL is off

Browse Source
This commit is contained in:
Jacob Støren 2014-08-20 11:32:50 +02:00
parent 83965a4f7b
commit b7693f449b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -916,19 +916,26 @@ void RimReservoirView::loadDataAndUpdate()
else else
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
if (app->preferences()->autocomputeSOIL)
{ {
RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::MATRIX_RESULTS);
if (results->cellResults()) results->cellResults()->createPlaceholderResultEntries();
if (app->preferences()->autocomputeSOIL)
{ {
RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::MATRIX_RESULTS);
results->loadOrComputeSOIL(); results->loadOrComputeSOIL();
if (results->cellResults()) results->cellResults()->createPerFaceCombinedResults();
}
{
RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::FRACTURE_RESULTS);
results->loadOrComputeSOIL();
if (results->cellResults()) results->cellResults()->createPerFaceCombinedResults();
} }
} }
{
RimReservoirCellResultsStorage* results = m_reservoir->results(RifReaderInterface::FRACTURE_RESULTS);
if (results->cellResults()) results->cellResults()->createPlaceholderResultEntries();
if (app->preferences()->autocomputeSOIL)
{
results->loadOrComputeSOIL();
}
}
} }
} }

2
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@ -510,7 +510,7 @@ void RigCaseCellResultsData::setMustBeCalculated(size_t scalarResultIndex)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::createPerFaceCombinedResults() void RigCaseCellResultsData::createPlaceholderResultEntries()
{ {
{ {
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 createPerFaceCombinedResults(); void createPlaceholderResultEntries();
void removeResult(const QString& resultName); void removeResult(const QString& resultName);
void clearAllResults(); void clearAllResults();