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

fix serialization after removed member in IOCOnfig

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-01-24 13:12:02 +01:00
parent 7e629fdcc8
commit b9ea08519a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -632,7 +632,6 @@ std::size_t packSize(const IOConfig& data, Dune::MPIHelper::MPICommunicator comm
packSize(data.getUNIFOUT(), comm) + packSize(data.getUNIFOUT(), comm) +
packSize(data.getFMTIN(), comm) + packSize(data.getFMTIN(), comm) +
packSize(data.getFMTOUT(), comm) + packSize(data.getFMTOUT(), comm) +
packSize(data.getFirstRestartStep(), comm) +
packSize(data.getDeckFileName(), comm) + packSize(data.getDeckFileName(), comm) +
packSize(data.getOutputEnabled(), comm) + packSize(data.getOutputEnabled(), comm) +
packSize(data.getOutputDir(), comm) + packSize(data.getOutputDir(), comm) +
@ -2462,7 +2461,6 @@ void pack(const IOConfig& data, std::vector<char>& buffer, int& position,
pack(data.getUNIFOUT(), buffer, position, comm); pack(data.getUNIFOUT(), buffer, position, comm);
pack(data.getFMTIN(), buffer, position, comm); pack(data.getFMTIN(), buffer, position, comm);
pack(data.getFMTOUT(), buffer, position, comm); pack(data.getFMTOUT(), buffer, position, comm);
pack(data.getFirstRestartStep(), buffer, position, comm);
pack(data.getDeckFileName(), buffer, position, comm); pack(data.getDeckFileName(), buffer, position, comm);
pack(data.getOutputEnabled(), buffer, position, comm); pack(data.getOutputEnabled(), buffer, position, comm);
pack(data.getOutputDir(), buffer, position, comm); pack(data.getOutputDir(), buffer, position, comm);
@ -4505,7 +4503,6 @@ void unpack(IOConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
bool write_init, write_egrid, unifin, unifout, fmtin, fmtout; bool write_init, write_egrid, unifin, unifout, fmtin, fmtout;
int firstRestartStep;
std::string deck_name, output_dir, base_name; std::string deck_name, output_dir, base_name;
bool output_enabled, no_sim, ecl_compatible_rst; bool output_enabled, no_sim, ecl_compatible_rst;
@ -4515,7 +4512,6 @@ void unpack(IOConfig& data, std::vector<char>& buffer, int& position,
unpack(unifout, buffer, position, comm); unpack(unifout, buffer, position, comm);
unpack(fmtin, buffer, position, comm); unpack(fmtin, buffer, position, comm);
unpack(fmtout, buffer, position, comm); unpack(fmtout, buffer, position, comm);
unpack(firstRestartStep, buffer, position, comm);
unpack(deck_name, buffer, position, comm); unpack(deck_name, buffer, position, comm);
unpack(output_enabled, buffer, position, comm); unpack(output_enabled, buffer, position, comm);
unpack(output_dir, buffer, position, comm); unpack(output_dir, buffer, position, comm);
@ -4523,7 +4519,7 @@ void unpack(IOConfig& data, std::vector<char>& buffer, int& position,
unpack(base_name, buffer, position, comm); unpack(base_name, buffer, position, comm);
unpack(ecl_compatible_rst, buffer, position, comm); unpack(ecl_compatible_rst, buffer, position, comm);
data = IOConfig(write_init, write_egrid, unifin, unifout, fmtin, fmtout, data = IOConfig(write_init, write_egrid, unifin, unifout, fmtin, fmtout,
firstRestartStep, deck_name, output_enabled, output_dir, deck_name, output_enabled, output_dir,
no_sim, base_name, ecl_compatible_rst); no_sim, base_name, ecl_compatible_rst);
} }

4
tests/test_ParallelRestart.cpp
View File

@ -815,7 +815,7 @@ BOOST_AUTO_TEST_CASE(RestartConfig)
BOOST_AUTO_TEST_CASE(IOConfig) BOOST_AUTO_TEST_CASE(IOConfig)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::IOConfig val1(true, false, true, false, false, true, 1, "test1", true, Opm::IOConfig val1(true, false, true, false, false, true, "test1", true,
"test2", true, "test3", false); "test2", true, "test3", false);
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));
@ -2438,7 +2438,7 @@ BOOST_AUTO_TEST_CASE(MULTREGTScanner)
BOOST_AUTO_TEST_CASE(EclipseConfig) BOOST_AUTO_TEST_CASE(EclipseConfig)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::IOConfig io(true, false, true, false, false, true, 1, "test1", true, Opm::IOConfig io(true, false, true, false, false, true, "test1", true,
"test2", true, "test3", false); "test2", true, "test3", false);
Opm::InitConfig init(Opm::Equil({getEquilRecord(), getEquilRecord()}), Opm::InitConfig init(Opm::Equil({getEquilRecord(), getEquilRecord()}),
Opm::FoamConfig({getFoamData(), getFoamData()}), Opm::FoamConfig({getFoamData(), getFoamData()}),