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

fix scope in Domain inlet/outlet

Browse Source
This commit is contained in:
James McClure 2020-05-04 15:12:50 -04:00
parent 16e187e1dc
commit d424771849
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
common/Domain.cpp
View File

@ -390,14 +390,11 @@ void Domain::Decomp( const std::string& Filename )
} }
} }
} }
if (RANK==0){ for (size_t idx=0; idx<ReadValues.size(); idx++){
for (size_t idx=0; idx<ReadValues.size(); idx++){ long int label=ReadValues[idx];
long int label=ReadValues[idx]; long int count=LabelCount[idx];
long int count=LabelCount[idx]; printf("Label=%ld, Count=%ld \n",label,count);
printf("Label=%ld, Count=%ld \n",label,count);
}
} }
if (USE_CHECKER) { if (USE_CHECKER) {
if (inlet_layers_x > 0){ if (inlet_layers_x > 0){
// use checkerboard pattern // use checkerboard pattern
@ -516,31 +513,31 @@ void Domain::Decomp( const std::string& Filename )
} }
} }
} }
} else {
else { if (inlet_layers_z > 0){
if (inlet_layers_z > 0){ printf("Mixed reflection pattern at z inlet for %i layers, saturated with phase label=%i \n",inlet_layers_z,inlet_layers_phase);
printf("Mixed reflection pattern at z inlet for %i layers, saturated with phase label=%i \n",inlet_layers_z,inlet_layers_phase); for (int k = zStart; k < zStart+inlet_layers_z; k++){
for (int k = zStart; k < zStart+inlet_layers_z; k++){ for (int j = 0; j<global_Ny; j++){
for (int j = 0; j<global_Ny; j++){ for (int i = 0; i<global_Nx; i++){
for (int i = 0; i<global_Nx; i++){ signed char local_id = SegData[k*global_Nx*global_Ny+j*global_Nx+i];
signed char local_id = SegData[k*global_Nx*global_Ny+j*global_Nx+i]; signed char reflection_id = SegData[(zStart + nz*nprocz - k)*global_Nx*global_Ny+j*global_Nx+i];
signed char reflection_id = SegData[(zStart + nz*nprocz - k)*global_Nx*global_Ny+j*global_Nx+i]; if ( local_id < 1 && reflection_id > 0){
if ( local_id < 1 && reflection_id > 0){ SegData[k*global_Nx*global_Ny+j*global_Nx+i] = reflection_id;
SegData[k*global_Nx*global_Ny+j*global_Nx+i] = reflection_id; }
} }
} }
} }
} }
} if (outlet_layers_z > 0){
if (outlet_layers_z > 0){ printf("Mixed reflection pattern at z outlet for %i layers, saturated with phase label=%i \n",outlet_layers_z,outlet_layers_phase);
printf("Mixed reflection pattern at z outlet for %i layers, saturated with phase label=%i \n",outlet_layers_z,outlet_layers_phase); for (int k = zStart + nz*nprocz - outlet_layers_z; k < zStart + nz*nprocz; k++){
for (int k = zStart + nz*nprocz - outlet_layers_z; k < zStart + nz*nprocz; k++){ for (int j = 0; j<global_Ny; j++){
for (int j = 0; j<global_Ny; j++){ for (int i = 0; i<global_Nx; i++){
for (int i = 0; i<global_Nx; i++){ signed char local_id = SegData[k*global_Nx*global_Ny+j*global_Nx+i];
signed char local_id = SegData[k*global_Nx*global_Ny+j*global_Nx+i]; signed char reflection_id = SegData[(zStart + nz*nprocz - k)*global_Nx*global_Ny+j*global_Nx+i];
signed char reflection_id = SegData[(zStart + nz*nprocz - k)*global_Nx*global_Ny+j*global_Nx+i]; if ( local_id < 1 && reflection_id > 0){
if ( local_id < 1 && reflection_id > 0){ SegData[k*global_Nx*global_Ny+j*global_Nx+i] = reflection_id;
SegData[k*global_Nx*global_Ny+j*global_Nx+i] = reflection_id; }
} }
} }
} }