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 AquiferConfig

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

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

@ -380,13 +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 AquiferConfig& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.fetp(), comm) +
packSize(data.ct(), comm) +
packSize(data.connections(), 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) +
@ -1575,13 +1568,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 AquiferConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) {
pack(data.fetp(), buffer, position, comm);
pack(data.ct(), buffer, position, comm);
pack(data.connections(), 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)
{ {
@ -2832,17 +2818,6 @@ void unpack(DenT& data, std::vector<char>& buffer, int& position, Dune::MPIHelpe
data = DenT( records ); data = DenT( records );
} }
void unpack(AquiferConfig& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) {
Aquifetp fetp;
AquiferCT ct;
Aquancon conn;
unpack(fetp, buffer, position, comm);
unpack(ct, buffer, position, comm);
unpack(conn, buffer, position, comm);
data = AquiferConfig(fetp, ct, conn);
}
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)
{ {

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

@ -26,7 +26,6 @@
#include <opm/output/eclipse/RestartValue.hpp> #include <opm/output/eclipse/RestartValue.hpp>
#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/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>
@ -463,7 +462,6 @@ ADD_PACK_PROTOTYPES(Action::ASTNode)
ADD_PACK_PROTOTYPES(Action::Condition) 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(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

@ -1795,7 +1795,7 @@ BOOST_AUTO_TEST_CASE(AquferConfig)
Opm::AquiferCT ct = getAquiferCT(); Opm::AquiferCT ct = getAquiferCT();
Opm::Aquancon conn = getAquancon(); Opm::Aquancon conn = getAquancon();
Opm::AquiferConfig val1(fetp, ct, conn); Opm::AquiferConfig val1(fetp, ct, conn);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(AquiferConfig); DO_CHECKS(AquiferConfig);
#endif #endif
} }