black-oil fluid system: introduce methods to convert Rs and Rv to their respective mass and mole fractions

going from Rs/Rv to the mole fractions is intentionally a bit clumsy
because it is relatively expensive computationally.
This commit is contained in:
Andreas Lauser
2016-01-04 15:31:28 +01:00
parent 5bf8cba955
commit 862f808e74
2 changed files with 70 additions and 57 deletions

View File

@@ -93,10 +93,15 @@ void ensureBlackoilApi()
Evaluation XoG;
OPM_UNUSED Evaluation dummy;
// some additional typedefs
typedef typename FluidSystem::OilPvt OilPvt;
typedef typename FluidSystem::GasPvt GasPvt;
typedef typename FluidSystem::WaterPvt WaterPvt;
// check the non-parser initialization
std::shared_ptr<typename FluidSystem::GasPvt> gasPvt;
std::shared_ptr<typename FluidSystem::OilPvt> oilPvt;
std::shared_ptr<typename FluidSystem::WaterPvt> waterPvt;
std::shared_ptr<OilPvt> oilPvt;
std::shared_ptr<GasPvt> gasPvt;
std::shared_ptr<WaterPvt> waterPvt;
unsigned numPvtRegions = 2;
FluidSystem::initBegin(numPvtRegions);
@@ -138,6 +143,10 @@ void ensureBlackoilApi()
dummy = FluidSystem::waterDensity(temperature, pressure, /*regionIdx=*/0);
dummy = FluidSystem::convertXoGToRs(XoG, /*regionIdx=*/0);
dummy = FluidSystem::convertXgOToRv(XgO, /*regionIdx=*/0);
dummy = FluidSystem::convertXoGToxoG(XoG, /*regionIdx=*/0);
dummy = FluidSystem::convertXgOToxgO(XgO, /*regionIdx=*/0);
dummy = FluidSystem::convertRsToXoG(Rs, /*regionIdx=*/0);
dummy = FluidSystem::convertRvToXgO(Rv, /*regionIdx=*/0);
}
}