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

remove old serialization support for WellConnections

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-18 09:29:02 +01:00
parent 8cd3d3c9b9
commit a35ba93629
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp>
#include <opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp> #include <opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp>
#include <dune/common/parallel/mpitraits.hh> #include <dune/common/parallel/mpitraits.hh>
@ -368,15 +367,6 @@ std::size_t packSize(const Well::WellInjectionProperties& data,
packSize(data.controlMode, comm); packSize(data.controlMode, comm);
} }
std::size_t packSize(const WellConnections& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.ordering(), comm) +
packSize(data.getHeadI(), comm) +
packSize(data.getHeadJ(), comm) +
packSize(data.getConnections(), comm);
}
std::size_t packSize(const Well::WellProductionProperties& data, std::size_t packSize(const Well::WellProductionProperties& data,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -909,16 +899,6 @@ void pack(const Well::WellInjectionProperties& data,
pack(data.controlMode, buffer, position, comm); pack(data.controlMode, buffer, position, comm);
} }
void pack(const WellConnections& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.ordering(), buffer, position, comm);
pack(data.getHeadI(), buffer, position, comm);
pack(data.getHeadJ(), buffer, position, comm);
pack(data.getConnections(), buffer, position, comm);
}
void pack(const Well::WellProductionProperties& data, void pack(const Well::WellProductionProperties& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@ -1503,22 +1483,6 @@ void unpack(Well::WellInjectionProperties& data,
unpack(data.controlMode, buffer, position, comm); unpack(data.controlMode, buffer, position, comm);
} }
void unpack(WellConnections& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
int headI, headJ;
Connection::Order ordering;
std::vector<Connection> connections;
unpack(ordering, buffer, position, comm),
unpack(headI, buffer, position, comm),
unpack(headJ, buffer, position, comm),
unpack(connections, buffer, position, comm),
data = WellConnections(ordering, headI, headJ, connections);
}
void unpack(Well::WellProductionProperties& data, void unpack(Well::WellProductionProperties& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)

2
opm/simulators/utils/ParallelRestart.hpp
View File

@ -51,7 +51,6 @@ class UnitSystem;
class Valve; class Valve;
class VFPInjTable; class VFPInjTable;
class VFPProdTable; class VFPProdTable;
class WellConnections;
class WellSegments; class WellSegments;
namespace Mpi namespace Mpi
@ -388,7 +387,6 @@ ADD_PACK_PROTOTYPES(Well)
ADD_PACK_PROTOTYPES(WellType) ADD_PACK_PROTOTYPES(WellType)
ADD_PACK_PROTOTYPES(Well::WellInjectionProperties) ADD_PACK_PROTOTYPES(Well::WellInjectionProperties)
ADD_PACK_PROTOTYPES(Well::WellProductionProperties) ADD_PACK_PROTOTYPES(Well::WellProductionProperties)
ADD_PACK_PROTOTYPES(WellConnections)
ADD_PACK_PROTOTYPES(WellSegments) ADD_PACK_PROTOTYPES(WellSegments)
} // end namespace Mpi } // end namespace Mpi

2
tests/test_ParallelRestart.cpp
View File

@ -1474,7 +1474,7 @@ BOOST_AUTO_TEST_CASE(WellConnections)
12, 13.0, 14.0, true, 12, 13.0, 14.0, true,
15, 16, 17.0); 15, 16, 17.0);
Opm::WellConnections val1(Opm::Connection::Order::TRACK, 1, 2, {conn, conn}); Opm::WellConnections val1(Opm::Connection::Order::TRACK, 1, 2, {conn, conn});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(WellConnections) DO_CHECKS(WellConnections)
#endif #endif
} }