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

Rename

Browse Source
This commit is contained in:
Magne Sjaastad
2014-09-04 09:14:01 +02:00
parent 9873f3cfc6
commit 323f8d77eb
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@@ -99,7 +99,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot*
updateNNCColors(cellResultSlot); updateNNCColors(cellResultSlot);
size_t scalarSetIndex = cellResultSlot->gridScalarIndex(); size_t scalarSetIndex = cellResultSlot->scalarResultIndex();
// If the result is static, only read that. // If the result is static, only read that.
size_t resTimeStepIdx = timeStepIndex; size_t resTimeStepIdx = timeStepIndex;
@@ -656,7 +656,7 @@ void RivFaultPartMgr::updateNNCColors(RimResultSlot* cellResultSlot)
|| cellResultSlot->resultVariable() == RimDefines::combinedRiAreaNormTransResultName() || cellResultSlot->resultVariable() == RimDefines::combinedRiAreaNormTransResultName()
)) ))
{ {
size_t scalarSetIndex = cellResultSlot->gridScalarIndex(); size_t scalarSetIndex = cellResultSlot->scalarResultIndex();
const cvf::ScalarMapper* mapper = cellResultSlot->legendConfig()->scalarMapper(); const cvf::ScalarMapper* mapper = cellResultSlot->legendConfig()->scalarMapper();

4
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@@ -150,7 +150,7 @@ void Rim3dOverlayInfoConfig::update3DInfo()
double min, max; double min, max;
double p10, p90; double p10, p90;
double mean; double mean;
size_t scalarIndex = m_reservoirView->cellResult()->gridScalarIndex(); size_t scalarIndex = m_reservoirView->cellResult()->scalarResultIndex();
m_reservoirView->currentGridCellResults()->cellResults()->minMaxCellScalarValues(scalarIndex, min, max); m_reservoirView->currentGridCellResults()->cellResults()->minMaxCellScalarValues(scalarIndex, min, max);
m_reservoirView->currentGridCellResults()->cellResults()->p10p90CellScalarValues(scalarIndex, p10, p90); m_reservoirView->currentGridCellResults()->cellResults()->p10p90CellScalarValues(scalarIndex, p10, p90);
m_reservoirView->currentGridCellResults()->cellResults()->meanCellScalarValues(scalarIndex, mean); m_reservoirView->currentGridCellResults()->cellResults()->meanCellScalarValues(scalarIndex, mean);
@@ -224,7 +224,7 @@ void Rim3dOverlayInfoConfig::update3DInfo()
double p10, p90; double p10, p90;
double mean; double mean;
size_t scalarIndex = m_reservoirView->cellResult()->gridScalarIndex(); size_t scalarIndex = m_reservoirView->cellResult()->scalarResultIndex();
m_reservoirView->currentGridCellResults()->cellResults()->minMaxCellScalarValues(scalarIndex, min, max); m_reservoirView->currentGridCellResults()->cellResults()->minMaxCellScalarValues(scalarIndex, min, max);
m_reservoirView->currentGridCellResults()->cellResults()->p10p90CellScalarValues(scalarIndex, p10, p90); m_reservoirView->currentGridCellResults()->cellResults()->p10p90CellScalarValues(scalarIndex, p10, p90);
m_reservoirView->currentGridCellResults()->cellResults()->meanCellScalarValues(scalarIndex, mean); m_reservoirView->currentGridCellResults()->cellResults()->meanCellScalarValues(scalarIndex, mean);

14
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -1354,15 +1354,15 @@ void RimReservoirView::updateMinMaxValuesAndAddLegendToView(QString legendLabel,
{ {
double globalMin, globalMax; double globalMin, globalMax;
double globalPosClosestToZero, globalNegClosestToZero; double globalPosClosestToZero, globalNegClosestToZero;
cellResultsData->minMaxCellScalarValues(resultSlot->gridScalarIndex(), globalMin, globalMax); cellResultsData->minMaxCellScalarValues(resultSlot->scalarResultIndex(), globalMin, globalMax);
cellResultsData->posNegClosestToZero(resultSlot->gridScalarIndex(), globalPosClosestToZero, globalNegClosestToZero); cellResultsData->posNegClosestToZero(resultSlot->scalarResultIndex(), globalPosClosestToZero, globalNegClosestToZero);
double localMin, localMax; double localMin, localMax;
double localPosClosestToZero, localNegClosestToZero; double localPosClosestToZero, localNegClosestToZero;
if (resultSlot->hasDynamicResult()) if (resultSlot->hasDynamicResult())
{ {
cellResultsData->minMaxCellScalarValues(resultSlot->gridScalarIndex(), m_currentTimeStep, localMin, localMax); cellResultsData->minMaxCellScalarValues(resultSlot->scalarResultIndex(), m_currentTimeStep, localMin, localMax);
cellResultsData->posNegClosestToZero(resultSlot->gridScalarIndex(), m_currentTimeStep, localPosClosestToZero, localNegClosestToZero); cellResultsData->posNegClosestToZero(resultSlot->scalarResultIndex(), m_currentTimeStep, localPosClosestToZero, localNegClosestToZero);
} }
else else
{ {
@@ -1820,7 +1820,7 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo)
cvf::StructGridInterface::FaceEnum face(conn.m_c1Face); cvf::StructGridInterface::FaceEnum face(conn.m_c1Face);
// Print result value for the NNC // Print result value for the NNC
size_t scalarResultIdx = this->cellResult()->gridScalarIndex(); size_t scalarResultIdx = this->cellResult()->scalarResultIndex();
const std::vector<double>* nncValues = nncData->connectionScalarResult(scalarResultIdx); const std::vector<double>* nncValues = nncData->connectionScalarResult(scalarResultIdx);
if (nncValues) if (nncValues)
{ {
@@ -2176,12 +2176,12 @@ void RimReservoirView::appendTextFromResultSlot(RigCaseData* eclipseCase, size_t
} }
else else
{ {
resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, 0, resultSlot->gridScalarIndex()); resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, 0, resultSlot->scalarResultIndex());
} }
} }
else else
{ {
resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultSlot->gridScalarIndex()); resultAccessor = RigResultAccessorFactory::createResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultSlot->scalarResultIndex());
} }
if (resultAccessor.notNull()) if (resultAccessor.notNull())

6
ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
View File

@@ -178,7 +178,7 @@ QList<caf::PdmOptionItemInfo> RimResultDefinition::calculateValueOptions(const c
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
size_t RimResultDefinition::gridScalarIndex() const size_t RimResultDefinition::scalarResultIndex() const
{ {
size_t gridScalarResultIndex = cvf::UNDEFINED_SIZE_T; size_t gridScalarResultIndex = cvf::UNDEFINED_SIZE_T;
@@ -210,7 +210,7 @@ void RimResultDefinition::loadResult()
bool RimResultDefinition::hasStaticResult() const bool RimResultDefinition::hasStaticResult() const
{ {
const RimReservoirCellResultsStorage* gridCellResults = this->currentGridCellResults(); const RimReservoirCellResultsStorage* gridCellResults = this->currentGridCellResults();
size_t gridScalarResultIndex = this->gridScalarIndex(); size_t gridScalarResultIndex = this->scalarResultIndex();
if (hasResult() && gridCellResults->cellResults()->timeStepCount(gridScalarResultIndex) == 1 ) if (hasResult() && gridCellResults->cellResults()->timeStepCount(gridScalarResultIndex) == 1 )
{ {
@@ -253,7 +253,7 @@ bool RimResultDefinition::hasDynamicResult() const
if (this->currentGridCellResults() && this->currentGridCellResults()->cellResults()) if (this->currentGridCellResults() && this->currentGridCellResults()->cellResults())
{ {
const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults()->cellResults(); const RigCaseCellResultsData* gridCellResults = this->currentGridCellResults()->cellResults();
size_t gridScalarResultIndex = this->gridScalarIndex(); size_t gridScalarResultIndex = this->scalarResultIndex();
if (gridCellResults->timeStepCount(gridScalarResultIndex) > 1 ) if (gridCellResults->timeStepCount(gridScalarResultIndex) > 1 )
{ {
return true; return true;

2
ApplicationCode/ProjectDataModel/RimResultDefinition.h
View File

@@ -51,7 +51,7 @@ public:
virtual void setResultVariable(const QString& val); virtual void setResultVariable(const QString& val);
void loadResult(); void loadResult();
size_t gridScalarIndex() const; size_t scalarResultIndex() const;
bool hasStaticResult() const; bool hasStaticResult() const;
bool hasDynamicResult() const; bool hasDynamicResult() const;
bool hasResult() const; bool hasResult() const;