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 Refactoreing: Rename

Browse Source
This commit is contained in:
Jacob Støren 2019-01-23 14:24:12 +01:00
parent 8ee1d1491f
commit 09011862cd
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@ -691,7 +691,7 @@ void RivFaultPartMgr::updateNNCColors(size_t timeStepIndex, RimEclipseCellColors
if (cellResultColors) if (cellResultColors)
{ {
RigEclipseResultAddress scalarSetIndex = cellResultColors->scalarResultIndex(); RigEclipseResultAddress scalarSetIndex = cellResultColors->eclipseResultAddress();
if (m_grid->mainGrid()->nncData()->hasScalarValues(scalarSetIndex.scalarResultIndex)) if (m_grid->mainGrid()->nncData()->hasScalarValues(scalarSetIndex.scalarResultIndex))
{ {
@ -702,7 +702,7 @@ void RivFaultPartMgr::updateNNCColors(size_t timeStepIndex, RimEclipseCellColors
if (showNncsWithScalarMappedColor) if (showNncsWithScalarMappedColor)
{ {
RigEclipseResultAddress scalarSetIndex = cellResultColors->scalarResultIndex(); RigEclipseResultAddress scalarSetIndex = cellResultColors->eclipseResultAddress();
RiaDefines::ResultCatType resultType = cellResultColors->resultType(); RiaDefines::ResultCatType resultType = cellResultColors->resultType();
const cvf::ScalarMapper* mapper = cellResultColors->legendConfig()->scalarMapper(); const cvf::ScalarMapper* mapper = cellResultColors->legendConfig()->scalarMapper();

4
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -162,11 +162,11 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
RigEclipseResultAddress scalarResultIndex; RigEclipseResultAddress scalarResultIndex;
if (faultResultColors->showCustomFaultResult()) if (faultResultColors->showCustomFaultResult())
{ {
scalarResultIndex = faultResultColors->customFaultResult()->scalarResultIndex(); scalarResultIndex = faultResultColors->customFaultResult()->eclipseResultAddress();
} }
else else
{ {
scalarResultIndex = cellResultColors->scalarResultIndex(); scalarResultIndex = cellResultColors->eclipseResultAddress();
} }
RigMainGrid* mainGrid = m_reservoirView->mainGrid(); RigMainGrid* mainGrid = m_reservoirView->mainGrid();

4
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@ -337,7 +337,7 @@ Rim3dOverlayInfoConfig::HistogramData Rim3dOverlayInfoConfig::histogramData(RimE
if (isResultsInfoRelevant) if (isResultsInfoRelevant)
{ {
RigEclipseResultAddress eclResAddr = eclipseView->cellResult()->scalarResultIndex(); RigEclipseResultAddress eclResAddr = eclipseView->cellResult()->eclipseResultAddress();
if (eclResAddr.isValid()) if (eclResAddr.isValid())
{ {
@ -1095,7 +1095,7 @@ void Rim3dOverlayInfoConfig::updateVisCellStatsIfNeeded()
} }
else else
{ {
RigEclipseResultAddress scalarIndex = eclipseView->cellResult()->scalarResultIndex(); RigEclipseResultAddress scalarIndex = eclipseView->cellResult()->eclipseResultAddress();
calc = new RigEclipseNativeVisibleCellsStatCalc(eclipseView->currentGridCellResults(), calc = new RigEclipseNativeVisibleCellsStatCalc(eclipseView->currentGridCellResults(),
scalarIndex, scalarIndex,
eclipseView->currentTotalCellVisibility().p()); eclipseView->currentTotalCellVisibility().p());

2
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@ -105,7 +105,7 @@ void RimCellEdgeColors::loadResult()
{ {
m_singleVarEdgeResultColors->loadResult();; m_singleVarEdgeResultColors->loadResult();;
RigEclipseResultAddress resultindex = m_singleVarEdgeResultColors->scalarResultIndex(); RigEclipseResultAddress resultindex = m_singleVarEdgeResultColors->eclipseResultAddress();
for (int cubeFaceIdx = 0; cubeFaceIdx < 6; ++cubeFaceIdx) for (int cubeFaceIdx = 0; cubeFaceIdx < 6; ++cubeFaceIdx)
{ {
m_resultNameToIndexPairs[cubeFaceIdx] = std::make_pair(m_singleVarEdgeResultColors->resultVariable(), resultindex); m_resultNameToIndexPairs[cubeFaceIdx] = std::make_pair(m_singleVarEdgeResultColors->resultVariable(), resultindex);

12
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@ -361,15 +361,15 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep,
double globalMin, globalMax; double globalMin, globalMax;
double globalPosClosestToZero, globalNegClosestToZero; double globalPosClosestToZero, globalNegClosestToZero;
cellResultsData->minMaxCellScalarValues(this->scalarResultIndex(), globalMin, globalMax); cellResultsData->minMaxCellScalarValues(this->eclipseResultAddress(), globalMin, globalMax);
cellResultsData->posNegClosestToZero(this->scalarResultIndex(), globalPosClosestToZero, globalNegClosestToZero); cellResultsData->posNegClosestToZero(this->eclipseResultAddress(), globalPosClosestToZero, globalNegClosestToZero);
double localMin, localMax; double localMin, localMax;
double localPosClosestToZero, localNegClosestToZero; double localPosClosestToZero, localNegClosestToZero;
if ( this->hasDynamicResult() ) if ( this->hasDynamicResult() )
{ {
cellResultsData->minMaxCellScalarValues(this->scalarResultIndex(), currentTimeStep, localMin, localMax); cellResultsData->minMaxCellScalarValues(this->eclipseResultAddress(), currentTimeStep, localMin, localMax);
cellResultsData->posNegClosestToZero(this->scalarResultIndex(), currentTimeStep, localPosClosestToZero, localNegClosestToZero); cellResultsData->posNegClosestToZero(this->eclipseResultAddress(), currentTimeStep, localPosClosestToZero, localNegClosestToZero);
} }
else else
{ {
@ -395,7 +395,7 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep,
} }
else if ( this->resultType() == RiaDefines::DYNAMIC_NATIVE && this->resultVariable() == RiaDefines::completionTypeResultName() ) else if ( this->resultType() == RiaDefines::DYNAMIC_NATIVE && this->resultVariable() == RiaDefines::completionTypeResultName() )
{ {
const std::vector<int>& visibleCategories = cellResultsData->uniqueCellScalarValues(this->scalarResultIndex()); const std::vector<int>& visibleCategories = cellResultsData->uniqueCellScalarValues(this->eclipseResultAddress());
std::vector<RiaDefines::WellPathComponentType> supportedCompletionTypes = std::vector<RiaDefines::WellPathComponentType> supportedCompletionTypes =
{ RiaDefines::WELL_PATH, RiaDefines::FISHBONES, RiaDefines::PERFORATION_INTERVAL, RiaDefines::FRACTURE }; { RiaDefines::WELL_PATH, RiaDefines::FISHBONES, RiaDefines::PERFORATION_INTERVAL, RiaDefines::FRACTURE };
@ -416,7 +416,7 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep,
} }
else else
{ {
legendConfig->setIntegerCategories(cellResultsData->uniqueCellScalarValues(this->scalarResultIndex())); legendConfig->setIntegerCategories(cellResultsData->uniqueCellScalarValues(this->eclipseResultAddress()));
} }
} }
} }

2
ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp
View File

@ -324,7 +324,7 @@ std::vector<double> RimEclipseContourMapProjection::retrieveParameterWeights()
std::vector<double> weights; std::vector<double> weights;
if (m_weightByParameter()) if (m_weightByParameter())
{ {
RigEclipseResultAddress gridScalarResultIdx = m_weightingResult->scalarResultIndex(); RigEclipseResultAddress gridScalarResultIdx = m_weightingResult->eclipseResultAddress();
if (gridScalarResultIdx.isValid()) if (gridScalarResultIdx.isValid())
{ {
m_weightingResult->loadResult(); m_weightingResult->loadResult();

2
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@ -372,7 +372,7 @@ void RimEclipsePropertyFilter::computeResultValueRange()
} }
else else
{ {
RigEclipseResultAddress scalarIndex = resultDefinition->scalarResultIndex(); RigEclipseResultAddress scalarIndex = resultDefinition->eclipseResultAddress();
if ( scalarIndex.isValid() ) if ( scalarIndex.isValid() )
{ {
RigCaseCellResultsData* results = resultDefinition->currentGridCellResults(); RigCaseCellResultsData* results = resultDefinition->currentGridCellResults();

6
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -625,7 +625,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigEclipseResultAddress RimEclipseResultDefinition::scalarResultIndex() const RigEclipseResultAddress RimEclipseResultDefinition::eclipseResultAddress() const
{ {
size_t gridScalarResultIndex = cvf::UNDEFINED_SIZE_T; size_t gridScalarResultIndex = cvf::UNDEFINED_SIZE_T;
@ -786,7 +786,7 @@ bool RimEclipseResultDefinition::hasStaticResult() const
if (isFlowDiagOrInjectionFlooding()) return false; if (isFlowDiagOrInjectionFlooding()) return false;
const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults();
RigEclipseResultAddress gridScalarResultIndex = this->scalarResultIndex(); RigEclipseResultAddress gridScalarResultIndex = this->eclipseResultAddress();
if (hasResult() && gridCellResults->timeStepCount(gridScalarResultIndex) == 1 ) if (hasResult() && gridCellResults->timeStepCount(gridScalarResultIndex) == 1 )
{ {
@ -845,7 +845,7 @@ bool RimEclipseResultDefinition::hasDynamicResult() const
if (this->currentGridCellResults()) if (this->currentGridCellResults())
{ {
const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults(); const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults();
RigEclipseResultAddress gridScalarResultIndex = this->scalarResultIndex(); RigEclipseResultAddress gridScalarResultIndex = this->eclipseResultAddress();
if (gridCellResults->timeStepCount(gridScalarResultIndex) > 1 ) if (gridCellResults->timeStepCount(gridScalarResultIndex) > 1 )
{ {
return true; return true;

2
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -94,7 +94,7 @@ public:
QString resultVariableUiShortName() const; QString resultVariableUiShortName() const;
void loadResult(); void loadResult();
RigEclipseResultAddress scalarResultIndex() const; RigEclipseResultAddress eclipseResultAddress() const;
bool hasStaticResult() const; bool hasStaticResult() const;
bool hasDynamicResult() const; bool hasDynamicResult() const;
bool hasResult() const; bool hasResult() const;

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -1152,7 +1152,7 @@ void RimEclipseView::updateLegends()
{ {
if (cellEdgeResult()->singleVarEdgeResultColors()->resultType() != RiaDefines::FORMATION_NAMES) if (cellEdgeResult()->singleVarEdgeResultColors()->resultType() != RiaDefines::FORMATION_NAMES)
{ {
cellEdgeResult()->legendConfig()->setIntegerCategories(results->uniqueCellScalarValues(cellEdgeResult()->singleVarEdgeResultColors()->scalarResultIndex())); cellEdgeResult()->legendConfig()->setIntegerCategories(results->uniqueCellScalarValues(cellEdgeResult()->singleVarEdgeResultColors()->eclipseResultAddress()));
} }
else else
{ {

6
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@ -424,19 +424,19 @@ QString RiuResultTextBuilder::nncResultText()
if (m_reservoirView->currentFaultResultColors()) if (m_reservoirView->currentFaultResultColors())
{ {
RigEclipseResultAddress scalarResultIdx = m_reservoirView->currentFaultResultColors()->scalarResultIndex(); RigEclipseResultAddress eclipseResultAddress = m_reservoirView->currentFaultResultColors()->eclipseResultAddress();
RiaDefines::ResultCatType resultType = m_reservoirView->currentFaultResultColors()->resultType(); RiaDefines::ResultCatType resultType = m_reservoirView->currentFaultResultColors()->resultType();
const std::vector<double>* nncValues = nullptr; const std::vector<double>* nncValues = nullptr;
if (resultType == RiaDefines::STATIC_NATIVE) if (resultType == RiaDefines::STATIC_NATIVE)
{ {
nncValues = nncData->staticConnectionScalarResult(scalarResultIdx.scalarResultIndex); nncValues = nncData->staticConnectionScalarResult(eclipseResultAddress.scalarResultIndex);
} }
else if (resultType == RiaDefines::DYNAMIC_NATIVE) else if (resultType == RiaDefines::DYNAMIC_NATIVE)
{ {
if (m_reservoirView.notNull() && m_reservoirView->eclipseCase()) if (m_reservoirView.notNull() && m_reservoirView->eclipseCase())
{ {
size_t nativeTimeStep = m_reservoirView->eclipseCase()->uiToNativeTimeStepIndex(m_timeStepIndex); size_t nativeTimeStep = m_reservoirView->eclipseCase()->uiToNativeTimeStepIndex(m_timeStepIndex);
nncValues = nncData->dynamicConnectionScalarResult(scalarResultIdx.scalarResultIndex, nativeTimeStep); nncValues = nncData->dynamicConnectionScalarResult(eclipseResultAddress.scalarResultIndex, nativeTimeStep);
} }
} }
if (nncValues && (m_nncIndex < nncValues->size())) if (nncValues && (m_nncIndex < nncValues->size()))