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

Merge pull request #2460 from akva2/serialize_summarynode

Browse Source 
Remove old serialization for SummaryNode
This commit is contained in:
Arne Morten Kvarving
2020-03-13 15:33:01 +01:00
committed by GitHub
parent 556983192e d8028dfa1b
commit c0938e74f4
4 changed files with 26 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ebos/eclmpiserializer.hh
View File

@@ -48,6 +48,31 @@ public:
Mpi::unpack(const_cast<T&>(data), m_buffer, m_position, m_comm);
}
template<class T>
void vector(std::vector<T>& data)
{
static_assert(!std::is_pod<T>::value, "Do not call this for POD vectors");
auto handle = [&](auto& d)
{
for (auto& it : d) {
it.serializeOp(*this);
}
};
if (m_op == Operation::PACKSIZE) {
m_packSize += Mpi::packSize(data.size(), m_comm);
handle(data);
} else if (m_op == Operation::PACK) {
Mpi::pack(data.size(), m_buffer, m_position, m_comm);
handle(data);
} else if (m_op == Operation::UNPACK) {
size_t size;
Mpi::unpack(size, m_buffer, m_position, m_comm);
data.resize(size);
handle(data);
}
}
template<class T>
void pack(T& data)
{

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

@@ -73,7 +73,6 @@
#include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Eqldims.hpp>
@@ -1580,18 +1579,6 @@ std::size_t packSize(const PvtwsaltTable& data,
packSize(data.getTableValues(), comm);
}
std::size_t packSize(const SummaryNode& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.keyword(), comm) +
packSize(data.category(), comm) +
packSize(data.location(), comm) +
packSize(data.type(), comm) +
packSize(data.namedEntity(), comm) +
packSize(data.number(), comm) +
packSize(data.isUserDefined(), comm);
}
std::size_t packSize(const EquilRecord& data,
Dune::MPIHelper::MPICommunicator comm)
{
@@ -3219,19 +3206,6 @@ void pack(const PvtwsaltTable& data,
pack(data.getTableValues(), buffer, position, comm);
}
void pack(const SummaryNode& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.keyword(), buffer, position, comm);
pack(data.category(), buffer, position, comm);
pack(data.location(), buffer, position, comm) ;
pack(data.type(), buffer, position, comm);
pack(data.namedEntity(), buffer, position, comm);
pack(data.number(), buffer, position, comm);
pack(data.isUserDefined(), buffer, position, comm);
}
void pack(const EquilRecord& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@@ -5519,32 +5493,6 @@ void unpack(PvtwsaltTable& data, std::vector<char>& buffer, int& position,
data = PvtwsaltTable(refPressValue, refSaltConValue, tableValues);
}
void unpack(SummaryNode& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::string keyword;
SummaryNode::Category category;
Location location;
SummaryNode::Type type;
std::string namedEntity;
int number;
bool isUserDefined;
unpack(keyword, buffer, position, comm);
unpack(category, buffer, position, comm);
unpack(location, buffer, position, comm) ;
unpack(type, buffer, position, comm);
unpack(namedEntity, buffer, position, comm);
unpack(number, buffer, position, comm);
unpack(isUserDefined, buffer, position, comm);
data = SummaryNode{keyword, category, location}
.parameterType(type)
.namedEntity(namedEntity)
.number(number)
.isUserDefined(isUserDefined);
}
void unpack(EquilRecord& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@@ -5897,7 +5845,6 @@ INSTANTIATE_PACK_VECTOR(bool)
INSTANTIATE_PACK_VECTOR(char)
INSTANTIATE_PACK_VECTOR(int)
INSTANTIATE_PACK_VECTOR(std::array<double, 3>)
INSTANTIATE_PACK_VECTOR(SummaryNode)
#undef INSTANTIATE_PACK_VECTOR
@@ -5945,7 +5892,6 @@ INSTANTIATE_PACK(int)
INSTANTIATE_PACK(std::array<short,3>)
INSTANTIATE_PACK(std::array<bool,3>)
INSTANTIATE_PACK(unsigned char)
INSTANTIATE_PACK(SummaryNode)
#undef INSTANTIATE_PACK
} // end namespace Mpi

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

@@ -141,7 +141,6 @@ class SpiralICD;
class StandardCond;
class Stone1exRecord;
class Stone1exTable;
class SummaryNode;
class Tabdims;
class TableColumn;
class TableContainer;
@@ -612,7 +611,6 @@ ADD_PACK_PROTOTYPES(SpiralICD)
ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(Stone1exRecord)
ADD_PACK_PROTOTYPES(Stone1exTable)
ADD_PACK_PROTOTYPES(SummaryNode)
ADD_PACK_PROTOTYPES(Tabdims)
ADD_PACK_PROTOTYPES(TableColumn)
ADD_PACK_PROTOTYPES(TableContainer)

2
tests/test_ParallelRestart.cpp
View File

@@ -2185,7 +2185,7 @@ BOOST_AUTO_TEST_CASE(SummaryNode)
.number(2)
.isUserDefined(true);
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(SummaryNode)
#endif
}