OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-02 05:49:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4081 from akva2/eclwriter_serializer

Browse Source 
changed: use EclMpiSerializer in eclwriter
This commit is contained in:
Bård Skaflestad 2022-09-07 09:44:52 +02:00 committed by GitHub
commit c24796e7f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ebos/eclgenericwriter.cc
View File

@ -48,6 +48,10 @@
#include <dune/grid/common/mcmgmapper.hh> #include <dune/grid/common/mcmgmapper.hh>
#if HAVE_MPI
#include <ebos/eclmpiserializer.hh>
#endif
#if HAVE_DUNE_FEM #if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh> #include <dune/fem/gridpart/adaptiveleafgridpart.hh>
#include <dune/fem/gridpart/common/gridpart2gridview.hh> #include <dune/fem/gridpart/common/gridpart2gridview.hh>
@ -506,7 +510,6 @@ evalSummary(const int reportStepNum,
SummaryState& summaryState, SummaryState& summaryState,
UDQState& udqState) UDQState& udqState)
{ {
std::vector<char> buffer;
if (collectToIORank_.isIORank()) { if (collectToIORank_.isIORank()) {
const auto& summary = eclIO_->summary(); const auto& summary = eclIO_->summary();
auto wbp_calculators = summary.wbp_calculators(reportStepNum); auto wbp_calculators = summary.wbp_calculators(reportStepNum);
@ -547,24 +550,14 @@ evalSummary(const int reportStepNum,
auto udq_step = reportStepNum - 1; auto udq_step = reportStepNum - 1;
const auto& udq_config = schedule_.getUDQConfig(udq_step); const auto& udq_config = schedule_.getUDQConfig(udq_step);
udq_config.eval( udq_step, schedule_.wellMatcher(udq_step), summaryState, udqState); udq_config.eval( udq_step, schedule_.wellMatcher(udq_step), summaryState, udqState);
buffer = summaryState.serialize();
} }
#if HAVE_MPI
if (collectToIORank_.isParallel()) { if (collectToIORank_.isParallel()) {
#ifdef HAVE_MPI EclMpiSerializer ser(grid_.comm());
unsigned long buffer_size = buffer.size(); ser.append(summaryState);
grid_.comm().broadcast(&buffer_size, 1, collectToIORank_.ioRank);
if (!collectToIORank_.isIORank())
buffer.resize( buffer_size );
grid_.comm().broadcast(buffer.data(), buffer_size, collectToIORank_.ioRank);
if (!collectToIORank_.isIORank()) {
SummaryState& st = summaryState;
st.deserialize(buffer);
} }
#endif #endif
} }
}
template<class Grid, class EquilGrid, class GridView, class ElementMapper, class Scalar> template<class Grid, class EquilGrid, class GridView, class ElementMapper, class Scalar>
const typename EclGenericWriter<Grid,EquilGrid,GridView,ElementMapper,Scalar>::TransmissibilityType& const typename EclGenericWriter<Grid,EquilGrid,GridView,ElementMapper,Scalar>::TransmissibilityType&

19
ebos/eclmpiserializer.hh
View File

@ -386,6 +386,25 @@ public:
} }
} }
//! \brief Serialize and broadcast on root process, de-serialize and append on
//! others.
//!
//! \tparam T Type of class to broadcast
//! \param data Class to broadcast
template<class T>
void append(T& data)
{
if (m_comm.size() == 1)
return;
T tmp;
T& bcast = m_comm.rank() == 0 ? data : tmp;
broadcast(bcast);
if (m_comm.rank() != 0)
data.append(tmp);
}
//! \brief Returns current position in buffer. //! \brief Returns current position in buffer.
size_t position() const size_t position() const
{ {