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

Merge pull request from akva2/fix_gcc5

Browse Source 
fixed: use std::make_tuple instead of initializer list
This commit is contained in:
Bård Skaflestad 2020-01-09 11:16:31 +01:00 committed by GitHub
commit d20bec2f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions

8
tests/test_ParallelRestart.cpp
View File

@ -1241,7 +1241,9 @@ BOOST_AUTO_TEST_CASE(UniformXTabulatedTwoDFunction)
#ifdef HAVE_MPI
std::vector<double> xPos{1.0, 2.0};
std::vector<double> yPos{3.0, 4.0};
std::vector<std::vector<std::tuple<double,double,double>>> samples{{{1.0, 2.0, 3.0}}, {{4.0, 5.0, 6.0}}};
using SampleType = std::vector<std::vector<std::tuple<double,double,double>>>;
SampleType samples{{std::make_tuple(1.0, 2.0, 3.0)},
{std::make_tuple(4.0, 5.0, 6.0)}};
using FFuncType = Opm::UniformXTabulated2DFunction<double>;
FFuncType val1(xPos, yPos, samples, FFuncType::Vertical);
auto val2 = PackUnpack(val1);
@ -1301,7 +1303,7 @@ BOOST_AUTO_TEST_CASE(WetGasPvt)
std::vector<double> yPos{3.0, 4.0};
using FFuncType = Opm::UniformXTabulated2DFunction<double>;
using Samples = std::vector<std::vector<FFuncType::SamplePoint>>;
Samples samples({{{1.0, 2.0, 3.0}, {3.0, 4.0, 5.0}}});
Samples samples({{std::make_tuple(1.0, 2.0, 3.0), std::make_tuple(3.0, 4.0, 5.0)}});
FFuncType func2(xPos, yPos, samples, FFuncType::Vertical);
Opm::WetGasPvt<double> val1({1.0, 2.0}, {3.0, 4.0},
{func2}, {func}, {func2},
@ -1347,7 +1349,7 @@ BOOST_AUTO_TEST_CASE(LiveOilPvt)
std::vector<double> yPos{3.0, 4.0};
using FFuncType = Opm::UniformXTabulated2DFunction<double>;
using Samples = std::vector<std::vector<FFuncType::SamplePoint>>;
Samples samples({{{1.0, 2.0, 3.0}, {3.0, 4.0, 5.0}}});
Samples samples({{std::make_tuple(1.0, 2.0, 3.0), std::make_tuple(3.0, 4.0, 5.0)}});
FFuncType func2(xPos, yPos, samples, FFuncType::Vertical);
Opm::LiveOilPvt<double> val1({1.0, 2.0}, {3.0, 4.0},
{func2}, {func2}, {func2},