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

Added special handling of combined transmissibility

Browse Source
This commit is contained in:
Magne Sjaastad
2013-12-16 20:26:52 +01:00
parent 57e136d50a
commit e824b8f7b0
7 changed files with 154 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimDefines.h
View File

@@ -40,5 +40,7 @@ public:
};
static QString undefinedResultName() { return "None"; }
static QString combinedTransmissibilityResultName() { return "CombTrans"; }
};

10
ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
View File

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

1
ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.h
View File

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

1
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -941,6 +941,7 @@ void RimReservoirView::loadDataAndUpdate()
RimReservoirCellResultsStorage* results = currentGridCellResults();
CVF_ASSERT(results);
results->loadOrComputeSOIL();
results->createCombinedTransmissibilityResults();
}
}
}

12
ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
View File

@@ -196,7 +196,17 @@ void RimResultDefinition::loadResult()
RimReservoirCellResultsStorage* gridCellResults = this->currentGridCellResults();
if (gridCellResults)
{
gridCellResults->findOrLoadScalarResult(m_resultType(), m_resultVariable);
if (m_resultType() == RimDefines::STATIC_NATIVE &&
m_resultVariable().compare(RimDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0)
{
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANX");
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANY");
gridCellResults->findOrLoadScalarResult(m_resultType(), "TRANZ");
}
else
{
gridCellResults->findOrLoadScalarResult(m_resultType(), m_resultVariable);
}
}
}