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 #2451 from akva2/followup_stonetype

Browse Source 
update serialization for relocated KrModel
This commit is contained in:
Bård Skaflestad 2020-03-10 07:58:43 -05:00 committed by GitHub
commit 8700ea1310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -753,8 +753,7 @@ std::size_t packSize(const Runspec& data, Dune::MPIHelper::MPICommunicator comm)
packSize(data.udqParams(), comm) +
packSize(data.hysterPar(), comm) +
packSize(data.actdims(), comm) +
packSize(data.saturationFunctionControls(), comm) +
packSize(data.stoneType(), comm);
packSize(data.saturationFunctionControls(), comm);
}
std::size_t packSize(const PvtxTable& data, Dune::MPIHelper::MPICommunicator comm)
@ -2413,7 +2412,6 @@ void pack(const Runspec& data, std::vector<char>& buffer, int& position,
pack(data.hysterPar(), buffer, position, comm);
pack(data.actdims(), buffer, position, comm);
pack(data.saturationFunctionControls(), buffer, position, comm);
pack(data.stoneType(), buffer, position, comm);
}
void pack(const PvtxTable& data, std::vector<char>& buffer, int& position,
@ -4281,7 +4279,6 @@ void unpack(Runspec& data, std::vector<char>& buffer, int& position,
EclHysterConfig hystPar;
Actdims actdims;
SatFuncControls sfuncctrl;
Runspec::StoneType stonetype;
unpack(phases, buffer, position, comm);
unpack(tabdims, buffer, position, comm);
@ -4292,9 +4289,8 @@ void unpack(Runspec& data, std::vector<char>& buffer, int& position,
unpack(hystPar, buffer, position, comm);
unpack(actdims, buffer, position, comm);
unpack(sfuncctrl, buffer, position, comm);
unpack(stonetype, buffer, position, comm);
data = Runspec(phases, tabdims, endScale, wellDims, wsegDims,
udqparams, hystPar, actdims, sfuncctrl, stonetype);
udqparams, hystPar, actdims, sfuncctrl);
}
template<class PVTType>

6
tests/test_ParallelRestart.cpp
View File

@ -983,8 +983,7 @@ BOOST_AUTO_TEST_CASE(Runspec)
Opm::UDQParams(true, 1, 2.0, 3.0, 4.0),
Opm::EclHysterConfig(true, 1, 2),
Opm::Actdims(1,2,3,4),
Opm::SatFuncControls(5.0e-7),
Opm::Runspec::StoneType::STONE2);
Opm::SatFuncControls(5.0e-7, Opm::SatFuncControls::ThreePhaseOilKrModel::Stone2));
auto val2 = PackUnpack(val1);
DO_CHECKS(Runspec)
@ -2077,8 +2076,7 @@ BOOST_AUTO_TEST_CASE(Schedule)
Opm::UDQParams(true, 1, 2.0, 3.0, 4.0),
Opm::EclHysterConfig(true, 1, 2),
Opm::Actdims(1,2,3,4),
Opm::SatFuncControls(5.6e-7),
Opm::Runspec::StoneType::STONE1);
Opm::SatFuncControls(5.6e-7, Opm::SatFuncControls::ThreePhaseOilKrModel::Stone1));
Opm::Schedule::VFPProdMap vfpProd {{1, {{std::make_shared<Opm::VFPProdTable>(getVFPProdTable())},1}}};
Opm::Schedule::VFPInjMap vfpIn{{1, {{std::make_shared<Opm::VFPInjTable>(getVFPInjTable())},1}}};
Opm::WellTestConfig::WTESTWell tw{"test", Opm::WellTestConfig::ECONOMIC,