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 #670 from ElyesAhmed/communicators2

Browse Source 
Communicators2
This commit is contained in:
Atgeirr Flø Rasmussen 2021-09-21 14:11:45 +02:00 committed by GitHub
commit dda940686c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/models/utils/simulator.hh
View File

@ -95,17 +95,29 @@ class Simulator
using Model = GetPropType<TypeTag, Properties::Model>; using Model = GetPropType<TypeTag, Properties::Model>;
using Problem = GetPropType<TypeTag, Properties::Problem>; using Problem = GetPropType<TypeTag, Properties::Problem>;
using MPIComm = typename Dune::MPIHelper::MPICommunicator;
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 7)
using Communication = Dune::Communication<MPIComm>;
#else
using Communication = Dune::CollectiveCommunication<MPIComm>;
#endif
public: public:
// do not allow to copy simulators around // do not allow to copy simulators around
Simulator(const Simulator& ) = delete; Simulator(const Simulator& ) = delete;
Simulator(bool verbose = true) Simulator(bool verbose = true)
:Simulator(Communication(), verbose)
{
}
Simulator(Communication comm, bool verbose = true)
{ {
TimerGuard setupTimerGuard(setupTimer_); TimerGuard setupTimerGuard(setupTimer_);
setupTimer_.start(); setupTimer_.start();
const auto& comm = Dune::MPIHelper::getCollectiveCommunication();
verbose_ = verbose && comm.rank() == 0; verbose_ = verbose && comm.rank() == 0;
timeStepIdx_ = 0; timeStepIdx_ = 0;