Fixing compile errors without MPI

analysis/runAnalysis.cpp

@@ -676,9 +676,8 @@ void runAnalysis::createThreads( const std::string& method, int N_threads )
     if ( method == "none" )
         return;
     // Check if we have thread support
-    int thread_support;
-    MPI_Query_thread( &thread_support );
-    if ( thread_support < MPI_THREAD_MULTIPLE && N_threads > 0 )
+    auto thread_support = Utilities::MPI::queryThreadSupport();
+    if ( thread_support != Utilities::MPI::ThreadSupport::MULTIPLE && N_threads > 0 )
         std::cerr << "Warning: Failed to start MPI with necessary thread support, errors may occur\n";
     // Create the threads
     const auto cores = d_tpool.getProcessAffinity();

tests/BlobAnalyzeParallel.cpp

@@ -100,7 +100,7 @@ inline void  WriteBlobStates(TwoPhase TCAT, double D, double porosity){
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -482,7 +482,7 @@ int main(int argc, char **argv)
     PROFILE_STOP("main");
     PROFILE_SAVE("BlobIdentifyParallel",false);
     comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return 0;  
 }
 

tests/BlobIdentify.cpp

@@ -150,7 +150,7 @@ void readRankData( int proc, int nx, int ny, int nz, DoubleArray& Phase, DoubleA
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 
     printf("-----------------------------------------------------------\n");
     printf("Labeling Blobs from Two-Phase Lattice Boltzmann Simulation \n");
@@ -318,7 +318,7 @@ int main(int argc, char **argv)
     FILE *BLOBS = fopen("Blobs.dat","wb");
     fwrite(GlobalBlobID.data(),4,Nx*Ny*Nz,BLOBS);
     fclose(BLOBS);
-	MPI_Finalize();
+	Utilities::shutdown();
     return 0;
 }
 

tests/BlobIdentifyParallel.cpp

@@ -47,7 +47,7 @@ void readRankData( int proc, int nx, int ny, int nz, DoubleArray& Phase, DoubleA
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
     PROFILE_SAVE("BlobIdentifyParallel",false);
 #endif
     comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
     return 0;  
 }
 

tests/ColorToBinary.cpp

@@ -114,7 +114,7 @@ inline void ReadFromRank(char *FILENAME, DoubleArray &Phase, int nx, int ny, int
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -276,7 +276,7 @@ int main(int argc, char **argv)
 	
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }
 

tests/ComponentLabel.cpp

@@ -119,7 +119,7 @@ inline void ReadFromRank(char *FILENAME, DoubleArray &Phase, DoubleArray &Pressu
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -433,7 +433,7 @@ int main(int argc, char **argv)
 	*/
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }
 

tests/GenerateSphereTest.cpp

@@ -296,7 +296,7 @@ inline void MorphOpen(DoubleArray SignDist, char *id, Domain &Dm, int nx, int ny
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -474,8 +474,5 @@ int main(int argc, char **argv)
 		fclose(IDFILE);
 		//......................................................................
 	}
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 }

tests/TestBlobAnalyze.cpp

@@ -127,7 +127,7 @@ inline void  WriteBlobStates(TwoPhase TCAT, double D, double porosity){
 int main(int argc, char **argv)
 {
   // Initialize MPI
-  MPI_Init(&argc,&argv);
+  Utilities::startup( argc, argv );
   Utilities::MPI comm( MPI_COMM_WORLD );
   int rank = comm.getRank();
   int nprocs = comm.getSize();
@@ -317,7 +317,7 @@ int main(int argc, char **argv)
 
   } // Limit scope so variables that contain communicators will free before MPI_Finialize
   comm.barrier();
-  MPI_Finalize();
+  Utilities::shutdown();
   return 0;  
 }
 

tests/TestBlobIdentify.cpp

