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

make the water PVT salt dependent

Browse Source
This commit is contained in:
Tor Harald Sandve
2020-07-02 13:42:58 +02:00
parent a11b3a53b2
commit b4c8dd5e86
5 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_eclblackoilpvt.cpp
View File

@@ -139,6 +139,7 @@ void ensurePvtApi(const OilPvt& oilPvt, const GasPvt& gasPvt, const WaterPvt& wa
while (0) {
Evaluation temperature = 273.15 + 20.0;
Evaluation pressure = 1e5;
Evaluation saltconcentration = 0.0;
Evaluation Rs = 0.0;
Evaluation Rv = 0.0;
Evaluation So = 0.5;
@@ -150,10 +151,12 @@ void ensurePvtApi(const OilPvt& oilPvt, const GasPvt& gasPvt, const WaterPvt& wa
/////
tmp = waterPvt.viscosity(/*regionIdx=*/0,
temperature,
pressure);
pressure,
saltconcentration);
tmp = waterPvt.inverseFormationVolumeFactor(/*regionIdx=*/0,
temperature,
pressure);
pressure,
saltconcentration);
/////
// oil PVT API

3
tests/test_fluidsystems.cpp
View File

@@ -53,6 +53,7 @@
#include <opm/material/fluidstates/NonEquilibriumFluidState.hpp>
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/fluidstates/SimpleModularFluidState.hpp>
#include <opm/material/fluidstates/BlackOilFluidState.hpp>
// include the tables for CO2 which are delivered with opm-material by default
#include <opm/material/common/UniformTabulated2DFunction.hpp>
@@ -83,7 +84,7 @@ void ensureBlackoilApi()
#endif
typedef typename FluidSystem::Scalar Scalar;
typedef Opm::CompositionalFluidState<Evaluation, FluidSystem> FluidState;
typedef Opm::BlackOilFluidState<Evaluation, FluidSystem> FluidState;
FluidState fluidState;
Evaluation XoG = 0.0;
Evaluation XgO = 0.0;