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

#3958 Refactoring: Removed result index from NNC data

Browse Source
This commit is contained in:
Jacob Støren
2019-01-23 16:08:25 +01:00
parent 09011862cd
commit d8eded7d49
10 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@@ -2024,9 +2024,9 @@ void RigCaseCellResultsData::computeRiTransComponent(const QString& riTransCompo
//--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::computeNncCombRiTrans()
{
size_t riCombTransScalarResultIndex =
this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedRiTranResultName());
if (m_ownerMainGrid->nncData()->staticConnectionScalarResult(riCombTransScalarResultIndex)) return;
RigEclipseResultAddress riCombTransEclResAddr = RigEclipseResultAddress(
this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedRiTranResultName()));
if (m_ownerMainGrid->nncData()->staticConnectionScalarResult( riCombTransEclResAddr )) return;
double cdarchy = darchysValue();
@@ -2047,7 +2047,7 @@ void RigCaseCellResultsData::computeNncCombRiTrans()
std::vector<double>& permZResults = m_cellScalarResults[permZResultIdx][0];
std::vector<double>& riCombTransResults =
m_ownerMainGrid->nncData()->makeStaticConnectionScalarResult(RigNNCData::propertyNameRiCombTrans());
m_ownerMainGrid->nncData()->setScalarResultIndex(RigNNCData::propertyNameRiCombTrans(), riCombTransScalarResultIndex);
m_ownerMainGrid->nncData()->setScalarResultIndex(RigNNCData::propertyNameRiCombTrans(), riCombTransEclResAddr);
std::vector<double>* ntgResults = nullptr;
if (hasNTGResults)
@@ -2277,22 +2277,22 @@ void RigCaseCellResultsData::computeRiMULTComponent(const QString& riMultCompNam
//--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::computeNncCombRiMULT()
{
size_t riCombMultScalarResultIndex =
this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedRiMultResultName());
size_t riCombTransScalarResultIndex =
this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedRiTranResultName());
size_t combTransScalarResultIndex =
this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName());
auto riCombMultEclResAddr =
RigEclipseResultAddress(this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedRiMultResultName()));
auto riCombTransEclResAddr =
RigEclipseResultAddress(this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedRiTranResultName()));
auto combTransEclResAddr =
RigEclipseResultAddress(this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName()));
if (m_ownerMainGrid->nncData()->staticConnectionScalarResult(riCombMultScalarResultIndex)) return;
if (m_ownerMainGrid->nncData()->staticConnectionScalarResult(riCombMultEclResAddr)) return;
std::vector<double>& riMultResults =
m_ownerMainGrid->nncData()->makeStaticConnectionScalarResult(RigNNCData::propertyNameRiCombMult());
const std::vector<double>* riTransResults =
m_ownerMainGrid->nncData()->staticConnectionScalarResult(riCombTransScalarResultIndex);
m_ownerMainGrid->nncData()->staticConnectionScalarResult(riCombTransEclResAddr);
const std::vector<double>* transResults =
m_ownerMainGrid->nncData()->staticConnectionScalarResult(combTransScalarResultIndex);
m_ownerMainGrid->nncData()->setScalarResultIndex(RigNNCData::propertyNameRiCombMult(), riCombMultScalarResultIndex);
m_ownerMainGrid->nncData()->staticConnectionScalarResult(combTransEclResAddr);
m_ownerMainGrid->nncData()->setScalarResultIndex(RigNNCData::propertyNameRiCombMult(), riCombMultEclResAddr);
for (size_t nncConIdx = 0; nncConIdx < riMultResults.size(); ++nncConIdx)
{
@@ -2413,18 +2413,18 @@ void RigCaseCellResultsData::computeRiTRANSbyAreaComponent(const QString& riTran
//--------------------------------------------------------------------------------------------------
void RigCaseCellResultsData::computeNncCombRiTRANSbyArea()
{
size_t riCombTransByAreaScResIdx =
this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedRiAreaNormTranResultName());
size_t combTransScalarResultIndex =
this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName());
auto riCombTransByAreaEclResAddr =
RigEclipseResultAddress(this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedRiAreaNormTranResultName()));
auto combTransEclResAddr =
RigEclipseResultAddress(this->findScalarResultIndex(RiaDefines::STATIC_NATIVE, RiaDefines::combinedTransmissibilityResultName()));
if (m_ownerMainGrid->nncData()->staticConnectionScalarResult(riCombTransByAreaScResIdx)) return;
if (m_ownerMainGrid->nncData()->staticConnectionScalarResult(riCombTransByAreaEclResAddr)) return;
std::vector<double>& riAreaNormTransResults =
m_ownerMainGrid->nncData()->makeStaticConnectionScalarResult(RigNNCData::propertyNameRiCombTransByArea());
m_ownerMainGrid->nncData()->setScalarResultIndex(RigNNCData::propertyNameRiCombTransByArea(), riCombTransByAreaScResIdx);
m_ownerMainGrid->nncData()->setScalarResultIndex(RigNNCData::propertyNameRiCombTransByArea(), riCombTransByAreaEclResAddr);
const std::vector<double>* transResults =
m_ownerMainGrid->nncData()->staticConnectionScalarResult(combTransScalarResultIndex);
m_ownerMainGrid->nncData()->staticConnectionScalarResult(combTransEclResAddr);
const std::vector<RigConnection>& connections = m_ownerMainGrid->nncData()->connections();

