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 Aquifetp

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:07:46 +01:00
parent 52508559bb
commit 4a34e7336c
3 changed files with 1 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,22 +380,6 @@ std::size_t packSize(const DenT& data, Dune::MPIHelper::MPICommunicator comm)
return packSize(data.records(), comm); return packSize(data.records(), comm);
} }
std::size_t packSize(const Aquifetp& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.data(), comm);
}
std::size_t packSize(const Aquifetp::AQUFETP_data& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.aquiferID, comm) +
packSize(data.pvttableID, comm) +
packSize(data.J, comm) +
packSize(data.C_t, comm) +
packSize(data.V0, comm) +
packSize(data.d0, comm) +
packSize(data.p0, comm);
}
std::size_t packSize(const AquiferConfig& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const AquiferConfig& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.fetp(), comm) + return packSize(data.fetp(), comm) +
@ -1580,17 +1564,6 @@ void pack(const RestartValue& data, std::vector<char>& buffer, int& position,
pack(data.extra, buffer, position, comm); pack(data.extra, buffer, position, comm);
} }
void pack(const Aquifetp::AQUFETP_data& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) {
pack(data.aquiferID, buffer, position, comm);
pack(data.pvttableID, buffer, position, comm);
pack(data.J, buffer, position, comm);
pack(data.C_t, buffer, position, comm);
pack(data.V0, buffer, position, comm);
pack(data.d0, buffer, position, comm);
pack(data.p0, buffer, position, comm);
}
void pack(const WellType& data, std::vector<char>& buffer, int& position, void pack(const WellType& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) { Dune::MPIHelper::MPICommunicator comm) {
pack(data.producer(), buffer, position, comm); pack(data.producer(), buffer, position, comm);
@ -1602,12 +1575,6 @@ void pack(const DenT& data, std::vector<char>& buffer, int& position,
pack(data.records(), buffer, position, comm); pack(data.records(), buffer, position, comm);
} }
void pack(const Aquifetp& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) {
pack(data.data(), buffer, position, comm);
}
void pack(const AquiferConfig& data, std::vector<char>& buffer, int& position, void pack(const AquiferConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) { Dune::MPIHelper::MPICommunicator comm) {
pack(data.fetp(), buffer, position, comm); pack(data.fetp(), buffer, position, comm);
@ -2865,30 +2832,6 @@ void unpack(DenT& data, std::vector<char>& buffer, int& position, Dune::MPIHelpe
data = DenT( records ); data = DenT( records );
} }
void unpack(Aquifetp::AQUFETP_data& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm)
{
int aquiferID;
int pvttableID;
double J, C_t, V0, d0;
std::pair<bool, double> p0;
unpack(aquiferID, buffer, position, comm);
unpack(pvttableID, buffer, position, comm);
unpack(J, buffer, position, comm);
unpack(C_t, buffer, position, comm);
unpack(V0, buffer, position, comm);
unpack(d0, buffer, position, comm);
unpack(p0, buffer, position, comm);
data = Aquifetp::AQUFETP_data(aquiferID, pvttableID, J, C_t, V0, d0, p0);
}
void unpack(Aquifetp& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm)
{
std::vector<Aquifetp::AQUFETP_data> aquiferList;
unpack(aquiferList, buffer, position, comm);
data = Aquifetp(aquiferList);
}
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;

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/Aquifetp.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/DynamicVector.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp>
@ -465,8 +464,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(Aquifetp)
ADD_PACK_PROTOTYPES(Aquifetp::AQUFETP_data)
ADD_PACK_PROTOTYPES(BrineDensityTable) ADD_PACK_PROTOTYPES(BrineDensityTable)
ADD_PACK_PROTOTYPES(ColumnSchema) ADD_PACK_PROTOTYPES(ColumnSchema)
ADD_PACK_PROTOTYPES(Connection) ADD_PACK_PROTOTYPES(Connection)

2
tests/test_ParallelRestart.cpp
View File

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