@@ -152,7 +152,7 @@ void shift_data( DoubleArray& data, int sx, int sy, int sz, const RankInfoStruct
 int main(int argc, char **argv)
 {
     // Initialize MPI
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -410,7 +410,7 @@ int main(int argc, char **argv)
     PROFILE_STOP("main");
     PROFILE_SAVE("TestBlobIdentify",false);
     comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return N_errors;  
 }
 

tests/TestBlobIdentifyCorners.cpp

@@ -18,7 +18,7 @@
 int main(int argc, char **argv)
 {
     // Initialize MPI
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
     /*if ( nprocs != 8 ) {

tests/TestBubble.cpp

@@ -991,6 +991,6 @@ int main(int argc, char **argv)
     // ****************************************************
     comm.barrier();
   } // Limit scope so variables that contain communicators will free before MPI_Finialize
-  MPI_Finalize();
+  Utilities::shutdown();
   return 0;
 }

tests/TestBubbleDFH.cpp

@@ -27,8 +27,7 @@ using namespace std;
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	int provided_thread_support = -1;
-	MPI_Init_thread(&argc,&argv,MPI_THREAD_MULTIPLE,&provided_thread_support);
+    Utilities::startup( argc, argv, true );
 	Utilities::MPI comm( MPI_COMM_WORLD );
 	int rank = comm.getRank();
 	int nprocs = comm.getSize();
@@ -548,7 +547,7 @@ int main(int argc, char **argv)
 		// ****************************************************
 		comm.barrier();
 	} // Limit scope so variables that contain communicators will free before MPI_Finialize
-	MPI_Finalize();
+    Utilities::shutdown();
 	return check;
 }
 

tests/TestColorBubble.cpp

@@ -65,7 +65,7 @@ inline void InitializeBubble(ScaLBL_ColorModel &ColorModel, double BubbleRadius)
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -92,10 +92,7 @@ int main(int argc, char **argv)
 		ColorModel.Run();	       
 		ColorModel.WriteDebug();
 	}
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 
 	return check;
 }

tests/TestColorGrad.cpp

@@ -16,7 +16,7 @@ using namespace std;
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -257,7 +257,7 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 
 	return check;

tests/TestColorGradDFH.cpp

@@ -26,7 +26,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -206,10 +206,7 @@ int main(int argc, char **argv)
     	}
 
 	}
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 
 	return check;
 }

tests/TestColorMassBounceback.cpp

@@ -16,7 +16,7 @@ using namespace std;
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -520,7 +520,7 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 	return check;
 }

tests/TestColorSquareTube.cpp

@@ -85,12 +85,12 @@ void InitializeSquareTube(ScaLBL_ColorModel &ColorModel){
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
-	Utilities::MPI comm( MPI_COMM_WORLD );
-    int rank = comm.getRank();
-    int nprocs = comm.getSize();
+    Utilities::startup( argc, argv );
 	int check=0;
 	{
+	    Utilities::MPI comm( MPI_COMM_WORLD );
+        int rank = comm.getRank();
+        int nprocs = comm.getSize();
 		if (rank == 0){
 			printf("********************************************************\n");
 			printf("Running Color Model: TestColor	\n");
@@ -108,11 +108,7 @@ int main(int argc, char **argv)
 		ColorModel.WriteDebug(); 
  
 	}
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
-
+    Utilities::shutdown();
 	return check;
 }
 

tests/TestCommD3Q19.cpp

@@ -164,7 +164,7 @@ inline void UnpackID(int *list, int count, char *recvbuf, char *ID){
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -427,7 +427,7 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 
 	return check;

tests/TestDatabase.cpp

@@ -17,7 +17,7 @@
 // Main
 int main(int argc, char **argv)
 {
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     Utilities::setAbortBehavior(true,2);
     Utilities::setErrorHandlers();
@@ -66,8 +66,7 @@ int main(int argc, char **argv)
 
     // Finished
     PROFILE_SAVE("TestDatabase",true);
-    comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return err;
 }
 

tests/TestFluxBC.cpp

@@ -17,7 +17,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 
 int main (int argc, char **argv)
 {
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
 	int rank = comm.getRank();
 	int nprocs = comm.getSize();
@@ -265,7 +265,6 @@ int main (int argc, char **argv)
 
 	}
 	// Finished
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
     return error; 
 }

tests/TestForceD3Q19.cpp

@@ -442,7 +442,7 @@ inline void MRT_Transform(double *dist, int Np, double Fx, double Fy, double Fz)
 
 int main (int argc, char **argv)
 {
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
 	int rank = comm.getRank();
 	int nprocs = comm.getSize();
@@ -541,5 +541,5 @@ int main (int argc, char **argv)
     printf("Fz = %f; Computed vz=%f \n",Fz,vel[2*Np+0]);
     
     comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
 }

tests/TestForceMoments.cpp

@@ -47,7 +47,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -326,10 +326,7 @@ int main(int argc, char **argv)
 
 
 	}
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 
 	return check;
 }

tests/TestInterfaceSpeed.cpp

@@ -18,7 +18,7 @@
 int main (int argc, char *argv[])
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
 
@@ -146,9 +146,7 @@ int main (int argc, char *argv[])
 
 	return toReturn;
 
-	// ****************************************************
 	comm.barrier();
 	return 0;
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 }

tests/TestMRT.cpp

@@ -489,7 +489,7 @@ inline void UnpackID(int *list, int count, char *recvbuf, char *ID){
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -802,7 +802,7 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 
 	return check;

tests/TestMap.cpp

@@ -27,7 +27,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
 	int check=0;
 	{
@@ -191,10 +191,7 @@ int main(int argc, char **argv)
 		delete [] TmpMap;
 
 	}
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 
 	return check;
 }

tests/TestMassConservationD3Q7.cpp

@@ -67,7 +67,7 @@ inline void InitializeBubble(ScaLBL_ColorModel &ColorModel, double BubbleRadius)
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -264,8 +264,5 @@ int main(int argc, char **argv)
 
 	}
 }
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 }

tests/TestMicroCTReader.cpp

@@ -50,7 +50,7 @@ void testReadMicroCT( const std::string& filename, UnitTest& ut )
 int main(int argc, char **argv)
 {
     // Initialize MPI
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     UnitTest ut;
 
     // Run the tests
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
     int N_errors = ut.NumFailGlobal();
 
     // Close MPI
-    MPI_Finalize();
+    Utilities::shutdown();
     return N_errors;
 }
 

tests/TestMomentsD3Q19.cpp

@@ -462,7 +462,7 @@ inline void MRT_Transform(double *dist, int Np) {
 
 int main (int argc, char **argv)
 {
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -539,7 +539,6 @@ int main (int argc, char **argv)
 
     error=count;
     // Finished
-    comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return error; 
 }

tests/TestNetcdf.cpp

@@ -95,7 +95,7 @@ void load( const std::string& filename )
 int main(int argc, char **argv)
 {
     // Initialize MPI
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     const int rank = comm.getRank();
     UnitTest ut;
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
 
     // Close MPI
     comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return N_errors;
 }
 

tests/TestPoiseuille.cpp

@@ -48,7 +48,7 @@ void ParallelPlates(ScaLBL_MRTModel &MRT){
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -125,10 +125,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 
 	return check;
 }

tests/TestPressVel.cpp

@@ -14,7 +14,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
 	int check=0;
@@ -188,10 +188,7 @@ int main(int argc, char **argv)
 	     }
 	   }
 	}
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 	return check;
 
 }

tests/TestSegDist.cpp

@@ -39,7 +39,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 int main(int argc, char **argv)
 {
     // Initialize MPI
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -141,8 +141,7 @@ int main(int argc, char **argv)
     IO::writeData( "testSegDist", data, MPI_COMM_WORLD );
 
     }
-    comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return 0;
 
 }

tests/TestSubphase.cpp

@@ -26,7 +26,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -136,8 +136,7 @@ int main(int argc, char **argv)
 		// Averages->Reduce();
 
 	} // Limit scope so variables that contain communicators will free before MPI_Finialize
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 	return 0;  
 }
 

tests/TestTopo3D.cpp

@@ -26,7 +26,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -225,8 +225,7 @@ int main(int argc, char **argv)
 		IO::writeData( timestep, visData, comm );
 
 	} // Limit scope so variables that contain communicators will free before MPI_Finialize
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 	return 0;  
 }
 

tests/TestTorus.cpp

@@ -26,7 +26,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 int main(int argc, char **argv)
 {
   // Initialize MPI
-  MPI_Init(&argc,&argv);
+  Utilities::startup( argc, argv );
   Utilities::MPI comm( MPI_COMM_WORLD );
   int rank = comm.getRank();
   int nprocs = comm.getSize();
@@ -164,8 +164,7 @@ int main(int argc, char **argv)
    // Averages->Reduce();
 
   } // Limit scope so variables that contain communicators will free before MPI_Finialize
-  comm.barrier();
-  MPI_Finalize();
+  Utilities::shutdown();
   return 0;  
 }
 

tests/TestTorusEvolve.cpp

@@ -26,7 +26,7 @@ std::shared_ptr<Database> loadInputs( int nprocs )
 int main(int argc, char **argv)
 {
   // Initialize MPI
-  MPI_Init(&argc,&argv);
+  Utilities::startup( argc, argv );
   Utilities::MPI comm( MPI_COMM_WORLD );
   int rank = comm.getRank();
   int nprocs = comm.getSize();
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
     }
   } // Limit scope so variables that contain communicators will free before MPI_Finialize
   comm.barrier();
-  MPI_Finalize();
+  Utilities::shutdown();
   return 0;  
 }
 

tests/TestTwoPhase.cpp

@@ -17,7 +17,7 @@
 int main(int argc, char **argv)
 {
   // Initialize MPI
-  MPI_Init(&argc,&argv);
+  Utilities::startup( argc, argv );
   Utilities::MPI comm( MPI_COMM_WORLD );
   int rank = comm.getRank();
   int nprocs = comm.getSize();
@@ -111,7 +111,7 @@ int main(int argc, char **argv)
 	// ****************************************************
 	comm.barrier();
   } // Limit scope so Domain will free it's communicator
-  MPI_Finalize();
+  Utilities::shutdown();
   return 0;
 }
 

tests/TestWriter.cpp

@@ -226,7 +226,7 @@ void testWriter( const std::string& format, std::vector<IO::MeshDataStruct>& mes
 // Main
 int main(int argc, char **argv)
 {
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -387,7 +387,7 @@ int main(int argc, char **argv)
     PROFILE_SAVE("TestWriter",true);
     int N_errors = ut.NumFailGlobal();
     comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return N_errors;
 }
 

tests/convertIO.cpp

@@ -17,7 +17,7 @@
 int main(int argc, char **argv)
 {
   // Initialize MPI
-  MPI_Init(&argc,&argv);
+  Utilities::startup( argc, argv );
   Utilities::MPI comm( MPI_COMM_WORLD );
   int rank = comm.getRank();
   int nprocs = comm.getSize();
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
   PROFILE_STOP("Main");
   PROFILE_SAVE("convertData",true);
   comm.barrier();
-  MPI_Finalize();
+  Utilities::shutdown();
   return 0;
 }
 

tests/hello_world.cpp

@@ -5,7 +5,7 @@
 
 int main (int argc, char **argv)
 {
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -27,7 +27,6 @@ int main (int argc, char **argv)
     int error = 0;
     
     // Finished
-    comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
     return error; 
 }

tests/lb2_CMT_wia.cpp

@@ -138,7 +138,7 @@ extern "C" void CMT_ScaLBL_D3Q7_ColorCollideMass(char *ID, double *A_even, doubl
 int main(int argc, char **argv)
 {
     // Initialize MPI
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 
 	int n,N,Nx,Ny,Nz;
 
@@ -359,6 +359,6 @@ int main(int argc, char **argv)
     
     // Close MPI
     comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return 0;
 }

tests/lb2_Color_blob_wia_mpi.cpp

@@ -97,7 +97,7 @@ inline void ZeroHalo(double *Data, int Nx, int Ny, int Nz)
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -2794,6 +2794,6 @@ int main(int argc, char **argv)
 
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_BGK_simulator.cpp

@@ -25,7 +25,7 @@ int main(int argc, char **argv)
 {
 	// Initialize MPI
 	int rank,nprocs;
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -428,6 +428,6 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_captube_pp.cpp

@@ -25,7 +25,7 @@ std::shared_ptr<Database> loadInputs( )
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -182,6 +182,6 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_color_macro_simulator.cpp

@@ -655,7 +655,7 @@ int main(int argc, char **argv)
 		// ****************************************************
 		comm.barrier();
 	} // Limit scope so variables that contain communicators will free before MPI_Finialize
-	MPI_Finalize();
+	Utilities::shutdown();
 }
 
 

tests/lbpm_dfh_simulator.cpp

@@ -24,12 +24,12 @@ using namespace std;
 int main(int argc, char **argv)
 {
   // Initialize MPI
-  int provided_thread_support = -1;
-  MPI_Init_thread(&argc,&argv,MPI_THREAD_MULTIPLE,&provided_thread_support);
+  Utilities::startup( argc, argv );
   Utilities::MPI comm( MPI_COMM_WORLD );
   int rank = comm.getRank();
   int nprocs = comm.getSize();
-  if ( rank==0 && provided_thread_support<MPI_THREAD_MULTIPLE )
+  auto thread_support = Utilities::MPI::queryThreadSupport();
+  if ( rank==0 && thread_support != Utilities::MPI::ThreadSupport::MULTIPLE )
     std::cerr << "Warning: Failed to start MPI with necessary thread support, thread support will be disabled" << std::endl;
   { // Limit scope so variables that contain communicators will free before MPI_Finialize
 
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
 	// ****************************************************
 	comm.barrier();
   } // Limit scope so variables that contain communicators will free before MPI_Finialize
-  MPI_Finalize();
+    Utilities::shutdown();
 }
 
 

tests/lbpm_disc_pp.cpp

@@ -131,7 +131,7 @@ inline void SignedDistanceDiscPack(double *Distance, int ndiscs, double *List_cx
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -383,6 +383,6 @@ int main(int argc, char **argv)
 
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_inkbottle_pp.cpp

@@ -14,7 +14,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -218,6 +218,6 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_juanes_bench_disc_pp.cpp

@@ -131,7 +131,7 @@ inline void SignedDistanceDiscPack(double *Distance, int ndiscs, double *List_cx
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -484,6 +484,6 @@ int main(int argc, char **argv)
 
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_minkowski_scalar.cpp

@@ -29,7 +29,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -209,8 +209,7 @@ int main(int argc, char **argv)
 	}
 	PROFILE_STOP("Main");
 	PROFILE_SAVE("Minkowski",true);
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 	return 0;
 }
 

tests/lbpm_morph_pp.cpp

@@ -23,7 +23,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
 	{
@@ -241,6 +241,5 @@ int main(int argc, char **argv)
 		Mask->AggregateLabels(filename2);
 	}
 
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 }

tests/lbpm_morphdrain_pp.cpp

@@ -23,7 +23,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
 	{
@@ -201,6 +201,5 @@ int main(int argc, char **argv)
 		Mask->AggregateLabels( filename2 );
 	}
 
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 }

tests/lbpm_morphopen_pp.cpp

@@ -23,7 +23,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
 	{
@@ -203,6 +203,5 @@ int main(int argc, char **argv)
 		Mask->AggregateLabels(filename2);
 	}
 
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 }

tests/lbpm_nondarcy_simulator.cpp

@@ -78,7 +78,7 @@ int main(int argc, char **argv)
 	else {
 
 		// Initialize MPI
-		MPI_Init(&argc,&argv);
+		Utilities::startup( argc, argv );
 		Utilities::MPI comm( MPI_COMM_WORLD );
         int rank = comm.getRank();
         int nprocs = comm.getSize();
@@ -570,7 +570,7 @@ int main(int argc, char **argv)
 		}
 		// ****************************************************
 		comm.barrier();
-		MPI_Finalize();
+		Utilities::shutdown();
 		// ****************************************************
 	}
 }

tests/lbpm_nonnewtonian_simulator.cpp

@@ -825,7 +825,7 @@ int main(int argc, char **argv)
 			NULL_USE(RESTART_INTERVAL);
 		}
 		comm.barrier();
-		MPI_Finalize();
+		Utilities::shutdown();
 	 //****************************************************
 }
 

tests/lbpm_permeability_simulator.cpp

@@ -24,7 +24,7 @@ using namespace std;
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -50,8 +50,5 @@ int main(int argc, char **argv)
 		MRT.Run();	 
 		MRT.VelocityField();
 	}
-	// ****************************************************
-	comm.barrier();
-	MPI_Finalize();
-	// ****************************************************
+    Utilities::shutdown();
 }

tests/lbpm_plates_pp.cpp

@@ -14,7 +14,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -195,6 +195,6 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_porenetwork_pp.cpp

@@ -14,7 +14,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -287,6 +287,6 @@ int main(int argc, char **argv)
 	}
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_random_pp.cpp

@@ -52,7 +52,7 @@ inline void UnpackID(int *list, int count, char *recvbuf, char *ID){
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -404,6 +404,6 @@ int main(int argc, char **argv)
 	fclose(ID);
 
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	return 0;
 }

tests/lbpm_refine_pp.cpp

@@ -16,7 +16,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -421,7 +421,6 @@ int main(int argc, char **argv)
 
 
 	}
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 	return 0;
 }

tests/lbpm_segmented_decomp.cpp

@@ -18,7 +18,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -365,5 +365,5 @@ int main(int argc, char **argv)
 		}
 	}
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 }

tests/lbpm_segmented_pp.cpp

@@ -115,7 +115,7 @@ double ReadFromBlock( char *ID, int iproc, int jproc, int kproc, int Nx, int Ny,
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -231,7 +231,7 @@ int main(int argc, char **argv)
 
 	}
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	return 0;
 
 }

tests/lbpm_sphere_pp.cpp

@@ -23,7 +23,7 @@ using namespace std;
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -212,6 +212,6 @@ int main(int argc, char **argv)
 
 	// ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_squaretube_pp.cpp

@@ -14,7 +14,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -253,6 +253,6 @@ int main(int argc, char **argv)
 	}
         // ****************************************************
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	// ****************************************************
 }

tests/lbpm_uCT_maskfilter.cpp

@@ -31,7 +31,7 @@
 int main(int argc, char **argv)
 {
 	// Initialize MPI
-	MPI_Init(&argc,&argv);
+	Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -446,7 +446,7 @@ int main(int argc, char **argv)
 	PROFILE_STOP("Main");
 	PROFILE_SAVE("lbpm_uCT_maskfilter",true);
 	comm.barrier();
-	MPI_Finalize();
+	Utilities::shutdown();
 	return 0;
 }
 

tests/lbpm_uCT_pp.cpp

@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 {
 
     // Initialize MPI
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -457,7 +457,7 @@ int main(int argc, char **argv)
     PROFILE_STOP("Main");
     PROFILE_SAVE("lbpm_uCT_pp",true);
     comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     return 0;
 }
 

tests/testCommunication.cpp

@@ -251,7 +251,7 @@ int testHalo( const Utilities::MPI& comm, int nprocx, int nprocy, int nprocz, in
 int main(int argc, char **argv)
 {
     // Initialize MPI
-    MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
     Utilities::MPI comm( MPI_COMM_WORLD );
     int rank = comm.getRank();
     int nprocs = comm.getSize();
@@ -287,7 +287,7 @@ int main(int argc, char **argv)
     comm.barrier();
     int N_errors_global = comm.sumReduce( N_errors );
     comm.barrier();
-    MPI_Finalize();
+    Utilities::shutdown();
     if ( rank==0 ) {
         if ( N_errors_global==0 )
             std::cout << "All tests passed\n";

tests/test_MPI.cpp

@@ -1452,10 +1452,7 @@ int main( int argc, char *argv[] )
 
         // Test splitByNode
         MPI_CLASS nodeComm = globalComm.splitByNode();
-        int length;
-        char name[MPI_MAX_PROCESSOR_NAME];
-        MPI_Get_processor_name( name, &length );
-        std::string localName( name );
+        std::string localName = MPI_CLASS::getNodeName();
         std::vector<std::string> globalStrings( globalComm.getSize() );
         std::vector<std::string> nodeStrings( nodeComm.getSize() );
         globalComm.allGather<std::string>( localName, &globalStrings[0] );

tests/test_dcel_minkowski.cpp

@@ -25,7 +25,7 @@ std::shared_ptr<Database> loadInputs( )
 
 int main(int argc, char **argv)
 {
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
 	//int rank = comm.getRank();
 	//int nprocs = comm.getSize();
@@ -99,7 +99,6 @@ int main(int argc, char **argv)
 		
 	}
     PROFILE_SAVE("test_dcel_minkowski");
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 	return toReturn;
 }

tests/test_dcel_tri_normal.cpp

@@ -25,7 +25,7 @@ std::shared_ptr<Database> loadInputs( )
 
 int main(int argc, char **argv)
 {
-	MPI_Init(&argc,&argv);
+    Utilities::startup( argc, argv );
 	Utilities::MPI comm( MPI_COMM_WORLD );
 	int toReturn = 0;
 	{
@@ -136,7 +136,6 @@ int main(int argc, char **argv)
 		if (count_check > 0)  toReturn=2;
 		else printf("Succeeded. \n");
 	}
-	comm.barrier();
-	MPI_Finalize();
+    Utilities::shutdown();
 	return toReturn;
 }