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 Aquancon

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:06:40 +01:00
parent 6f7d15c56e
commit dca5b06045
3 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,20 +428,6 @@ std::size_t packSize(const AquiferConfig& data, Dune::MPIHelper::MPICommunicator
packSize(data.connections(), comm); packSize(data.connections(), comm);
} }
std::size_t packSize(const Aquancon::AquancCell& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.aquiferID, comm) +
packSize(data.global_index, comm) +
packSize(data.influx_coeff, comm) +
packSize(data.influx_mult, comm) +
packSize(data.face_dir, comm);
}
std::size_t packSize(const Aquancon& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.data(), comm);
}
std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.pvmultValues(), comm) + return packSize(data.pvmultValues(), comm) +
@ -1680,20 +1666,6 @@ void pack(const AquiferConfig& data, std::vector<char>& buffer, int& position,
pack(data.connections(), buffer, position, comm); pack(data.connections(), buffer, position, comm);
} }
void pack(const Aquancon::AquancCell& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) {
pack(data.aquiferID, buffer, position, comm);
pack(data.global_index, buffer, position, comm);
pack(data.influx_coeff, buffer, position, comm);
pack(data.influx_mult, buffer, position, comm);
pack(data.face_dir, buffer, position, comm);
}
void pack(const Aquancon& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) {
pack(data.data(), buffer, position, comm);
}
void pack(const Rock2dTable& data, std::vector<char>& buffer, int& position, void pack(const Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -3021,25 +2993,6 @@ void unpack(Aquifetp& data, std::vector<char>& buffer, int& position, Dune::MPIH
data = Aquifetp(aquiferList); data = Aquifetp(aquiferList);
} }
void unpack(Aquancon::AquancCell& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm)
{
int aquiferID;
std::size_t globalIndex;
std::pair<bool, double> influxCoeff;
double influxMult;
FaceDir::DirEnum faceDir;
unpack(aquiferID, buffer, position, comm);
unpack(globalIndex, buffer, position, comm);
unpack(influxCoeff, buffer, position, comm);
unpack(influxMult, buffer, position, comm);
unpack(faceDir, buffer, position, comm);
data = Aquancon::AquancCell(aquiferID, globalIndex, influxCoeff, influxMult, faceDir);
}
void unpack(AquiferConfig& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { void unpack(AquiferConfig& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) {
Aquifetp fetp; Aquifetp fetp;
AquiferCT ct; AquiferCT ct;
@ -3051,14 +3004,6 @@ void unpack(AquiferConfig& data, std::vector<char>& buffer, int& position, Dune:
data = AquiferConfig(fetp, ct, conn); data = AquiferConfig(fetp, ct, conn);
} }
void unpack(Aquancon& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm)
{
std::unordered_map<int, std::vector<Aquancon::AquancCell>> aquiferCells;
unpack(aquiferCells, buffer, position, comm);
data = Aquancon(aquiferCells);
}
void unpack(Rock2dTable& data, std::vector<char>& buffer, int& position, void unpack(Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@ -27,7 +27,6 @@
#include <opm/output/eclipse/EclipseIO.hpp> #include <opm/output/eclipse/EclipseIO.hpp>
#include <opm/output/eclipse/Summary.hpp> #include <opm/output/eclipse/Summary.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferConfig.hpp> #include <opm/parser/eclipse/EclipseState/AquiferConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferCT.hpp> #include <opm/parser/eclipse/EclipseState/AquiferCT.hpp>
#include <opm/parser/eclipse/EclipseState/Aquifetp.hpp> #include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp>
@ -467,8 +466,6 @@ ADD_PACK_PROTOTYPES(Action::Condition)
ADD_PACK_PROTOTYPES(Action::Quantity) ADD_PACK_PROTOTYPES(Action::Quantity)
ADD_PACK_PROTOTYPES(Aqudims) ADD_PACK_PROTOTYPES(Aqudims)
ADD_PACK_PROTOTYPES(AquiferConfig) ADD_PACK_PROTOTYPES(AquiferConfig)
ADD_PACK_PROTOTYPES(Aquancon)
ADD_PACK_PROTOTYPES(Aquancon::AquancCell)
ADD_PACK_PROTOTYPES(AquiferCT) ADD_PACK_PROTOTYPES(AquiferCT)
ADD_PACK_PROTOTYPES(AquiferCT::AQUCT_data) ADD_PACK_PROTOTYPES(AquiferCT::AQUCT_data)
ADD_PACK_PROTOTYPES(Aquifetp) ADD_PACK_PROTOTYPES(Aquifetp)

2
tests/test_ParallelRestart.cpp
View File

@ -1783,7 +1783,7 @@ BOOST_AUTO_TEST_CASE(Aquancon)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::Aquancon val1 = getAquancon(); Opm::Aquancon val1 = getAquancon();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Aquancon); DO_CHECKS(Aquancon);
#endif #endif
} }