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

Renamed globalCell to reservoirCell etc.

Browse Source
This commit is contained in:
Jacob Støren
2014-08-08 10:27:29 +02:00
committed by Magne Sjaastad
parent 6cdd9cfdc5
commit 3022a40204
13 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/RigActiveCellInfo-Test.cpp
View File

@@ -32,7 +32,7 @@ TEST(RigActiveCellInfo, BasicTest)
RigActiveCellInfo rigActiveCellInfo;
size_t globalActiveCellCount = 10;
rigActiveCellInfo.setGlobalCellCount(globalActiveCellCount);
rigActiveCellInfo.setReservoirCellCount(globalActiveCellCount);
for (size_t i = 0; i < globalActiveCellCount; i++)
{
@@ -57,7 +57,7 @@ TEST(RigActiveCellInfo, GridCellCounts)
rigActiveCellInfo.setGridActiveCellCounts(2, 2);
rigActiveCellInfo.computeDerivedData();
EXPECT_TRUE(rigActiveCellInfo.globalActiveCellCount() == 3);
EXPECT_TRUE(rigActiveCellInfo.reservoirActiveCellCount() == 3);
}
{
@@ -68,6 +68,6 @@ TEST(RigActiveCellInfo, GridCellCounts)
rigActiveCellInfo.setGridActiveCellCounts(2, 5 );
rigActiveCellInfo.computeDerivedData();
EXPECT_TRUE(rigActiveCellInfo.globalActiveCellCount() == 12);
EXPECT_TRUE(rigActiveCellInfo.reservoirActiveCellCount() == 12);
}
}

8
ApplicationCode/ReservoirDataModel/RigActiveCellInfo.cpp
View File

@@ -34,7 +34,7 @@ RigActiveCellInfo::RigActiveCellInfo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigActiveCellInfo::setGlobalCellCount(size_t globalCellCount)
void RigActiveCellInfo::setReservoirCellCount(size_t globalCellCount)
{
m_cellIndexToResultIndex.resize(globalCellCount, cvf::UNDEFINED_SIZE_T);
}
@@ -42,7 +42,7 @@ void RigActiveCellInfo::setGlobalCellCount(size_t globalCellCount)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RigActiveCellInfo::globalCellCount() const
size_t RigActiveCellInfo::reservoirCellCount() const
{
return m_cellIndexToResultIndex.size();
}
@@ -50,7 +50,7 @@ size_t RigActiveCellInfo::globalCellCount() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RigActiveCellInfo::globalCellResultCount() const
size_t RigActiveCellInfo::reservoirCellResultCount() const
{
return m_globalCellResultCount;
}
@@ -134,7 +134,7 @@ void RigActiveCellInfo::computeDerivedData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
size_t RigActiveCellInfo::globalActiveCellCount() const
size_t RigActiveCellInfo::reservoirActiveCellCount() const
{
return m_globalActiveCellCount;
}

8
ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h
View File

@@ -32,10 +32,10 @@ class RigActiveCellInfo : public cvf::Object
public:
RigActiveCellInfo();
void setGlobalCellCount(size_t globalCellCount);
size_t globalCellCount() const;
size_t globalActiveCellCount() const;
size_t globalCellResultCount() const;
void setReservoirCellCount(size_t globalCellCount);
size_t reservoirCellCount() const;
size_t reservoirActiveCellCount() const;
size_t reservoirCellResultCount() const;
bool isCoarseningActive() const;
bool isActive(size_t reservoirCellIndex) const;

2
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@@ -247,7 +247,7 @@ void RigReservoirBuilderMock::populateReservoir(RigCaseData* eclipseCase)
// Set all cells active
RigActiveCellInfo* activeCellInfo = eclipseCase->activeCellInfo(RifReaderInterface::MATRIX_RESULTS);
activeCellInfo->setGlobalCellCount(eclipseCase->mainGrid()->cells().size());
activeCellInfo->setReservoirCellCount(eclipseCase->mainGrid()->cells().size());
for (size_t i = 0; i < eclipseCase->mainGrid()->cells().size(); i++)
{
activeCellInfo->setCellResultIndex(i, i);