41
ApplicationCode/ReservoirDataModel/RigNNCData.cpp
View File

@@ -20,6 +20,7 @@
#include "RigNNCData.h"
#include "RigMainGrid.h"
#include "cvfGeometryTools.h"
#include "RigEclipseResultAddress.h"
//--------------------------------------------------------------------------------------------------
@@ -200,9 +201,9 @@ std::vector<double>& RigNNCData::makeStaticConnectionScalarResult(QString nncDat
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>* RigNNCData::staticConnectionScalarResult(size_t scalarResultIndex) const
const std::vector<double>* RigNNCData::staticConnectionScalarResult(const RigEclipseResultAddress& resVarAddr) const
{
QString nncDataType = getNNCDataTypeFromScalarResultIndex(scalarResultIndex);
QString nncDataType = getNNCDataTypeFromScalarResultIndex(resVarAddr);
if (nncDataType.isNull()) return nullptr;
std::map<QString, std::vector< std::vector<double> > >::const_iterator it = m_connectionResults.find(nncDataType);
@@ -250,9 +251,9 @@ std::vector< std::vector<double> >& RigNNCData::makeDynamicConnectionScalarResul
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector< std::vector<double> >* RigNNCData::dynamicConnectionScalarResult(size_t scalarResultIndex) const
const std::vector< std::vector<double> >* RigNNCData::dynamicConnectionScalarResult(const RigEclipseResultAddress& resVarAddr) const
{
QString nncDataType = getNNCDataTypeFromScalarResultIndex(scalarResultIndex);
QString nncDataType = getNNCDataTypeFromScalarResultIndex(resVarAddr);
if (nncDataType.isNull()) return nullptr;
auto it = m_connectionResults.find(nncDataType);
@@ -270,9 +271,9 @@ const std::vector< std::vector<double> >* RigNNCData::dynamicConnectionScalarRes
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>* RigNNCData::dynamicConnectionScalarResult(size_t scalarResultIndex, size_t timeStep) const
const std::vector<double>* RigNNCData::dynamicConnectionScalarResult(const RigEclipseResultAddress& resVarAddr, size_t timeStep) const
{
QString nncDataType = getNNCDataTypeFromScalarResultIndex(scalarResultIndex);
QString nncDataType = getNNCDataTypeFromScalarResultIndex(resVarAddr);
if (nncDataType.isNull()) return nullptr;
auto it = m_connectionResults.find(nncDataType);
@@ -329,9 +330,9 @@ std::vector< std::vector<double> >& RigNNCData::makeGeneratedConnectionScalarRes
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector< std::vector<double> >* RigNNCData::generatedConnectionScalarResult(size_t scalarResultIndex) const
const std::vector< std::vector<double> >* RigNNCData::generatedConnectionScalarResult(const RigEclipseResultAddress& resVarAddr) const
{
QString nncDataType = getNNCDataTypeFromScalarResultIndex(scalarResultIndex);
QString nncDataType = getNNCDataTypeFromScalarResultIndex(resVarAddr);
if (nncDataType.isNull()) return nullptr;
auto it = m_connectionResults.find(nncDataType);
@@ -349,9 +350,9 @@ const std::vector< std::vector<double> >* RigNNCData::generatedConnectionScalarR
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>* RigNNCData::generatedConnectionScalarResult(size_t scalarResultIndex, size_t timeStep) const
const std::vector<double>* RigNNCData::generatedConnectionScalarResult(const RigEclipseResultAddress& resVarAddr, size_t timeStep) const
{
QString nncDataType = getNNCDataTypeFromScalarResultIndex(scalarResultIndex);
QString nncDataType = getNNCDataTypeFromScalarResultIndex(resVarAddr);
if (nncDataType.isNull()) return nullptr;
auto it = m_connectionResults.find(nncDataType);
@@ -369,9 +370,9 @@ const std::vector<double>* RigNNCData::generatedConnectionScalarResult(size_t sc
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector< std::vector<double> >* RigNNCData::generatedConnectionScalarResult(size_t scalarResultIndex)
std::vector< std::vector<double> >* RigNNCData::generatedConnectionScalarResult(const RigEclipseResultAddress& resVarAddr)
{
QString nncDataType = getNNCDataTypeFromScalarResultIndex(scalarResultIndex);
QString nncDataType = getNNCDataTypeFromScalarResultIndex(resVarAddr);
if (nncDataType.isNull()) return nullptr;
auto it = m_connectionResults.find(nncDataType);
@@ -389,9 +390,9 @@ std::vector< std::vector<double> >* RigNNCData::generatedConnectionScalarResult(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double>* RigNNCData::generatedConnectionScalarResult(size_t scalarResultIndex, size_t timeStep)
std::vector<double>* RigNNCData::generatedConnectionScalarResult(const RigEclipseResultAddress& resVarAddr, size_t timeStep)
{
QString nncDataType = getNNCDataTypeFromScalarResultIndex(scalarResultIndex);
QString nncDataType = getNNCDataTypeFromScalarResultIndex(resVarAddr);
if (nncDataType.isNull()) return nullptr;
auto it = m_connectionResults.find(nncDataType);
@@ -493,17 +494,17 @@ std::vector<QString> RigNNCData::availableProperties(NNCResultType resultType) c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigNNCData::setScalarResultIndex(const QString& nncDataType, size_t scalarResultIndex)
void RigNNCData::setScalarResultIndex(const QString& nncDataType, const RigEclipseResultAddress& resVarAddr)
{
m_resultIndexToNNCDataType[scalarResultIndex] = nncDataType;
m_resultIndexToNNCDataType[resVarAddr.scalarResultIndex] = nncDataType;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RigNNCData::hasScalarValues(size_t scalarResultIndex)
bool RigNNCData::hasScalarValues(const RigEclipseResultAddress& resVarAddr)
{
QString nncDataType = getNNCDataTypeFromScalarResultIndex(scalarResultIndex);
QString nncDataType = getNNCDataTypeFromScalarResultIndex(resVarAddr);
if (nncDataType.isNull()) return false;
auto it = m_connectionResults.find(nncDataType);
@@ -513,9 +514,9 @@ bool RigNNCData::hasScalarValues(size_t scalarResultIndex)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString RigNNCData::getNNCDataTypeFromScalarResultIndex(size_t scalarResultIndex) const
const QString RigNNCData::getNNCDataTypeFromScalarResultIndex(const RigEclipseResultAddress& resVarAddr) const
{
auto it = m_resultIndexToNNCDataType.find(scalarResultIndex);
auto it = m_resultIndexToNNCDataType.find(resVarAddr.scalarResultIndex);
if (it != m_resultIndexToNNCDataType.end())
{
return it->second;

22
ApplicationCode/ReservoirDataModel/RigNNCData.h
View File

@@ -31,7 +31,7 @@
class RigMainGrid;
class RigCell;
class RigEclipseResultAddress;
class RigConnection
{
@@ -88,20 +88,20 @@ public:
const std::vector<RigConnection>& connections() const { return m_connections; }
std::vector<double>& makeStaticConnectionScalarResult(QString nncDataType);
const std::vector<double>* staticConnectionScalarResult(size_t scalarResultIndex) const;
const std::vector<double>* staticConnectionScalarResult(const RigEclipseResultAddress& resVarAddr) const;
const std::vector<double>* staticConnectionScalarResultByName(const QString& nncDataType) const;
std::vector< std::vector<double> >& makeDynamicConnectionScalarResult(QString nncDataType, size_t timeStepCount);
const std::vector< std::vector<double> >* dynamicConnectionScalarResult(size_t scalarResultIndex) const;
const std::vector<double>* dynamicConnectionScalarResult(size_t scalarResultIndex, size_t timeStep) const;
const std::vector< std::vector<double> >* dynamicConnectionScalarResult(const RigEclipseResultAddress& resVarAddr) const;
const std::vector<double>* dynamicConnectionScalarResult(const RigEclipseResultAddress& resVarAddr, size_t timeStep) const;
const std::vector< std::vector<double> >* dynamicConnectionScalarResultByName(const QString& nncDataType) const;
const std::vector<double>* dynamicConnectionScalarResultByName(const QString& nncDataType, size_t timeStep) const;
std::vector< std::vector<double> >& makeGeneratedConnectionScalarResult(QString nncDataType, size_t timeStepCount);
const std::vector< std::vector<double> >* generatedConnectionScalarResult(size_t scalarResultIndex) const;
const std::vector<double>* generatedConnectionScalarResult(size_t scalarResultIndex, size_t timeStep) const;
std::vector< std::vector<double> >* generatedConnectionScalarResult(size_t scalarResultIndex);
std::vector<double>* generatedConnectionScalarResult(size_t scalarResultIndex, size_t timeStep);
const std::vector< std::vector<double> >* generatedConnectionScalarResult(const RigEclipseResultAddress& resVarAddr) const;
const std::vector<double>* generatedConnectionScalarResult(const RigEclipseResultAddress& resVarAddr, size_t timeStep) const;
std::vector< std::vector<double> >* generatedConnectionScalarResult(const RigEclipseResultAddress& resVarAddr);
std::vector<double>* generatedConnectionScalarResult(const RigEclipseResultAddress& resVarAddr, size_t timeStep);
const std::vector< std::vector<double> >* generatedConnectionScalarResultByName(const QString& nncDataType) const;
const std::vector<double>* generatedConnectionScalarResultByName(const QString& nncDataType, size_t timeStep) const;
std::vector< std::vector<double> >* generatedConnectionScalarResultByName(const QString& nncDataType);
@@ -109,12 +109,12 @@ public:
std::vector<QString> availableProperties(NNCResultType resultType) const;
void setScalarResultIndex(const QString& nncDataType, size_t scalarResultIndex);
void setScalarResultIndex(const QString& nncDataType, const RigEclipseResultAddress& resVarAddr);
bool hasScalarValues(size_t scalarResultIndex);
bool hasScalarValues(const RigEclipseResultAddress& resVarAddr);
private:
const QString getNNCDataTypeFromScalarResultIndex(size_t scalarResultIndex) const;
const QString getNNCDataTypeFromScalarResultIndex(const RigEclipseResultAddress& resVarAddr) const;
bool isNative(QString nncDataType) const;
private: