From 816d0754ac18645f97e5cbacd296faf8929a0495 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 26 Apr 2011 19:57:00 +0000
Subject: [PATCH] only call MPI_Init if MPI is not already initialized (trying
to fix mpi4py)
---
Common/GmshMessage.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index a77411e8b8..8a6ef0cbf9 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -66,7 +66,9 @@ static int vsnprintf(char *str, size_t size, const char *fmt, va_list ap)
void Msg::Init(int argc, char **argv)
{
#if defined(HAVE_MPI)
- MPI_Init(&argc, &argv);
+ int flag;
+ MPI_Initialized(&flag);
+ if(!flag) MPI_Init(&argc, &argv);
MPI_Comm_rank(MPI_COMM_WORLD, &_commRank);
MPI_Comm_size(MPI_COMM_WORLD, &_commSize);
MPI_Errhandler_set(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
--
GitLab