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

Merge branch 'master' of https://github.com/JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
Mark Berrill 2015-02-04 09:55:52 -05:00
commit cd2f3168ca
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/lbpm_color_simulator.cpp
View File

@ -275,10 +275,10 @@ int main(int argc, char **argv)
printf("********************************************************\n"); printf("********************************************************\n");
} }
// Initialized domain and averaging framework for Two-Phase Flow
// Initialized domain and averaging framework for Two-Phase Flow // Initialized domain and averaging framework for Two-Phase Flow
int BC=pBC; int BC=pBC;
Domain Dm(Nx,Ny,Nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BC); Domain Dm(Nx,Ny,Nz,rank,nprocx,nprocy,nprocz,Lx,Ly,Lz,BC);
Dm.CommInit(MPI_COMM_WORLD);
TwoPhase Averages(Dm); TwoPhase Averages(Dm);
InitializeRanks( rank, nprocx, nprocy, nprocz, iproc, jproc, kproc, InitializeRanks( rank, nprocx, nprocy, nprocz, iproc, jproc, kproc,
@ -423,6 +423,9 @@ int main(int argc, char **argv)
if (rank == 0) printf("Resetting phi_s = %f, das = %f, dbs = %f \n", phi_s, das, dbs); if (rank == 0) printf("Resetting phi_s = %f, das = %f, dbs = %f \n", phi_s, das, dbs);
FlipID(id,Nx*Ny*Nz); FlipID(id,Nx*Ny*Nz);
} }
// Initialize communication structures in averaging domain
for (i=0; i<Dm.Nx*Dm.Ny*Dm.Nz; i++) Dm.id[i] = 1;
Dm.CommInit(MPI_COMM_WORLD);
// Set up MPI communication structurese // Set up MPI communication structurese
if (rank==0) printf ("Setting up communication control structures \n"); if (rank==0) printf ("Setting up communication control structures \n");
@ -1583,6 +1586,7 @@ int main(int argc, char **argv)
Averages.PrintAll(timestep); Averages.PrintAll(timestep);
//.................................................................... //....................................................................
} }
if (timestep%RESTART_INTERVAL == 0){ if (timestep%RESTART_INTERVAL == 0){
if (pBC){ if (pBC){
//err = fabs(sat_w - sat_w_previous); //err = fabs(sat_w - sat_w_previous);