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

increased default inlet/outlet layers to 10

Browse Source
This commit is contained in:
James E McClure 2019-03-26 15:30:34 -04:00
parent 6b8ea6bdf0
commit 2eddcfd8cd
1 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
common/Domain.cpp
View File

@ -514,43 +514,47 @@ void Domain::CommInit()
void Domain::ReadIDs(){ void Domain::ReadIDs(){
// Read the IDs from input file // Read the IDs from input file
int nprocs=nprocx()*nprocy()*nprocz(); int nprocs=nprocx()*nprocy()*nprocz();
size_t readID; size_t readID;
char LocalRankString[8]; char LocalRankString[8];
char LocalRankFilename[40]; char LocalRankFilename[40];
//....................................................................... //.......................................................................
if (rank() == 0) printf("Read input media... \n"); if (rank() == 0) printf("Read input media... \n");
//....................................................................... //.......................................................................
sprintf(LocalRankString,"%05d",rank()); sprintf(LocalRankString,"%05d",rank());
sprintf(LocalRankFilename,"%s%s","ID.",LocalRankString); sprintf(LocalRankFilename,"%s%s","ID.",LocalRankString);
// .......... READ THE INPUT FILE ....................................... // .......... READ THE INPUT FILE .......................................
if (rank()==0) printf("Initialize from segmented data: solid=0, NWP=1, WP=2 \n"); if (rank()==0) printf("Initialize from segmented data: solid=0, NWP=1, WP=2 \n");
sprintf(LocalRankFilename,"ID.%05i",rank()); sprintf(LocalRankFilename,"ID.%05i",rank());
FILE *IDFILE = fopen(LocalRankFilename,"rb"); FILE *IDFILE = fopen(LocalRankFilename,"rb");
if (IDFILE==NULL) ERROR("Domain::ReadIDs -- Error opening file: ID.xxxxx"); if (IDFILE==NULL) ERROR("Domain::ReadIDs -- Error opening file: ID.xxxxx");
readID=fread(id,1,N,IDFILE); readID=fread(id,1,N,IDFILE);
if (readID != size_t(N)) printf("Domain::ReadIDs -- Error reading ID (rank=%i) \n",rank()); if (readID != size_t(N)) printf("Domain::ReadIDs -- Error reading ID (rank=%i) \n",rank());
fclose(IDFILE); fclose(IDFILE);
// Compute the porosity int inlet_layers=0;
double sum; int outlet_layers=0;
double porosity; // Compute the porosity
double sum_local=0.0; double sum;
double iVol_global = 1.0/(1.0*(Nx-2)*(Ny-2)*(Nz-2)*nprocs); double porosity;
if (BoundaryCondition > 0) iVol_global = 1.0/(1.0*(Nx-2)*nprocx()*(Ny-2)*nprocy()*((Nz-2)*nprocz()-6)); double sum_local=0.0;
//......................................................... double iVol_global = 1.0/(1.0*(Nx-2)*(Ny-2)*(Nz-2)*nprocs);
// If external boundary conditions are applied remove solid if (BoundaryCondition > 0) iVol_global = 1.0/(1.0*(Nx-2)*nprocx()*(Ny-2)*nprocy()*((Nz-2)*nprocz()-6));
if (BoundaryCondition > 0 && kproc() == 0){ //.........................................................
for (int k=0; k<3; k++){ // If external boundary conditions are applied remove solid
for (int j=0;j<Ny;j++){ if (BoundaryCondition > 0 && kproc() == 0){
for (int i=0;i<Nx;i++){ inlet_layers=outlet_layers=10;
int n = k*Nx*Ny+j*Nx+i; for (int k=0; k<inlet_layers; k++){
id[n] = 1; for (int j=0;j<Ny;j++){
} for (int i=0;i<Nx;i++){
} int n = k*Nx*Ny+j*Nx+i;
id[n] = 1;
}
}
} }
} }
if (BoundaryCondition > 0 && kproc() == nprocz()-1){ if (BoundaryCondition > 0 && kproc() == nprocz()-1){
for (int k=Nz-3; k<Nz; k++){ outlet_layers=10;
for (int k=Nz-outlet_layers; k<Nz; k++){
for (int j=0;j<Ny;j++){ for (int j=0;j<Ny;j++){
for (int i=0;i<Nx;i++){ for (int i=0;i<Nx;i++){
int n = k*Nx*Ny+j*Nx+i; int n = k*Nx*Ny+j*Nx+i;
@ -559,7 +563,7 @@ void Domain::ReadIDs(){
} }
} }
} }
for (int k=1;k<Nz-1;k++){ for (int k=inlet_layers+1; k<Nz-outlet_layers-1;k++){
for (int j=1;j<Ny-1;j++){ for (int j=1;j<Ny-1;j++){
for (int i=1;i<Nx-1;i++){ for (int i=1;i<Nx-1;i++){
int n = k*Nx*Ny+j*Nx+i; int n = k*Nx*Ny+j*Nx+i;