OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-09 23:53:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3554 Temprorary LGR : Set several properties to undefined (infinity)

Browse Source
This commit is contained in:
Magne Sjaastad 2018-10-25 21:08:19 +02:00
parent cc8f42f878
commit 47f3004cd0
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@ -41,6 +41,7 @@
#include <QDateTime> #include <QDateTime>
#include <algorithm>
#include <math.h> #include <math.h>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -1174,9 +1175,9 @@ size_t RigCaseCellResultsData::findOrLoadScalarResult(RiaDefines::ResultCatType
{ {
if (!values.empty()) if (!values.empty())
{ {
values.resize(values.size() + tempGridCellCount); values.resize(values.size() + tempGridCellCount, std::numeric_limits<double>::max());
assignValuesToTemporaryLgrs(values); assignValuesToTemporaryLgrs(resultName, values);
} }
} }
} }
@ -1194,9 +1195,9 @@ size_t RigCaseCellResultsData::findOrLoadScalarResult(RiaDefines::ResultCatType
{ {
if (!values.empty()) if (!values.empty())
{ {
values.resize(values.size() + tempGridCellCount); values.resize(values.size() + tempGridCellCount, std::numeric_limits<double>::max());
assignValuesToTemporaryLgrs(values); assignValuesToTemporaryLgrs(resultName, values);
} }
} }
} }
@ -1539,8 +1540,6 @@ void RigCaseCellResultsData::computeDepthRelatedResults()
bool computeTops = false; bool computeTops = false;
bool computeBottom = false; bool computeBottom = false;
size_t actCellCount = activeCellInfo()->reservoirActiveCellCount();
if (depthResultIndex == cvf::UNDEFINED_SIZE_T) if (depthResultIndex == cvf::UNDEFINED_SIZE_T)
{ {
depthResultIndex = this->addStaticScalarResult(RiaDefines::STATIC_NATIVE, "DEPTH", false, actCellCount); depthResultIndex = this->addStaticScalarResult(RiaDefines::STATIC_NATIVE, "DEPTH", false, actCellCount);
@ -1629,7 +1628,7 @@ void RigCaseCellResultsData::computeDepthRelatedResults()
size_t resultIndex = activeCellInfo()->cellResultIndex(cellIdx); size_t resultIndex = activeCellInfo()->cellResultIndex(cellIdx);
if (resultIndex == cvf::UNDEFINED_SIZE_T) continue; if (resultIndex == cvf::UNDEFINED_SIZE_T) continue;
bool isTemporaryGrid = cell.hostGrid()->isTempGrid(); bool isTemporaryGrid = cell.hostGrid()->isTempGrid();
if (computeDepth || isTemporaryGrid) if (computeDepth || isTemporaryGrid)
@ -2509,10 +2508,24 @@ bool RigCaseCellResultsData::isDataPresent(size_t scalarResultIndex) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::assignValuesToTemporaryLgrs(std::vector<double>& valuesForAllReservoirCells) void RigCaseCellResultsData::assignValuesToTemporaryLgrs(const QString& resultName,
std::vector<double>& valuesForAllReservoirCells)
{ {
CVF_ASSERT(m_activeCellInfo); CVF_ASSERT(m_activeCellInfo);
static std::vector<QString> excludedProperties = {
"MOBPROV", "PORV", "FIPOIL", "FIPGAS", "FIPWAT", "FLROILI+", "FLROILJ+", "FLROILK+", "FLRGASI+",
"FLRGASJ+", "FLRGASK+", "FLRWATI+", "FLRWATJ+", "FLRWATK+", "FLOOILI+", "FLOWATI+", "FLOGASI+", "FLOOILJ+",
"FLOWATJ+", "FLOGASJ+", "FLOOILK+", "FLOWATK+", "FLOGASK+", "SFIPGAS", "SFIPOIL", "SFIPWAT", "AREAX",
"AREAY", "AREAZ", "DIFFX", "DIFFY", "DIFFZ", "DZNET", "HEATTX", "HEATTY", "HEATTZ",
"LX", "LY", "LZ", "MINPVV", "TRANX", "TRANY", "TRANZ",
};
if (std::find(excludedProperties.begin(), excludedProperties.end(), resultName) != excludedProperties.end())
{
return;
}
for (size_t gridIdx = 0; gridIdx < m_ownerMainGrid->gridCount(); gridIdx++) for (size_t gridIdx = 0; gridIdx < m_ownerMainGrid->gridCount(); gridIdx++)
{ {
const auto& grid = m_ownerMainGrid->gridByIndex(gridIdx); const auto& grid = m_ownerMainGrid->gridByIndex(gridIdx);

2
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.h
View File

@ -158,7 +158,7 @@ private: // from RimReservoirCellResultsStorage
bool isDataPresent(size_t scalarResultIndex) const; bool isDataPresent(size_t scalarResultIndex) const;
void assignValuesToTemporaryLgrs(std::vector<double>& values); void assignValuesToTemporaryLgrs(const QString& resultName, std::vector<double>& values);
cvf::ref<RifReaderInterface> m_readerInterface; cvf::ref<RifReaderInterface> m_readerInterface;