OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove the phase enums from BlackoilPropsAdInterface

Browse Source 
since the enums in BlackoilModelEnums.hpp are namespace-global this
does not require any code changes. (except replacing 'Liquid' by
'Oil', etc.)
This commit is contained in:
Andreas Lauser
2016-12-30 11:51:47 +01:00
parent ac4dcba7e0
commit 98b9e2ef58
3 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_boprops_ad.cpp
View File

@@ -116,17 +116,17 @@ BOOST_FIXTURE_TEST_CASE(SurfaceDensity, TestFixture<SetupSimple>)
typedef Opm::BlackoilPropsAdFromDeck::V V;
enum { Water = Opm::BlackoilPropsAdFromDeck::Water };
enum { Water = Opm::Water };
V rho0AD_Water = boprops_ad.surfaceDensity(Water, cells);
BOOST_REQUIRE_EQUAL(rho0AD_Water.size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD_Water[0], 1000.0);
enum { Oil = Opm::BlackoilPropsAdFromDeck::Oil };
enum { Oil = Opm::Oil };
V rho0AD_Oil = boprops_ad.surfaceDensity(Oil, cells);
BOOST_REQUIRE_EQUAL(rho0AD_Oil.size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD_Oil[0], 800.0);
enum { Gas = Opm::BlackoilPropsAdFromDeck::Gas };
enum { Gas = Opm::Gas };
V rho0AD_Gas = boprops_ad.surfaceDensity(Gas, cells);
BOOST_REQUIRE_EQUAL(rho0AD_Gas.size(), cells.size());
BOOST_CHECK_EQUAL(rho0AD_Gas[0], 1.0);