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

Remove extra MPI initialization.

Browse Source 
Initialization is now done in the Main::initMPI() method.
For configurations with dune-fem, this also caused crashes
with dune-fem versions prior to 2.8.
This commit is contained in:
Atgeirr Flø Rasmussen 2021-11-02 20:35:20 +01:00
parent 4a74fd1282
commit c8828ad43b
14 changed files with 0 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flow/flow_ebos_blackoil.cpp
View File

@ -22,12 +22,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
@ -58,12 +52,6 @@ flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFile
// with incorrect locale settings.
resetLocale();
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv);
#endif
return std::make_unique<FlowMainEbos<Properties::TTag::EclFlowProblem>>(
argc, argv, outputCout, outputFiles);
}

13
flow/flow_ebos_brine.cpp
View File

@ -23,12 +23,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -66,13 +60,6 @@ int flowEbosBrineMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
// initialize MPI, finalize is done automatically on exit
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv).rank();
#endif
FlowMainEbos<Properties::TTag::EclFlowBrineProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

13
flow/flow_ebos_energy.cpp
View File

@ -23,12 +23,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -65,13 +59,6 @@ int flowEbosEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
// initialize MPI, finalize is done automatically on exit
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv).rank();
#endif
FlowMainEbos<Properties::TTag::EclFlowEnergyProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

13
flow/flow_ebos_extbo.cpp
View File

@ -23,12 +23,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -65,13 +59,6 @@ int flowEbosExtboMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
// initialize MPI, finalize is done automatically on exit
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv).rank();
#endif
FlowMainEbos<Properties::TTag::EclFlowExtboProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

13
flow/flow_ebos_foam.cpp
View File

@ -23,12 +23,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -66,13 +60,6 @@ int flowEbosFoamMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
// initialize MPI, finalize is done automatically on exit
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv).rank();
#endif
FlowMainEbos<Properties::TTag::EclFlowFoamProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

12
flow/flow_ebos_gasoil.cpp
View File

@ -25,12 +25,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -87,12 +81,6 @@ int flowEbosGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv);
#endif
FlowMainEbos<Properties::TTag::EclFlowGasOilProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();

12
flow/flow_ebos_gaswater.cpp
View File

@ -28,12 +28,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -90,12 +84,6 @@ int flowEbosGasWaterMain(int argc, char** argv, bool outputCout, bool outputFile
// with incorrect locale settings.
resetLocale();
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv);
#endif
FlowMainEbos<Properties::TTag::EclFlowGasWaterProblem>
mainfunc {argc, argv, outputCout, outputFiles} ;
return mainfunc.execute();

12
flow/flow_ebos_micp.cpp
View File

@ -25,12 +25,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -89,12 +83,6 @@ int flowEbosMICPMain(int argc, char** argv, bool outputCout, bool outputFiles)
// with incorrect locale settings.
resetLocale();
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv);
#endif
FlowMainEbos<Properties::TTag::EclFlowMICPProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

12
flow/flow_ebos_oilwater.cpp
View File

@ -25,12 +25,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -86,12 +80,6 @@ int flowEbosOilWaterMain(int argc, char** argv, bool outputCout, bool outputFile
// with incorrect locale settings.
resetLocale();
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv);
#endif
FlowMainEbos<Properties::TTag::EclFlowOilWaterProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

12
flow/flow_ebos_oilwater_brine.cpp
View File

@ -25,12 +25,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -89,12 +83,6 @@ int flowEbosOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outpu
// with incorrect locale settings.
resetLocale();
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv);
#endif
FlowMainEbos<Properties::TTag::EclFlowOilWaterBrineProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

12
flow/flow_ebos_oilwater_polymer.cpp
View File

@ -25,12 +25,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -89,12 +83,6 @@ int flowEbosOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool out
// with incorrect locale settings.
resetLocale();
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv);
#endif
FlowMainEbos<Properties::TTag::EclFlowOilWaterPolymerProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

12
flow/flow_ebos_oilwater_polymer_injectivity.cpp
View File

@ -25,12 +25,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -88,12 +82,6 @@ int flowEbosOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCou
// with incorrect locale settings.
resetLocale();
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv);
#endif
FlowMainEbos<Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

13
flow/flow_ebos_polymer.cpp
View File

@ -23,12 +23,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Opm {
namespace Properties {
namespace TTag {
@ -65,13 +59,6 @@ int flowEbosPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles
// with incorrect locale settings.
resetLocale();
// initialize MPI, finalize is done automatically on exit
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv).rank();
#endif
FlowMainEbos<Properties::TTag::EclFlowPolymerProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();

15
flow/flow_ebos_solvent.cpp
View File

@ -23,14 +23,6 @@
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/flow/Main.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/misc/mpimanager.hh>
#else
#include <dune/common/parallel/mpihelper.hh>
#endif
#include <filesystem>
namespace Opm {
namespace Properties {
namespace TTag {
@ -68,13 +60,6 @@ int flowEbosSolventMain(int argc, char** argv, bool outputCout, bool outputFiles
// with incorrect locale settings.
resetLocale();
// initialize MPI, finalize is done automatically on exit
#if HAVE_DUNE_FEM
Dune::Fem::MPIManager::initialize(argc, argv);
#else
Dune::MPIHelper::instance(argc, argv).rank();
#endif
FlowMainEbos<Properties::TTag::EclFlowSolventProblem>
mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute();