OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-21 16:57:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #634 from totto82/fix_test_solventProps

Browse Source 
Fixes to test_solventprops_ad
This commit is contained in:
Atgeirr Flø Rasmussen 2016-04-05 09:11:29 +02:00
commit 16c8ca40cd
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/test_solventprops_ad.cpp
View File

@ -52,14 +52,14 @@ MISCIBLE\n\
1 3 /\n\
\n\
DIMENS \n\
1 1 1 \n\
3 1 1 \n\
/\n\
TABDIMS\n\
/\n\
GRID \n\
\n\
DXV \n\
1 \n\
1 1 1\n\
/\n\
DYV \n\
1 \n\
@ -92,8 +92,8 @@ BOOST_AUTO_TEST_CASE(Construction)
Opm::DeckPtr deck = parser->parseString(deckData + solventData, parseContext);
Opm::EclipseStateConstPtr eclState;
eclState.reset(new Opm::EclipseState(deck , parseContext));
const int global_ind = 0;
Opm::SolventPropsAdFromDeck solventprops(deck, eclState, 1, &global_ind);
std::vector<int> global_ind = {0 , 1 , 2};
Opm::SolventPropsAdFromDeck solventprops(deck, eclState, 3, global_ind.data());
}
BOOST_AUTO_TEST_CASE(SolventData)
@ -103,14 +103,15 @@ BOOST_AUTO_TEST_CASE(SolventData)
Opm::DeckPtr deck = parser->parseString(deckData + solventData, parseContext);
Opm::EclipseStateConstPtr eclState;
eclState.reset(new Opm::EclipseState(deck , parseContext));
const int global_ind = 0;
Opm::SolventPropsAdFromDeck solventprops(deck, eclState, 1, &global_ind);
std::vector<int> global_ind = {0 , 1 , 2};
Opm::SolventPropsAdFromDeck solventprops(deck, eclState, 3, global_ind.data());
const Opm::SolventPropsAdFromDeck::Cells cells(1, 0);
const Opm::SolventPropsAdFromDeck::Cells cells(3, 0);
typedef Opm::SolventPropsAdFromDeck::V V;
V rho = solventprops.solventSurfaceDensity(cells);
BOOST_REQUIRE_EQUAL(rho.size(), cells.size());
BOOST_CHECK_EQUAL(rho[0], 0.1);
BOOST_CHECK_EQUAL(rho[0], rho[1]);
}
const std::string pmiscData = "\n\
@ -130,8 +131,8 @@ BOOST_AUTO_TEST_CASE(PMISC)
eclState.reset(new Opm::EclipseState(deck , parseContext));
const Opm::SolventPropsAdFromDeck::Cells cells(3, 0);
typedef Opm::SolventPropsAdFromDeck::V V;
const int* global_ind = new int[3] {0 , 1 , 2};
Opm::SolventPropsAdFromDeck solventprops(deck, eclState, 3, global_ind);
std::vector<int> global_ind = {0 , 1 , 2};
Opm::SolventPropsAdFromDeck solventprops(deck, eclState, 3, global_ind.data());
V po(3);
po << 150,250,550;
po = po * Opm::unit::barsa;