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

add collective communication to generic vanguard

Browse Source
This commit is contained in:
Arne Morten Kvarving 2021-05-12 10:24:53 +02:00
parent ac4ee51a5f
commit d99f642dff
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ebos/eclgenericvanguard.cc
View File

@ -61,6 +61,7 @@ std::unique_ptr<EclipseState> EclGenericVanguard::externalEclState_;
std::unique_ptr<Schedule> EclGenericVanguard::externalEclSchedule_; std::unique_ptr<Schedule> EclGenericVanguard::externalEclSchedule_;
std::unique_ptr<SummaryConfig> EclGenericVanguard::externalEclSummaryConfig_; std::unique_ptr<SummaryConfig> EclGenericVanguard::externalEclSummaryConfig_;
std::unique_ptr<UDQState> EclGenericVanguard::externalUDQState_; std::unique_ptr<UDQState> EclGenericVanguard::externalUDQState_;
std::unique_ptr<EclGenericVanguard::CommunicationType> EclGenericVanguard::comm_;
EclGenericVanguard::EclGenericVanguard() EclGenericVanguard::EclGenericVanguard()
: python(std::make_shared<Python>()) : python(std::make_shared<Python>())

23
ebos/eclgenericvanguard.hh
View File

@ -29,6 +29,10 @@
#include <opm/grid/common/GridEnums.hpp> #include <opm/grid/common/GridEnums.hpp>
#include <dune/common/version.hh>
#include <dune/common/parallel/collectivecommunication.hh>
#include <dune/common/parallel/mpihelper.hh>
#include <array> #include <array>
#include <memory> #include <memory>
#include <optional> #include <optional>
@ -57,6 +61,12 @@ class EclGenericVanguard {
public: public:
using ParallelWellStruct = std::vector<std::pair<std::string,bool>>; using ParallelWellStruct = std::vector<std::pair<std::string,bool>>;
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 7)
using CommunicationType = Dune::Communication<Dune::MPIHelper::MPICommunicator>;
#else
using CommunicationType = Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator>;
#endif
/*! /*!
* \brief Constructor. * \brief Constructor.
* \details Needs to be in compile unit. * \details Needs to be in compile unit.
@ -260,6 +270,17 @@ public:
const ParallelWellStruct& parallelWells() const const ParallelWellStruct& parallelWells() const
{ return parallelWells_; } { return parallelWells_; }
//! \brief Set global communication.
static void setCommunication(std::unique_ptr<CommunicationType> comm)
{ comm_ = std::move(comm); }
//! \brief Obtain global communicator.
static CommunicationType& comm()
{
assert(comm_);
return *comm_;
}
protected: protected:
void updateOutputDir_(std::string outputDir, void updateOutputDir_(std::string outputDir,
bool enableEclCompatFile); bool enableEclCompatFile);
@ -279,7 +300,7 @@ protected:
static std::unique_ptr<Schedule> externalEclSchedule_; static std::unique_ptr<Schedule> externalEclSchedule_;
static std::unique_ptr<SummaryConfig> externalEclSummaryConfig_; static std::unique_ptr<SummaryConfig> externalEclSummaryConfig_;
static std::unique_ptr<UDQState> externalUDQState_; static std::unique_ptr<UDQState> externalUDQState_;
static std::unique_ptr<CommunicationType> comm_;
std::string caseName_; std::string caseName_;
std::string fileName_; std::string fileName_;

24
opm/simulators/flow/Main.hpp
View File

@ -98,11 +98,6 @@ namespace Opm {
// with incorrect locale settings. // with incorrect locale settings.
resetLocale(); resetLocale();
# if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
# else
Dune::MPIHelper::instance(argc, argv);
# endif
FlowMainEbos<TypeTag> mainfunc(argc, argv, outputCout, outputFiles); FlowMainEbos<TypeTag> mainfunc(argc, argv, outputCout, outputFiles);
return mainfunc.execute(); return mainfunc.execute();
} }
@ -152,6 +147,14 @@ namespace Opm
{ {
} }
~Main()
{
#if HAVE_MPI && !HAVE_DUNE_FEM
EclGenericVanguard::setCommunication(nullptr);
MPI_Finalize();
#endif
}
int runDynamic() int runDynamic()
{ {
int exitCode = EXIT_SUCCESS; int exitCode = EXIT_SUCCESS;
@ -361,12 +364,11 @@ namespace Opm
Dune::Fem::MPIManager::initialize(argc_, argv_); Dune::Fem::MPIManager::initialize(argc_, argv_);
int mpiRank = Dune::Fem::MPIManager::rank(); int mpiRank = Dune::Fem::MPIManager::rank();
#else #else
// the design of the plain dune MPIHelper class is quite flawed: there is no way to #if HAVE_MPI
// get the instance without having the argc and argv parameters available and it is MPI_Init(&argc_, &argv_);
// not possible to determine the MPI rank and size without an instance. (IOW: the #endif
// rank() and size() methods are supposed to be static.) EclGenericVanguard::setCommunication(std::make_unique<EclGenericVanguard::CommunicationType>());
const auto& mpiHelper = Dune::MPIHelper::instance(argc_, argv_); int mpiRank = EclGenericVanguard::comm().rank();
int mpiRank = mpiHelper.rank();
#endif #endif
// we always want to use the default locale, and thus spare us the trouble // we always want to use the default locale, and thus spare us the trouble