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

Move Hypre initialization and finalization out to Main

Browse Source
This commit is contained in:
jakobtorben 2024-11-26 14:55:27 +01:00
parent 56897e6d11
commit 6fa9c25ba5
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/simulators/flow/Main.cpp
View File

@ -35,6 +35,10 @@
#include <opm/simulators/utils/DamarisOutputModule.hpp> #include <opm/simulators/utils/DamarisOutputModule.hpp>
#endif #endif
#if HAVE_HYPRE
#include <HYPRE_utilities.h>
#endif
namespace Opm { namespace Opm {
Main::Main(int argc, char** argv, bool ownMPI) Main::Main(int argc, char** argv, bool ownMPI)
@ -88,6 +92,10 @@ Main::~Main()
} }
#endif // HAVE_MPI #endif // HAVE_MPI
#if HAVE_HYPRE
HYPRE_Finalize();
#endif
if (ownMPI_) { if (ownMPI_) {
FlowGenericVanguard::setCommunication(nullptr); FlowGenericVanguard::setCommunication(nullptr);
} }
@ -163,6 +171,10 @@ void Main::initMPI()
#endif #endif
#endif // HAVE_MPI #endif // HAVE_MPI
#if HAVE_HYPRE
HYPRE_Initialize();
#endif
} }
void Main::handleVersionCmdLine_(int argc, char** argv, void Main::handleVersionCmdLine_(int argc, char** argv,

3
opm/simulators/linalg/HyprePreconditioner.hpp
View File

@ -55,8 +55,6 @@ public:
use_gpu_ = prm_.get<bool>("use_gpu", false); use_gpu_ = prm_.get<bool>("use_gpu", false);
HYPRE_Initialize();
// Set memory location and execution policy // Set memory location and execution policy
if (use_gpu_) { if (use_gpu_) {
HYPRE_SetMemoryLocation(HYPRE_MEMORY_DEVICE); HYPRE_SetMemoryLocation(HYPRE_MEMORY_DEVICE);
@ -155,7 +153,6 @@ public:
if (indices_device_) { if (indices_device_) {
hypre_TFree(indices_device_, HYPRE_MEMORY_DEVICE); hypre_TFree(indices_device_, HYPRE_MEMORY_DEVICE);
} }
HYPRE_Finalize();
} }
void update() override { void update() override {