Merge from upstream.
This commit is contained in:
commit
064f0844a5
@ -487,7 +487,10 @@ compute_flux(grid_t *G,
|
|||||||
double t, dp;
|
double t, dp;
|
||||||
|
|
||||||
for (f = 0; f < G->number_of_faces; f++) {
|
for (f = 0; f < G->number_of_faces; f++) {
|
||||||
if (bc->type[f] == FLUX) {
|
c1 = G->face_cells[2*f + 0];
|
||||||
|
c2 = G->face_cells[2*f + 1];
|
||||||
|
|
||||||
|
if (((c1 < 0) || (c2 < 0)) && (bc->type[f] == FLUX)) {
|
||||||
fflux[f] = bc->bcval[f];
|
fflux[f] = bc->bcval[f];
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -498,9 +501,6 @@ compute_flux(grid_t *G,
|
|||||||
}
|
}
|
||||||
t *= trans[f];
|
t *= trans[f];
|
||||||
|
|
||||||
c1 = G->face_cells[2*f + 0];
|
|
||||||
c2 = G->face_cells[2*f + 1];
|
|
||||||
|
|
||||||
if ((c1 >= 0) && (c2 >= 0)) {
|
if ((c1 >= 0) && (c2 >= 0)) {
|
||||||
dp = cpress[c1] - cpress[c2];
|
dp = cpress[c1] - cpress[c2];
|
||||||
} else if (bc->type[f] == PRESSURE) {
|
} else if (bc->type[f] == PRESSURE) {
|
||||||
|
Loading…
Reference in New Issue
Block a user