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

Fixed pore volume computation for constrained bubble test

Browse Source
This commit is contained in:
James E McClure 2014-09-07 11:50:54 -04:00
parent 35242b14d4
commit 1d24dc9b20
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/lb2_Color_wia_mpi.cpp
View File

@ -447,6 +447,12 @@ int main(int argc, char **argv)
porosity = porosity*iVol_global; porosity = porosity*iVol_global;
if (rank==0) printf("Media porosity = %f \n",porosity); if (rank==0) printf("Media porosity = %f \n",porosity);
// Generate the residual NWP
if (!pBC && rank==0) printf("Initializing with NWP saturation = %f \n",wp_saturation);
if (!pBC) GenerateResidual(id,Nx,Ny,Nz,wp_saturation);
#endif
// Compute the pore volume // Compute the pore volume
sum_local = 0.0; sum_local = 0.0;
for ( k=1;k<Nz-1;k++){ for ( k=1;k<Nz-1;k++){
@ -461,12 +467,6 @@ int main(int argc, char **argv)
} }
MPI_Allreduce(&sum_local,&pore_vol,1,MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD); MPI_Allreduce(&sum_local,&pore_vol,1,MPI_DOUBLE,MPI_SUM,MPI_COMM_WORLD);
// Generate the residual NWP
if (!pBC && rank==0) printf("Initializing with NWP saturation = %f \n",wp_saturation);
if (!pBC) GenerateResidual(id,Nx,Ny,Nz,wp_saturation);
#endif
//......................................................... //.........................................................
// If pressure boundary conditions are applied remove solid // If pressure boundary conditions are applied remove solid
if (pBC && kproc == 0){ if (pBC && kproc == 0){
@ -1479,8 +1479,8 @@ int main(int argc, char **argv)
if (rank==0){ if (rank==0){
TIMELOG= fopen("timelog.tcat","a+"); TIMELOG= fopen("timelog.tcat","a+");
if (fseek(TIMELOG,0,SEEK_SET) == fseek(TIMELOG,0,SEEK_CUR)){ if (fseek(TIMELOG,0,SEEK_SET) == fseek(TIMELOG,0,SEEK_CUR)){
//// If timelog is empty, write a short header to list the averages // If timelog is empty, write a short header to list the averages
fprintf(TIMELOG,"--------------------------------------------------------------------------------------\n"); //fprintf(TIMELOG,"--------------------------------------------------------------------------------------\n");
fprintf(TIMELOG,"time dEs "); // Timestep, Change in Surface Energy fprintf(TIMELOG,"time dEs "); // Timestep, Change in Surface Energy
fprintf(TIMELOG,"sw pw pn awn ans aws Jwn Kwn lwns sgkvpmawns "); // Scalar averages fprintf(TIMELOG,"sw pw pn awn ans aws Jwn Kwn lwns sgkvpmawns "); // Scalar averages
fprintf(TIMELOG,"vawx vawy vawz vanx vany vanz "); // Velocity averages fprintf(TIMELOG,"vawx vawy vawz vanx vany vanz "); // Velocity averages