Fixing compile error on platforms/filesystems that are case insensitive (MAC) due to MPI.h including mpi.h which included itself rather than including mpi

IO/MeshDatabase.cpp

@@ -1,7 +1,7 @@
 #include "IO/MeshDatabase.h"
 #include "IO/Mesh.h"
 #include "IO/IOHelpers.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include "common/Utilities.h"
 
 #include <vector>

IO/MeshDatabase.h

@@ -2,7 +2,7 @@
 #define MeshDatabase_INC
 
 #include "IO/Mesh.h" 
-#include "common/MPI.h" 
+#include "common/MPI_Helpers.h"
 
 #include <iostream>
 #include <string.h>

IO/PIO.cpp

@@ -1,16 +1,12 @@
 #include "IO/PIO.h"
 #include "common/Utilities.h"
+#include "common/MPI_Helpers.h"
 
 #include <fstream>
 #include <string>
 #include <cstring>
 
 
-#ifdef USE_MPI
-    #include "mpi.h"
-#endif
-
-
 namespace IO {
 
 

IO/Writer.cpp

@@ -1,7 +1,7 @@
 #include "IO/Writer.h"
 #include "IO/MeshDatabase.h"
 #include "IO/IOHelpers.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include "common/Utilities.h"
 
 #include <sys/stat.h>

cmake/ctest_script.cmake

@@ -227,7 +227,7 @@ SET( DROP_SITE_CDASH TRUE )
 CTEST_SUBMIT()
 
 
-# Clean up
-# exec_program("make distclean")
+# Write a message to test for success in the ctest-builder
+MESSAGE( "ctest_script ran to completion" )
 
 

common/Communication.h

@@ -1,7 +1,7 @@
 #ifndef COMMUNICATION_H_INC
 #define COMMUNICATION_H_INC
 
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include "Array.h"
 
 // ********** COMMUNICTION **************************************

common/Domain.h

@@ -13,7 +13,7 @@
 #include <stdexcept>
 
 #include "common/Utilities.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include "common/Communication.h"
 
 int MAX_BLOB_COUNT=50;

common/MPI_Helpers.cpp

@@ -1,4 +1,4 @@
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include "common/Utilities.h"
 
 

common/MPI_Helpers.h

@@ -127,6 +127,6 @@ void unpack( std::set<TYPE>& data, const char *buffer );
 #endif
 
 
-#include "common/MPI.hpp"
+#include "common/MPI_Helpers.hpp"
 
 

common/MPI_Helpers.hpp

@@ -2,7 +2,7 @@
 #ifndef MPI_WRAPPERS_HPP
 #define MPI_WRAPPERS_HPP
 
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include <string.h>
 #include <vector>
 #include <set>

cpu/exe/lb2_Color_mpi.cpp

@@ -4,7 +4,7 @@
 #include "D3Q19.h"
 #include "D3Q7.h"
 #include "Color.h"
-#include <mpi.h>
+#include "common/MPI_Helpers.h"
 
 using namespace std;
 

cpu/exe/lb2_Color_wia_mpi_bubble.cpp

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <fstream>
-#include <mpi.h>
+
 
 #include "pmmc.h"
 #include "Domain.h"
@@ -10,9 +10,11 @@
 #include "D3Q19.h"
 #include "D3Q7.h"
 #include "Color.h"
+#include "common/MPI_Helpers.h"
 
 using namespace std;
 
+
 //*************************************************************************
 // Implementation of Two-Phase Immiscible LBM using CUDA
 //*************************************************************************

tests/BasicSimulator.cpp

@@ -5,7 +5,6 @@
 #include <exception>
 #include <stdexcept>
 #include <fstream>
-#include <mpi.h>
 
 #include "pmmc.h"
 #include "Domain.h"
@@ -13,6 +12,7 @@
 #include "D3Q19.h"
 #include "D3Q7.h"
 #include "Color.h"
+#include "common/MPI_Helpers.h"
 #include "Communication.h"
 
 //#define CBUB

tests/TestBubble.cpp

@@ -11,7 +11,7 @@
 #include "D3Q19.h"
 #include "D3Q7.h"
 #include "Color.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include "Communication.h"
 #include "IO/Mesh.h"
 #include "IO/Writer.h"

tests/TestCommD3Q19.cpp

@@ -10,7 +10,7 @@
 #include "D3Q7.h"
 #include "Array.h"
 #include "Extras.h"
-#include <mpi.h>
+#include "common/MPI_Helpers.h"
 
 using namespace std;
 

tests/TestTwoPhase.cpp

@@ -12,7 +12,7 @@
 #include "D3Q19.h"
 #include "D3Q7.h"
 #include "Color.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include "Communication.h"
 #include "IO/Mesh.h"
 #include "IO/Writer.h"

tests/TestWriter.cpp

@@ -8,7 +8,7 @@
 
 #include "common/UnitTest.h"
 #include "common/Utilities.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 #include "IO/MeshDatabase.h"
 #include "IO/Reader.h"
 #include "IO/Writer.h"

tests/hello_world.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 
 
 int main (int argc, char **argv)

tests/lb2_CMT_wia.cpp

@@ -4,7 +4,6 @@
 #include <exception>
 #include <stdexcept>
 #include <fstream>
-//#include <mpi.h>
 
 #include "pmmc.h"
 #include "Domain.h"
@@ -12,6 +11,7 @@
 #include "D3Q19.h"
 #include "D3Q7.h"
 #include "Color.h"
+//#include "common/MPI_Helpers.h"
 //#include "Communication.h"
 
 //#define CBUB

tests/lb2_Color_blob_wia_mpi.cpp

@@ -5,7 +5,6 @@
 #include <exception>
 #include <stdexcept>
 #include <fstream>
-#include <mpi.h>
 
 #include "pmmc.h"
 #include "Domain.h"
@@ -13,6 +12,7 @@
 #include "D3Q19.h"
 #include "D3Q7.h"
 #include "Color.h"
+#include "common/MPI_Helpers.h"
 #include "Communication.h"
 
 #define WRITE_SURFACES

tests/lb2_Color_wia_mpi.cpp

@@ -13,7 +13,7 @@
 #include "Color.h"
 #include "Communication.h"
 #include "TwoPhase.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 
 #define CBUB
 

tests/lbpm_color_simulator.cpp

@@ -13,7 +13,7 @@
 #include "Color.h"
 #include "Communication.h"
 #include "TwoPhase.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 
 //#define WRITE_SURFACES
 

tests/lbpm_sphere_pp.cpp

@@ -5,11 +5,11 @@
 #include <exception>
 #include <stdexcept>
 #include <fstream>
-#include <mpi.h>
 
 #include "pmmc.h"
 #include "Domain.h"
 #include "Extras.h"
+#include "common/MPI_Helpers.h"
 #include "Communication.h"
 
 /*

tests/testCommunication.cpp

@@ -6,7 +6,7 @@
 #include <fstream>
 
 #include "Communication.h"
-#include "common/MPI.h"
+#include "common/MPI_Helpers.h"
 
 using namespace std;
 

tests/testUtilities.cpp

@@ -10,10 +10,7 @@
 
 #include "common/Utilities.h"
 #include "common/UnitTest.h"
-
-#ifdef USE_MPI
-    #include "mpi.h"
-#endif
+#include "common/MPI_Helpers.h"
 
 
 // Function to return the call stack
@@ -30,10 +27,8 @@ std::vector<std::string> get_call_stack()
 int main(int argc, char *argv[]) 
 {
     int rank = 0;
-    #ifdef USE_MPI
-        MPI_Init(&argc,&argv);
-        MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-    #endif
+    MPI_Init(&argc,&argv);
+    MPI_Comm_rank(MPI_COMM_WORLD,&rank);
     UnitTest ut;
     Utilities::setAbortBehavior( true, true, true );
 
@@ -110,9 +105,7 @@ int main(int argc, char *argv[])
     size_t N_errors = ut.NumFailGlobal();
     if ( N_errors==0 )
         printf("All tests passed\n");
-    #ifdef USE_MPI
-        MPI_Finalize();
-    #endif
+    MPI_Finalize();
     return (int) N_errors;
 }