mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-09-05 04:40:19 -05:00
Replacing calling Communication with a header
This commit is contained in:
committed by
Atgeirr Flø Rasmussen
parent
0202b00d59
commit
65f0e4e7f0
@@ -29,9 +29,8 @@
|
|||||||
|
|
||||||
#include <opm/grid/common/GridEnums.hpp>
|
#include <opm/grid/common/GridEnums.hpp>
|
||||||
|
|
||||||
#include <dune/common/version.hh>
|
#include <opm/simulators/utils/ParallelCommunication.hpp>
|
||||||
#include <dune/common/parallel/collectivecommunication.hh>
|
#include <dune/common/parallel/collectivecommunication.hh>
|
||||||
#include <dune/common/parallel/mpihelper.hh>
|
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
@@ -44,13 +43,6 @@
|
|||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace Opm::Parallel {
|
|
||||||
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 7)
|
|
||||||
using Communication = Dune::Communication<Dune::MPIHelper::MPICommunicator>;
|
|
||||||
#else
|
|
||||||
using Communication = Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator>;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace Opm {
|
namespace Opm {
|
||||||
|
|
||||||
@@ -68,7 +60,7 @@ class UDQState;
|
|||||||
|
|
||||||
class EclGenericVanguard {
|
class EclGenericVanguard {
|
||||||
public:
|
public:
|
||||||
using ParallelWellStruct = std::vector<std::pair<std::string,bool>>;
|
using ParallelWellStruct = std::vector<std::pair<std::string,bool>>;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Constructor.
|
* \brief Constructor.
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ namespace Opm
|
|||||||
initMPI();
|
initMPI();
|
||||||
}
|
}
|
||||||
|
|
||||||
#define DEMONSTRATE_RUN_WITH_NONWORLD_COMM 1
|
#define DEMONSTRATE_RUN_WITH_NONWORLD_COMM 0
|
||||||
|
|
||||||
~Main()
|
~Main()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user