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

Pass wbp index list to output module

Browse Source
This commit is contained in:
Joakim Hove
2020-12-01 07:52:58 +01:00
parent 1bb7b0d30f
commit 1d86e2dc97
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/ecloutputblackoilmodule.hh
View File

@@ -195,7 +195,7 @@ class EclOutputBlackOilModule
public:
template<class CollectDataToIORankType>
EclOutputBlackOilModule(const Simulator& simulator, const CollectDataToIORankType& collectToIORank)
EclOutputBlackOilModule(const Simulator& simulator, const std::vector<std::size_t>& wbp_index_list, const CollectDataToIORankType& collectToIORank)
: simulator_(simulator)
{
const Opm::SummaryConfig summaryConfig = simulator_.vanguard().summaryConfig();

21
ebos/eclwriter.hh
View File

@@ -192,14 +192,27 @@ public:
: simulator_(simulator)
, collectToIORank_(simulator_.vanguard())
{
this->eclOutputModule_ = std::make_unique<EclOutputBlackOilModule<TypeTag>>(simulator, this->collectToIORank_);
std::vector<std::size_t> wbp_index_list;
if (collectToIORank_.isIORank()) {
const auto& schedule = simulator_.vanguard().schedule();
eclIO_.reset(new Opm::EclipseIO(simulator_.vanguard().eclState(),
Opm::UgGridHelpers::createEclipseGrid(globalGrid(), simulator_.vanguard().eclState().getInputGrid()),
simulator_.vanguard().schedule(),
schedule,
simulator_.vanguard().summaryConfig()));
}
const auto& wbp_calculators = eclIO_->summary().wbp_calculators( schedule.size() - 1 );
wbp_index_list = wbp_calculators.index_list();
}
if (collectToIORank_.isParallel()) {
#ifdef HAVE_MPI
unsigned long size = wbp_index_list.size();
MPI_Bcast(&size, 1, MPI_UNSIGNED_LONG, collectToIORank_.ioRank, MPI_COMM_WORLD);
if (!collectToIORank_.isIORank())
wbp_index_list.resize( size );
MPI_Bcast(wbp_index_list.data(), size * sizeof(std::size_t), MPI_CHAR, collectToIORank_.ioRank, MPI_COMM_WORLD);
#endif
}
// create output thread if enabled and rank is I/O rank
// async output is enabled by default if pthread are enabled
bool enableAsyncOutput = EWOMS_GET_PARAM(TypeTag, bool, EnableAsyncEclOutput);
@@ -207,6 +220,8 @@ public:
if (enableAsyncOutput && collectToIORank_.isIORank())
numWorkerThreads = 1;
taskletRunner_.reset(new TaskletRunner(numWorkerThreads));
this->eclOutputModule_ = std::make_unique<EclOutputBlackOilModule<TypeTag>>(simulator, wbp_index_list, this->collectToIORank_);
}
~EclWriter()