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 #2301 from bska/runspec-serialization-api-update

Browse Source 
Chase Runspec Member Update
This commit is contained in:
Joakim Hove 2020-01-27 09:45:45 +01:00 committed by GitHub
commit 298f456b18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,6 +455,7 @@ HANDLE_AS_POD(PVTWRecord)
HANDLE_AS_POD(PVCDORecord) HANDLE_AS_POD(PVCDORecord)
HANDLE_AS_POD(Regdims) HANDLE_AS_POD(Regdims)
HANDLE_AS_POD(ROCKRecord) HANDLE_AS_POD(ROCKRecord)
HANDLE_AS_POD(SatFuncControls)
HANDLE_AS_POD(Tabdims) HANDLE_AS_POD(Tabdims)
HANDLE_AS_POD(TimeStampUTC::YMD) HANDLE_AS_POD(TimeStampUTC::YMD)
HANDLE_AS_POD(VISCREFRecord) HANDLE_AS_POD(VISCREFRecord)
@ -668,7 +669,8 @@ std::size_t packSize(const Runspec& data, Dune::MPIHelper::MPICommunicator comm)
packSize(data.wellSegmentDimensions(), comm) + packSize(data.wellSegmentDimensions(), comm) +
packSize(data.udqParams(), comm) + packSize(data.udqParams(), comm) +
packSize(data.hysterPar(), comm) + packSize(data.hysterPar(), comm) +
packSize(data.actdims(), comm); packSize(data.actdims(), comm) +
packSize(data.saturationFunctionControls(), comm);
} }
std::size_t packSize(const PvtxTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const PvtxTable& data, Dune::MPIHelper::MPICommunicator comm)
@ -2502,6 +2504,7 @@ void pack(const Runspec& data, std::vector<char>& buffer, int& position,
pack(data.udqParams(), buffer, position, comm); pack(data.udqParams(), buffer, position, comm);
pack(data.hysterPar(), buffer, position, comm); pack(data.hysterPar(), buffer, position, comm);
pack(data.actdims(), buffer, position, comm); pack(data.actdims(), buffer, position, comm);
pack(data.saturationFunctionControls(), buffer, position, comm);
} }
void pack(const PvtxTable& data, std::vector<char>& buffer, int& position, void pack(const PvtxTable& data, std::vector<char>& buffer, int& position,
@ -4565,6 +4568,7 @@ void unpack(Runspec& data, std::vector<char>& buffer, int& position,
UDQParams udqparams; UDQParams udqparams;
EclHysterConfig hystPar; EclHysterConfig hystPar;
Actdims actdims; Actdims actdims;
SatFuncControls sfuncctrl;
unpack(phases, buffer, position, comm); unpack(phases, buffer, position, comm);
unpack(tabdims, buffer, position, comm); unpack(tabdims, buffer, position, comm);
unpack(endScale, buffer, position, comm); unpack(endScale, buffer, position, comm);
@ -4573,8 +4577,9 @@ void unpack(Runspec& data, std::vector<char>& buffer, int& position,
unpack(udqparams, buffer, position, comm); unpack(udqparams, buffer, position, comm);
unpack(hystPar, buffer, position, comm); unpack(hystPar, buffer, position, comm);
unpack(actdims, buffer, position, comm); unpack(actdims, buffer, position, comm);
unpack(sfuncctrl, buffer, position, comm);
data = Runspec(phases, tabdims, endScale, wellDims, wsegDims, data = Runspec(phases, tabdims, endScale, wellDims, wsegDims,
udqparams, hystPar, actdims); udqparams, hystPar, actdims, sfuncctrl);
} }
template<class PVTType> template<class PVTType>

6
tests/test_ParallelRestart.cpp
View File

@ -922,7 +922,8 @@ BOOST_AUTO_TEST_CASE(Runspec)
Opm::WellSegmentDims(1,2,3), Opm::WellSegmentDims(1,2,3),
Opm::UDQParams(true, 1, 2.0, 3.0, 4.0), Opm::UDQParams(true, 1, 2.0, 3.0, 4.0),
Opm::EclHysterConfig(true, 1, 2), Opm::EclHysterConfig(true, 1, 2),
Opm::Actdims(1,2,3,4)); Opm::Actdims(1,2,3,4),
Opm::SatFuncControls(5.0e-7));
auto val2 = PackUnpack(val1); auto val2 = PackUnpack(val1);
BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2));
@ -2262,7 +2263,8 @@ BOOST_AUTO_TEST_CASE(Schedule)
Opm::WellSegmentDims(1,2,3), Opm::WellSegmentDims(1,2,3),
Opm::UDQParams(true, 1, 2.0, 3.0, 4.0), Opm::UDQParams(true, 1, 2.0, 3.0, 4.0),
Opm::EclHysterConfig(true, 1, 2), Opm::EclHysterConfig(true, 1, 2),
Opm::Actdims(1,2,3,4)); Opm::Actdims(1,2,3,4),
Opm::SatFuncControls(5.6e-7));
Opm::Schedule::VFPProdMap vfpProd {{1, {{std::make_shared<Opm::VFPProdTable>(getVFPProdTable())},1}}}; 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::Schedule::VFPInjMap vfpIn{{1, {{std::make_shared<Opm::VFPInjTable>(getVFPInjTable())},1}}};
Opm::WellTestConfig::WTESTWell tw{"test", Opm::WellTestConfig::ECONOMIC, Opm::WellTestConfig::WTESTWell tw{"test", Opm::WellTestConfig::ECONOMIC,