Merge branch 'mpifinalize' into 'master'

Only call MPI_Finalize if we actually called MPI_Init

See merge request walberla/walberla!166

src/core/mpi/MPIManager.cpp

@@ -103,6 +103,7 @@ void MPIManager::initializeMPI( int* argc, char*** argv, bool abortOnException )
       MPI_Initialized( &mpiAlreadyInitialized );
       if ( ! mpiAlreadyInitialized ) {
          MPI_Init( argc, argv );
+         finalizeOnDestruction_ = true;
       }
 
       isMPIInitialized_ = true;
@@ -122,7 +123,10 @@ void MPIManager::finalizeMPI()
       if( isMPIInitialized_ && !currentlyAborting_ )
       {
          isMPIInitialized_ = false;
-         MPI_Finalize();
+         if (finalizeOnDestruction_)
+         {
+            MPI_Finalize();
+         }
       }
    }
 }

src/core/mpi/MPIManager.h

@@ -156,9 +156,12 @@ private:
 
    bool currentlyAborting_;
 
+   bool finalizeOnDestruction_;
+
    // Singleton
    MPIManager() : worldRank_(0), rank_(-1), numProcesses_(1), comm_(MPI_COMM_NULL),
-                  isMPIInitialized_(false), cartesianSetup_(false), currentlyAborting_(false)
+                  isMPIInitialized_(false), cartesianSetup_(false), currentlyAborting_(false),
+                  finalizeOnDestruction_(false)
    { WALBERLA_NON_MPI_SECTION() { rank_ = 0; } }
 
 }; // class MPIManager