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

Renamed globalGridCellIndex to reservoirCellIndex

Browse Source
This commit is contained in:
Jacob Støren 2014-08-08 10:16:54 +02:00 committed by Magne Sjaastad
parent 16f762984e
commit 6cdd9cfdc5
13 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -482,9 +482,9 @@ void RifReaderEclipseOutput::transferNNCData( const ecl_grid_type * mainEclGrid
for (int nIdx = 0; nIdx < numNNC; ++nIdx)
{
RigGridBase* grid1 = mainGrid->gridByIndex(eclNNCData[nIdx].grid_nr1);
mainGrid->nncData()->connections()[nIdx].m_c1GlobIdx = grid1->globalGridCellIndex(eclNNCData[nIdx].global_index1);
mainGrid->nncData()->connections()[nIdx].m_c1GlobIdx = grid1->reservoirCellIndex(eclNNCData[nIdx].global_index1);
RigGridBase* grid2 = mainGrid->gridByIndex(eclNNCData[nIdx].grid_nr2);
mainGrid->nncData()->connections()[nIdx].m_c2GlobIdx = grid2->globalGridCellIndex(eclNNCData[nIdx].global_index2);
mainGrid->nncData()->connections()[nIdx].m_c2GlobIdx = grid2->reservoirCellIndex(eclNNCData[nIdx].global_index2);
mainGrid->nncData()->connections()[nIdx].m_transmissibility = eclNNCData[nIdx].trans;
}

4
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@ -254,7 +254,7 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()
{
for (size_t caseIdx = 0; caseIdx < caseCollection->reservoirs.size(); caseIdx++)
{
size_t reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex);
size_t reservoirCellIndex = grid->reservoirCellIndex(gridLocalCellIndex);
if (activeM[gridLocalCellIndex] == 0)
{
@ -279,7 +279,7 @@ void RimIdenticalGridCaseGroup::computeUnionOfActiveCells()
for (size_t gridLocalCellIndex = 0; gridLocalCellIndex < grid->cellCount(); gridLocalCellIndex++)
{
size_t reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex);
size_t reservoirCellIndex = grid->reservoirCellIndex(gridLocalCellIndex);
if (activeM[gridLocalCellIndex] != 0)
{

8
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -1641,9 +1641,9 @@ void RimReservoirView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibl
if (wellResFrames[wfIdx].m_wellHead.m_gridIndex == grid->gridIndex())
{
size_t gridCellIndex = wellResFrames[wfIdx].m_wellHead.m_gridCellIndex;
size_t globalGridCellIndex = grid->globalGridCellIndex(gridCellIndex);
size_t reservoirCellIndex = grid->reservoirCellIndex(gridCellIndex);
if (activeCellInfo->isActive(globalGridCellIndex))
if (activeCellInfo->isActive(reservoirCellIndex))
{
(*visibleCells)[gridCellIndex] = true;
}
@ -1698,9 +1698,9 @@ void RimReservoirView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibl
for ( fIdx = 0; fIdx < cellCountFenceDirection; ++fIdx)
{
size_t fenceCellIndex = grid->cellIndexFromIJK(*pI,*pJ,*pK);
size_t globalGridCellIndex = grid->globalGridCellIndex(fenceCellIndex);
size_t reservoirCellIndex = grid->reservoirCellIndex(fenceCellIndex);
if (activeCellInfo && activeCellInfo->isActive(globalGridCellIndex))
if (activeCellInfo && activeCellInfo->isActive(reservoirCellIndex))
{
(*visibleCells)[fenceCellIndex] = true;
}

4
ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
View File

@ -234,8 +234,8 @@ void RimStatisticsCaseEvaluator::evaluateForResults(const QList<ResSpec>& result
for (int cellIdx = 0; static_cast<size_t>(cellIdx) < grid->cellCount(); cellIdx++)
{
size_t globalGridCellIdx = grid->globalGridCellIndex(cellIdx);
if (m_destinationCase->activeCellInfo(poroModel)->isActive(globalGridCellIdx))
size_t reservoirCellIndex = grid->reservoirCellIndex(cellIdx);
if (m_destinationCase->activeCellInfo(poroModel)->isActive(reservoirCellIndex))
{
// Extract the cell values from each of the cases and assemble them into one vector

4
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp
View File

@ -39,8 +39,8 @@ double RigActiveCellsResultAccessor::cellScalar(size_t gridLocalCellIndex) const
{
if (m_reservoirResultValues == NULL || m_reservoirResultValues->size() == 0 ) return HUGE_VAL;
size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex);
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);
if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
CVF_TIGHT_ASSERT(resultValueIndex < m_reservoirResultValues->size());

6
ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp
View File

@ -39,10 +39,10 @@ double RigAllGridCellsResultAccessor::cellScalar(size_t gridLocalCellIndex) cons
{
if (m_reservoirResultValues->size() == 0 ) return HUGE_VAL;
size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size());
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size());
return m_reservoirResultValues->at(globalGridCellIndex);
return m_reservoirResultValues->at(reservoirCellIndex);
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ReservoirDataModel/RigCaseData.cpp
View File

@ -166,9 +166,9 @@ void RigCaseData::computeWellCellsPrGrid()
if (gridIndex < m_wellCellsInGrid.size() && gridCellIndex < m_wellCellsInGrid[gridIndex]->size())
{
size_t globalGridCellIndex = grids[gridIndex]->globalGridCellIndex(gridCellIndex);
if (m_activeCellInfo->isActive(globalGridCellIndex)
|| m_fractureActiveCellInfo->isActive(globalGridCellIndex))
size_t reservoirCellIndex = grids[gridIndex]->reservoirCellIndex(gridCellIndex);
if (m_activeCellInfo->isActive(reservoirCellIndex)
|| m_fractureActiveCellInfo->isActive(reservoirCellIndex))
{
m_wellCellsInGrid[gridIndex]->set(gridCellIndex, true);
m_gridCellToWellIndex[gridIndex]->set(gridCellIndex, static_cast<cvf::uint>(wIdx));

2
ApplicationCode/ReservoirDataModel/RigFault.cpp
View File

@ -115,7 +115,7 @@ void RigFault::computeFaultFacesFromCellRanges(const RigMainGrid* mainGrid)
}
// Do not need to compute global grid cell index as for a maingrid localIndex == globalIndex
//size_t reservoirCellIndex = grid->globalGridCellIndex(gridLocalCellIndex);
//size_t reservoirCellIndex = grid->reservoirCellIndex(gridLocalCellIndex);
size_t ni, nj, nk;
mainGrid->neighborIJKAtCellFace(i, j, k, faceEnum, &ni, &nj, &nk);

2
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

@ -368,7 +368,7 @@ double RigGridBase::characteristicIJCellSize()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RigGridBase::globalGridCellIndex(size_t gridLocalCellIndex) const
size_t RigGridBase::reservoirCellIndex(size_t gridLocalCellIndex) const
{
return m_indexToStartOfCells + gridLocalCellIndex;
}

2
ApplicationCode/ReservoirDataModel/RigGridBase.h
View File

@ -52,7 +52,7 @@ public:
RigCell& cell(size_t gridCellIndex);
const RigCell& cell(size_t gridCellIndex) const;
size_t globalGridCellIndex(size_t gridLocalCellIndex) const;
size_t reservoirCellIndex(size_t gridLocalCellIndex) const;
void setIndexToStartOfCells(size_t indexToStartOfCells) { m_indexToStartOfCells = indexToStartOfCells; }
void setGridIndex(size_t index) { m_gridIndex = index; }

2
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@ -259,7 +259,7 @@ void RigMainGrid::calculateFaults()
continue;
}
neighborGlobalCellIdx = hostGrid->globalGridCellIndex(neighborGridCellIdx);
neighborGlobalCellIdx = hostGrid->reservoirCellIndex(neighborGridCellIdx);
if (m_cells[neighborGlobalCellIdx].isInvalid())
{
continue;

20
ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
View File

@ -176,10 +176,10 @@ double RigGridAllCellsScalarDataAccess::cellScalar(size_t gridLocalCellIndex) co
{
if (m_reservoirResultValues->size() == 0 ) return HUGE_VAL;
size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size());
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size());
return m_reservoirResultValues->at(globalGridCellIndex);
return m_reservoirResultValues->at(reservoirCellIndex);
}
//--------------------------------------------------------------------------------------------------
@ -187,10 +187,10 @@ double RigGridAllCellsScalarDataAccess::cellScalar(size_t gridLocalCellIndex) co
//--------------------------------------------------------------------------------------------------
void RigGridAllCellsScalarDataAccess::setCellScalar(size_t gridLocalCellIndex, double scalarValue)
{
size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size());
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size());
(*m_reservoirResultValues)[globalGridCellIndex] = scalarValue;
(*m_reservoirResultValues)[reservoirCellIndex] = scalarValue;
}
//--------------------------------------------------------------------------------------------------
@ -212,8 +212,8 @@ public:
{
if (m_reservoirResultValues == NULL || m_reservoirResultValues->size() == 0 ) return HUGE_VAL;
size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex);
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);
if (resultValueIndex == cvf::UNDEFINED_SIZE_T) return HUGE_VAL;
CVF_TIGHT_ASSERT(resultValueIndex < m_reservoirResultValues->size());
@ -226,8 +226,8 @@ public:
//--------------------------------------------------------------------------------------------------
virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue)
{
size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex);
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);
CVF_TIGHT_ASSERT(m_reservoirResultValues != NULL && resultValueIndex < m_reservoirResultValues->size());

10
ApplicationCode/ReservoirDataModel/RigResultModifier.h
View File

@ -47,10 +47,10 @@ public:
virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue)
{
size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(globalGridCellIndex < m_reservoirResultValues->size());
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
CVF_TIGHT_ASSERT(reservoirCellIndex < m_reservoirResultValues->size());
(*m_reservoirResultValues)[globalGridCellIndex] = scalarValue;
(*m_reservoirResultValues)[reservoirCellIndex] = scalarValue;
}
private:
@ -74,8 +74,8 @@ public:
virtual void setCellScalar(size_t gridLocalCellIndex, double scalarValue)
{
size_t globalGridCellIndex = m_grid->globalGridCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(globalGridCellIndex);
size_t reservoirCellIndex = m_grid->reservoirCellIndex(gridLocalCellIndex);
size_t resultValueIndex = m_activeCellInfo->cellResultIndex(reservoirCellIndex);
CVF_TIGHT_ASSERT(m_reservoirResultValues != NULL && resultValueIndex < m_reservoirResultValues->size());