OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated CPU branch a second time

Browse Source
This commit is contained in:
James McClure 2014-01-27 11:51:18 -05:00
parent 42338802c5
commit cffb54b9c5
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cpu/Makefile
View File

@ -1,8 +1,17 @@
CXX=mpicxx
FLAGS=-O3
INC=../include
ColorLBM-cpu:D3Q19.o D3Q7.o Color.o lb2_Color_mpi.o
$(CXX) $(FLAGS) -o ColorLBM-cpu lb2_Color_mpi.o D3Q19.o D3Q7.o Color.o
all:ColorLBM-cpu ColorLBM-CBUB
ColorLBM-cpu:Extras.o D3Q19.o D3Q7.o Color.o lb2_Color_wia_mpi.o
$(CXX) $(FLAGS) -I$(INC) -o ColorLBM-cpu lb2_Color_wia_mpi.o D3Q19.o D3Q7.o Color.o Extras.o
ColorLBM-CBUB:Extras.o D3Q19.o D3Q7.o Color.o lb2_Color_wia_mpi-CBUB.o
$(CXX) $(FLAGS) -I$(INC) -DCBUB -o ColorLBM-CBUB lb2_Color_wia_mpi-CBUB.o D3Q19.o D3Q7.o Color.o Extras.o
ColorLBM-BUB:Extras.o D3Q19.o D3Q7.o Color.o lb2_Color_wia_mpi_bubble.o
$(CXX) $(FLAGS) -I$(INC) -DCBUB -o ColorLBM-BUB lb2_Color_wia_mpi_bubble.o D3Q19.o D3Q7.o Color.o Extras.o
D3Q19.o:D3Q19.cpp
$(CXX) $(FLAGS) -c -o D3Q19.o D3Q19.cpp
@ -10,11 +19,20 @@ D3Q19.o:D3Q19.cpp
D3Q7.o:D3Q7.cpp
$(CXX) $(FLAGS) -c -o D3Q7.o D3Q7.cpp
Extras.o:Extras.cpp
$(CXX) $(FLAGS) -c -o Extras.o Extras.cpp
Color.o:Color.cpp
$(CXX) $(FLAGS) -c -o Color.o Color.cpp
lb2_Color_mpi.o:lb2_Color_mpi.cpp
$(CXX) $(FLAGS) -c -o lb2_Color_mpi.o lb2_Color_mpi.cpp
lb2_Color_wia_mpi.o:lb2_Color_wia_mpi.cpp
$(CXX) $(FLAGS) -I$(INC) -c -o lb2_Color_wia_mpi.o lb2_Color_wia_mpi.cpp
lb2_Color_wia_mpi-CBUB.o:lb2_Color_wia_mpi.cpp
$(CXX) $(FLAGS) -I$(INC) -DCBUB -c -o lb2_Color_wia_mpi-CBUB.o lb2_Color_wia_mpi.cpp
lb2_Color_wia_mpi_bubble.o:lb2_Color_wia_mpi_bubble.cpp
$(CXX) $(FLAGS) -I$(INC) -DCBUB -c -o lb2_Color_wia_mpi_bubble.o lb2_Color_wia_mpi_bubble.cpp
#MRT-MPI.o:lb1_MRT_mpi.cpp
# $(CXX) -c -o MRT-MPI.o lb1_MRT_mpi.cpp

2
cpu/lb2_Color_wia_mpi.cpp
View File

@ -730,7 +730,7 @@ int main(int argc, char **argv)
if (rank==0) printf("Initializing with NWP saturation = %f \n",wp_saturation);
GenerateResidual(id,Nx,Ny,Nz,wp_saturation);
#endif
// Set up MPI communication structurese
if (rank==0) printf ("Setting up communication control structures \n");
//......................................................................................