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

Missed one file in previous rename

Browse Source 
p4#: 21046
This commit is contained in:
Magne Sjaastad 2013-03-22 09:44:41 +01:00
parent 21065176f2
commit 3cd92973af
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,9 @@
#include "RigActiveCellInfo.h" #include "RigActiveCellInfo.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -33,12 +36,12 @@ TEST(RigActiveCellInfo, BasicTest)
for (size_t i = 0; i < globalActiveCellCount; i++) for (size_t i = 0; i < globalActiveCellCount; i++)
{ {
EXPECT_TRUE(rigActiveCellInfo.activeIndexInMatrixModel(i) == cvf::UNDEFINED_SIZE_T); EXPECT_TRUE(rigActiveCellInfo.cellResultIndex(i) == cvf::UNDEFINED_SIZE_T);
EXPECT_FALSE(rigActiveCellInfo.isActiveInMatrixModel(i)); EXPECT_FALSE(rigActiveCellInfo.isActive(i));
} }
rigActiveCellInfo.setActiveIndexInMatrixModel(3, 1); rigActiveCellInfo.setCellResultIndex(3, 1);
EXPECT_TRUE(rigActiveCellInfo.activeIndexInMatrixModel(3) == 1); EXPECT_TRUE(rigActiveCellInfo.cellResultIndex(3) == 1);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -54,7 +57,7 @@ TEST(RigActiveCellInfo, GridCellCounts)
rigActiveCellInfo.setGridActiveCellCounts(2, 2); rigActiveCellInfo.setGridActiveCellCounts(2, 2);
rigActiveCellInfo.computeDerivedData(); rigActiveCellInfo.computeDerivedData();
EXPECT_TRUE(rigActiveCellInfo.globalMatrixModelActiveCellCount() == 3); EXPECT_TRUE(rigActiveCellInfo.globalActiveCellCount() == 3);
} }
{ {
@ -65,7 +68,6 @@ TEST(RigActiveCellInfo, GridCellCounts)
rigActiveCellInfo.setGridActiveCellCounts(2, 5 ); rigActiveCellInfo.setGridActiveCellCounts(2, 5 );
rigActiveCellInfo.computeDerivedData(); rigActiveCellInfo.computeDerivedData();
EXPECT_TRUE(rigActiveCellInfo.globalMatrixModelActiveCellCount() == 12); EXPECT_TRUE(rigActiveCellInfo.globalActiveCellCount() == 12);
} }
} }