Update the compilation process to take into account the new shared Theta/Mira home directory

Makefile

-include make.inc/Makefile.bgq
+include make.inc/Makefile.$(ARCHI)
 
 CPP_FILES := $(wildcard *.cpp)
 OBJ_FILES := $(CPP_FILES:.cpp=.o)

examples/HACC-IO/Makefile

-MPICXX = mpixlcxx
-
-MPI_CFLAGS  = -g -O3 -I$(HOME)/install_bgq/include/ -DBGQ -DDEBUG
-MPI_LDFLAGS = -L$(HOME)/install_bgq/lib/ -ltapioca
+include ../make.inc/Makefile.$(ARCHI)
 
 all: miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO
 
@@ -18,6 +15,12 @@ miniHACC-AoS-MPIIO:miniHACC-AoS-MPIIO.cpp
 miniHACC-SoA-MPIIO:miniHACC-SoA-MPIIO.cpp
 	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
 
+install:
+	mv miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO $(INSTALL_PATH)/bin
+
 clean:
-	rm miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO
+	rm $(INSTALL_PATH)/bin/miniHACC-AoS
+	rm $(INSTALL_PATH)/bin/miniHACC-SoA
+	rm $(INSTALL_PATH)/bin/miniHACC-AoS-MPIIO
+	rm $(INSTALL_PATH)/bin/miniHACC-SoA-MPIIO
 

examples/HACC-IO/Makefile.bgq

-MPICXX = mpicxx
-
-MPI_CFLAGS  = -g -O3 -I$(HOME)/install_bgq/include/ -DBGQ -DDEBUG
-MPI_LDFLAGS = -L$(HOME)/install_bgq/lib/ -ltapioca
-
-all: miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO
-
-miniHACC-AoS:miniHACC-AoS.cpp
-	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
-
-miniHACC-SoA:miniHACC-SoA.cpp
-	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
-
-### MPI I/O
-miniHACC-AoS-MPIIO:miniHACC-AoS-MPIIO.cpp
-	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
-
-miniHACC-SoA-MPIIO:miniHACC-SoA-MPIIO.cpp
-	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
-
-clean:
-	rm miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO *.o HACC.dat
-

examples/HACC-IO/Makefile.xc40

-MPICXX = CC
-
-MPI_CFLAGS  = -g -O3 -I$(HOME)/install/include/ -DXC40 -DDEBUG
-MPI_LDFLAGS = -L$(HOME)/install/lib/ -ltapioca -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive
-
-all: miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO
-
-miniHACC-AoS:miniHACC-AoS.cpp
-	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
-
-miniHACC-SoA:miniHACC-SoA.cpp
-	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
-
-### MPI I/O
-miniHACC-AoS-MPIIO:miniHACC-AoS-MPIIO.cpp
-	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
-
-miniHACC-SoA-MPIIO:miniHACC-SoA-MPIIO.cpp
-	$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
-
-clean:
-	rm miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO *.o HACC.dat
-

examples/make.inc/Makefile.linux-rhel_6-ppc64

+MPICXX = mpixlcxx
+
+MPI_CFLAGS   = -g -O3 -I$(HOME)/install/$(ARCHI)/include/ -DBGQ -DDEBUG
+MPI_LDFLAGS  = -L$(HOME)/install/$(ARCHI)/lib/ -ltapioca
+INSTALL_PATH = $(HOME)/install/$(ARCHI)
+

examples/make.inc/Makefile.linux-sles_12-x86_64

+MPICXX = CC
+
+MPI_CFLAGS   = -g -O3 -I$(HOME)/install/$(ARCHI)/include/ -DXC40 -DDEBUG
+MPI_LDFLAGS  = -L$(HOME)/install/$(ARCHI)/lib/ -ltapioca -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive
+INSTALL_PATH = $(HOME)/install/$(ARCHI)
+

make.inc/Makefile.bgq → make.inc/Makefile.linux-rhel_6-ppc64

@@ -4,4 +4,4 @@ MPI_CFLAGS   = -g -O3 -I./topology/
 MPI_CFLAGS  += -DBGQ -DDEBUG #-DTIMING                                                                                                                                              
 #MPI_CFLAGS  += -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk
 
-INSTALL_PATH  = $(HOME)/install_bgq
+INSTALL_PATH  = $(HOME)/install/$(ARCHI)

make.inc/Makefile.xc40 → make.inc/Makefile.linux-sles_12-x86_64

@@ -5,4 +5,4 @@ MPI_CFLAGS  += -DXC40 -DDEBUG #-DTIMING
 
 MPI_LDFLAGS = -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive
 
-INSTALL_PATH  = $(HOME)/install
+INSTALL_PATH  = $(HOME)/install/$(ARCHI)

tapioca.hpp

@@ -69,6 +69,11 @@ class Tapioca
 
   void MPIIOInfo (MPI_File fileHandle);
 
+  /***********************/
+  /*      TOPOLOGY       */
+  /***********************/
+  Topology topology;
+
  private:
   /***********************/
   /*  INITIALIZATION     */
@@ -114,11 +119,6 @@ class Tapioca
   void HandleMPIError (int retval);
   void PrintTime (double startTime, double endTime, char* func);
 
-  /***********************/
-  /*      TOPOLOGY       */
-  /***********************/
-  Topology topology;
-
   /***********************/
   /*      VARIABLES      */
   /***********************/