OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 17:32:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove old serialization support for DenT

Browse Source
This commit is contained in:
Arne Morten Kvarving committed 2020-03-17 12:27:59 +01:00
1 parent a3398d58d2
commit 1d279ac245
3 files changed
+1 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/simulators/utils/ParallelRestart.cpp
-20
View File
@@ -307,7 +307,6 @@ HANDLE_AS_POD(data::CurrentControl)
HANDLE_AS_POD(data::Rates)
HANDLE_AS_POD(data::Segment)
HANDLE_AS_POD(DENSITYRecord)
HANDLE_AS_POD(DenT::entry)
HANDLE_AS_POD(Eqldims)
HANDLE_AS_POD(MLimits)
HANDLE_AS_POD(PlmixparRecord)
@@ -375,11 +374,6 @@ std::size_t packSize(const WellType& data, Dune::MPIHelper::MPICommunicator comm
packSize(data.preferred_phase(), comm);
}
std::size_t packSize(const DenT& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.records(), comm);
}
std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.pvmultValues(), comm) +
@@ -1545,11 +1539,6 @@ void pack(const WellType& data, std::vector<char>& buffer, int& position,
pack(data.preferred_phase(), buffer, position, comm);
}
void pack(const DenT& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) {
pack(data.records(), buffer, position, comm);
}
void pack(const Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
@@ -2774,15 +2763,6 @@ void unpack(WellType& data, std::vector<char>& buffer, int& position, Dune::MPIH
data = WellType( producer, preferred_phase );
}
void unpack(DenT& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm)
{
std::vector<DenT::entry> records;
unpack(records, buffer, position, comm);
data = DenT( records );
}
void unpack(Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
opm/simulators/utils/ParallelRestart.hpp
-3
View File
@@ -35,7 +35,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/DenT.hpp>
#include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
#include <dune/common/parallel/mpihelper.hh>
@@ -475,8 +474,6 @@ ADD_PACK_PROTOTYPES(DeckKeyword)
ADD_PACK_PROTOTYPES(DeckRecord)
ADD_PACK_PROTOTYPES(DENSITYRecord)
ADD_PACK_PROTOTYPES(DensityTable)
ADD_PACK_PROTOTYPES(DenT)
ADD_PACK_PROTOTYPES(DenT::entry)
ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(Eqldims)
ADD_PACK_PROTOTYPES(Events)
tests/test_ParallelRestart.cpp
+1 -1
View File
@@ -2329,7 +2329,7 @@ BOOST_AUTO_TEST_CASE(DenT)
{
#ifdef HAVE_MPI
Opm::DenT val1 = getDenT();
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(DenT)
#endif
}