OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-16 18:32:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

#5273 Allen Diagrams: Move result names to RiaNccDefines

Browse Source
This commit is contained in:
Magne Sjaastad committed 2020-01-17 08:41:15 +01:00
1 parent 5f7df7f7f5
commit 6761a71798
10 files changed
+132 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
+6 -6
View File
@@ -2196,8 +2196,8 @@ void RigCaseCellResultsData::computeNncCombRiTrans()
std::vector<double>& permYResults = m_cellScalarResults[permYResultIdx][0];
std::vector<double>& permZResults = m_cellScalarResults[permZResultIdx][0];
std::vector<double>& riCombTransResults = m_ownerMainGrid->nncData()->makeStaticConnectionScalarResult(
RigNNCData::propertyNameRiCombTrans() );
m_ownerMainGrid->nncData()->setEclResultAddress( RigNNCData::propertyNameRiCombTrans(), riCombTransEclResAddr );
RiaDefines::propertyNameRiCombTrans() );
m_ownerMainGrid->nncData()->setEclResultAddress( RiaDefines::propertyNameRiCombTrans(), riCombTransEclResAddr );
std::vector<double>* ntgResults = nullptr;
if ( hasNTGResults )
@@ -2444,7 +2444,7 @@ void RigCaseCellResultsData::computeNncCombRiMULT()
if ( m_ownerMainGrid->nncData()->staticConnectionScalarResult( riCombMultEclResAddr ) ) return;
std::vector<double>& riMultResults = m_ownerMainGrid->nncData()->makeStaticConnectionScalarResult(
RigNNCData::propertyNameRiCombMult() );
RiaDefines::propertyNameRiCombMult() );
const std::vector<double>* riTransResults = m_ownerMainGrid->nncData()->staticConnectionScalarResult(
riCombTransEclResAddr );
@@ -2452,7 +2452,7 @@ void RigCaseCellResultsData::computeNncCombRiMULT()
const std::vector<double>* transResults = m_ownerMainGrid->nncData()->staticConnectionScalarResult(
combTransEclResAddr );
m_ownerMainGrid->nncData()->setEclResultAddress( RigNNCData::propertyNameRiCombMult(), riCombMultEclResAddr );
m_ownerMainGrid->nncData()->setEclResultAddress( RiaDefines::propertyNameRiCombMult(), riCombMultEclResAddr );
for ( size_t nncConIdx = 0; nncConIdx < riMultResults.size(); ++nncConIdx )
{
@@ -2585,9 +2585,9 @@ void RigCaseCellResultsData::computeNncCombRiTRANSbyArea()
if ( m_ownerMainGrid->nncData()->staticConnectionScalarResult( riCombTransByAreaEclResAddr ) ) return;
std::vector<double>& riAreaNormTransResults = m_ownerMainGrid->nncData()->makeStaticConnectionScalarResult(
RigNNCData::propertyNameRiCombTransByArea() );
RiaDefines::propertyNameRiCombTransByArea() );
m_ownerMainGrid->nncData()->setEclResultAddress( RigNNCData::propertyNameRiCombTransByArea(),
m_ownerMainGrid->nncData()->setEclResultAddress( RiaDefines::propertyNameRiCombTransByArea(),
riCombTransByAreaEclResAddr );
const std::vector<double>* transResults = m_ownerMainGrid->nncData()->staticConnectionScalarResult(
ApplicationCode/ReservoirDataModel/RigNNCData.cpp
+4 -4
View File
@@ -529,10 +529,10 @@ const QString RigNNCData::getNNCDataTypeFromScalarResultIndex( const RigEclipseR
//--------------------------------------------------------------------------------------------------
bool RigNNCData::isNative( QString nncDataType ) const
{
if ( nncDataType == RigNNCData::propertyNameCombTrans() || nncDataType == RigNNCData::propertyNameFluxGas() ||
nncDataType == RigNNCData::propertyNameFluxOil() || nncDataType == RigNNCData::propertyNameFluxWat() ||
nncDataType == RigNNCData::propertyNameRiCombMult() || nncDataType == RigNNCData::propertyNameRiCombTrans() ||
nncDataType == RigNNCData::propertyNameRiCombTransByArea() )
if ( nncDataType == RiaDefines::propertyNameCombTrans() || nncDataType == RiaDefines::propertyNameFluxGas() ||
nncDataType == RiaDefines::propertyNameFluxOil() || nncDataType == RiaDefines::propertyNameFluxWat() ||
nncDataType == RiaDefines::propertyNameRiCombMult() || nncDataType == RiaDefines::propertyNameRiCombTrans() ||
nncDataType == RiaDefines::propertyNameRiCombTransByArea() )
{
return true;
}
ApplicationCode/ReservoirDataModel/RigNNCData.h
+2 -29
View File
@@ -19,6 +19,8 @@
#pragma once
#include "RiaNncDefines.h"
#include "cvfObject.h"
#include "cvfStructGrid.h"
#include "cvfVector3.h"
@@ -63,35 +65,6 @@ public:
NNC_GENERATED
};
static QString propertyNameFluxWat()
{
return "FLRWAT";
}
static QString propertyNameFluxOil()
{
return "FLROIL";
}
static QString propertyNameFluxGas()
{
return "FLRGAS";
}
static QString propertyNameCombTrans()
{
return "TRAN";
}
static QString propertyNameRiCombTrans()
{
return "riTRAN";
}
static QString propertyNameRiCombTransByArea()
{
return "riTRANbyArea";
}
static QString propertyNameRiCombMult()
{
return "riMULT";
}
RigNNCData();
void processConnections( const RigMainGrid& mainGrid );
ApplicationCode/ReservoirDataModel/RigNumberOfFloodedPoreVolumesCalculator.cpp
+2 -2
View File
@@ -103,9 +103,9 @@ RigNumberOfFloodedPoreVolumesCalculator::RigNumberOfFloodedPoreVolumesCalculator
progress.incrementProgress();
// TODO: oil or gas flowrate
// TODO: oil or gas flow rate
std::vector<const std::vector<double>*> flowrateNNCatAllTimeSteps;
QString nncConnectionProperty = mainGrid->nncData()->propertyNameFluxWat();
QString nncConnectionProperty = RiaDefines::propertyNameFluxWat();
progress.incrementProgress();
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
+1 -1
View File
@@ -562,7 +562,7 @@ void RigReservoirBuilderMock::addFaults( RigEclipseCaseData* eclipseCase )
}
std::vector<double>& tranVals = grid->nncData()->makeStaticConnectionScalarResult(
RigNNCData::propertyNameCombTrans() );
RiaDefines::propertyNameCombTrans() );
for ( size_t cIdx = 0; cIdx < tranVals.size(); ++cIdx )
{
tranVals[cIdx] = 0.2;