Small changes to VCluster to check if MPI_Finalize fail

src/VCluster.cpp

@@ -2,8 +2,5 @@
 
 Vcluster * global_v_cluster = NULL;
 
-// Global MPI initialization
-bool global_mpi_init = false;
-
 // number of vcluster instances
 size_t n_vcluster = 0;

src/VCluster.hpp

@@ -151,9 +151,15 @@ public:
 		{
 			std::cout << "Finalize\n";
 
-			if (MPI_Finalize() != 0)
+			int already_finalised;
+
+			MPI_Finalized(&already_finalised);
+			if (!already_finalised)
 			{
-				std::cerr << "DAMN!!!!!!!! \n";
+				if (MPI_Finalize() != 0)
+				{
+					std::cerr << __FILE__ << ":" << __LINE__  << " MPI_Finalize FAILED \n";
+				}
 			}
 		}
 	}
@@ -168,12 +174,14 @@ public:
 
 		n_vcluster++;
 
+		int already_initialised;
+		MPI_Initialized(&already_initialised);
+
 		// Check if MPI is already initialized
-		if (global_mpi_init == false)
+		if (!already_initialised)
 		{
 
 			MPI_Init(argc,argv);
-			global_mpi_init = true;
 		}
 
 		//! Get the total number of process