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

update to lbpm_color_simulator

Browse Source
This commit is contained in:
James E McClure 2015-06-17 22:48:08 -04:00
parent 73596a1a9d
commit 14fa6ce01f
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/lbpm_color_simulator.cpp
View File

@ -995,13 +995,23 @@ int main(int argc, char **argv)
//...........................................................................
// MAIN VARIABLES INITIALIZED HERE
//...........................................................................
//...........................................................................
if (InitialCondition == 2){
if (rank==0) printf("Initialize from segmented data: solid=0, wetting=1, nonwetting=2 \n");
sprintf(LocalRankFilename,"ID.%05i",rank);
FILE *IDFILE = fopen(LocalRankFilename,"rb");
if (IDFILE==NULL) ERROR("Error opening file: ID.xxxxx");
fread(id,1,N,IDFILE);
fclose(IDFILE);
CopyToDevice(ID, id, N);
}
//...........................................................................
if (rank==0) printf("Setting the distributions, size = %i\n", N);
//...........................................................................
InitD3Q19(ID, f_even, f_odd, Nx, Ny, Nz);
//......................................................................
InitDenColor(ID, Den, Phi, das, dbs, Nx, Ny, Nz);
//......................................................................
if (Restart == true){
if (rank==0) printf("Reading restart file! \n");
@ -1015,17 +1025,6 @@ int main(int argc, char **argv)
MPI_Barrier(MPI_COMM_WORLD);
}
if (InitialCondition == 2){
if (rank==0) printf("Initialize from segmented data: solid=0, wetting=1, nonwetting=2 \n");
sprintf(LocalRankFilename,"ID.%05i",rank);
FILE *IDFILE = fopen(LocalRankFilename,"rb");
if (IDFILE==NULL) ERROR("Error opening file: ID.xxxxx");
fread(id,1,N,IDFILE);
fclose(IDFILE);
CopyToDevice(ID, id, N);
InitDenColor(ID, Den, Phi, das, dbs, Nx, Ny, Nz);
}
//......................................................................
InitD3Q7(ID, A_even, A_odd, &Den[0], Nx, Ny, Nz);
InitD3Q7(ID, B_even, B_odd, &Den[N], Nx, Ny, Nz);