OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 23:41:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2371 from akva2/simplify_oilvap

Browse Source 
adjust to upstream OilVaporization change
This commit is contained in:
Joakim Hove 2020-03-03 08:22:42 +01:00 committed by GitHub
commit 2d31a192b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/utils/ParallelRestart.cpp
View File

@ -5352,7 +5352,8 @@ void unpack(OilVaporizationProperties& data,
Dune::MPIHelper::MPICommunicator comm)
{
OilVaporizationProperties::OilVaporization type;
std::vector<double> vap1, vap2, maxDRSDT, maxDRVDT;
double vap1, vap2;
std::vector<double> maxDRSDT, maxDRVDT;
std::vector<bool> maxDRSDT_allCells;
unpack(type, buffer, position, comm);
unpack(vap1, buffer, position, comm);

6
tests/test_ParallelRestart.cpp
View File

@ -1431,12 +1431,12 @@ BOOST_AUTO_TEST_CASE(OilVaporizationProperties)
#ifdef HAVE_MPI
using VapType = Opm::OilVaporizationProperties::OilVaporization;
Opm::OilVaporizationProperties val1(VapType::VAPPARS,
{1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0},
1.0, 2.0, {5.0, 6.0},
{false, true}, {7.0, 8.0});
auto val2 = PackUnpack(val1);
DO_CHECKS(OilVaporizationProperties)
val1 = Opm::OilVaporizationProperties(VapType::DRDT,
{1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0},
1.0, 2.0, {5.0, 6.0},
{false, true}, {7.0, 8.0});
val2 = PackUnpack(val1);
DO_CHECKS(OilVaporizationProperties)
@ -2232,7 +2232,7 @@ BOOST_AUTO_TEST_CASE(Schedule)
Opm::Group::GroupProductionProperties())},1}});
using VapType = Opm::OilVaporizationProperties::OilVaporization;
Opm::DynamicState<Opm::OilVaporizationProperties> oilvap{{Opm::OilVaporizationProperties(VapType::VAPPARS,
{1.0, 2.0}, {3.0, 4.0}, {5.0, 6.0},
1.0, 2.0, {5.0, 6.0},
{false, true}, {7.0, 8.0})},1};
Opm::Events events(Opm::DynamicVector<uint64_t>({1,2,3,4,5}));
std::unique_ptr<Opm::UnitSystem> unitSys(new Opm::UnitSystem);