OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1327 from joakim-hove/test-fixup

Browse Source 
Add missing #ifdef
This commit is contained in:
Joakim Hove
2019-12-11 14:47:07 +01:00
committed by GitHub
parent 20cd54b939 05b93e7ea1
commit 537120049f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/parser/integration/BoxTest.cpp
View File

@@ -144,8 +144,11 @@ BOOST_AUTO_TEST_CASE( EQUALS ) {
BOOST_AUTO_TEST_CASE( OPERATE ) {
EclipseState state = makeState( prefix() + "BOX/BOXTEST1" );
const EclipseGrid& grid = state.getInputGrid();
#ifdef ENABLE_3DPROPS_TESTING
const auto& ntg = state.fieldProps().get_global<double>("NTG");
#else
const auto& ntg = state.get3DProperties().getDoubleGridProperty("NTG").getData();
#endif
BOOST_CHECK_EQUAL( ntg[grid.getGlobalIndex(0,0,0)], 8.50 ); // MULTA
BOOST_CHECK_EQUAL( ntg[grid.getGlobalIndex(0,5,0)], 5.00 ); // POLY
BOOST_CHECK_EQUAL( ntg[grid.getGlobalIndex(0,0,1)], 4.0 ); // COPY
@@ -155,6 +158,7 @@ BOOST_AUTO_TEST_CASE( OPERATE ) {
BOOST_CHECK_EQUAL( ntg[grid.getGlobalIndex(0,0,4)], 1.5 ); // MINVALUE
}
BOOST_AUTO_TEST_CASE( CONSTRUCTOR_AND_UPDATE ) {
auto deck = makeDeck( prefix() + "BOX/BOXTEST1" );
EclipseGrid grid(deck);