OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't pretend to support boundary conditions.

Browse Source 
We don't.
This commit is contained in:
Bård Skaflestad 2011-11-25 14:17:07 +01:00
parent 432a1d4230
commit 4a50653106
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cfs_tpfa_residual.c
View File

@ -930,7 +930,6 @@ compute_fpress(grid_t *G,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void static void
compute_flux(grid_t *G, compute_flux(grid_t *G,
flowbc_t *bc,
int np, int np,
const double *trans, const double *trans,
const double *pmobf, const double *pmobf,
@ -946,11 +945,13 @@ compute_flux(grid_t *G,
c1 = G->face_cells[2*f + 0]; c1 = G->face_cells[2*f + 0];
c2 = G->face_cells[2*f + 1]; c2 = G->face_cells[2*f + 1];
#if 0
if (((c1 < 0) || (c2 < 0)) && if (((c1 < 0) || (c2 < 0)) &&
(bc != NULL) && (bc->type[f] == FLUX)) { (bc != NULL) && (bc->type[f] == FLUX)) {
fflux[f] = bc->bcval[f]; fflux[f] = bc->bcval[f];
continue; continue;
} }
#endif
t = g = 0.0; t = g = 0.0;
for (p = 0; p < np; p++) { for (p = 0; p < np; p++) {
@ -961,6 +962,7 @@ compute_flux(grid_t *G,
if ((c1 >= 0) && (c2 >= 0)) { if ((c1 >= 0) && (c2 >= 0)) {
dp = cpress[c1] - cpress[c2]; dp = cpress[c1] - cpress[c2];
#if 0
} else if ((bc != NULL) && (bc->type[f] == PRESSURE)) { } else if ((bc != NULL) && (bc->type[f] == PRESSURE)) {
if (c1 < 0) { if (c1 < 0) {
dp = bc->bcval[f] - cpress[c2]; dp = bc->bcval[f] - cpress[c2];
@ -968,6 +970,7 @@ compute_flux(grid_t *G,
} else { } else {
dp = cpress[c1] - bc->bcval[f]; dp = cpress[c1] - bc->bcval[f];
} }
#endif
} else { } else {
/* No BC -> no-flow (== pressure drop offsets gravity) */ /* No BC -> no-flow (== pressure drop offsets gravity) */
dp = -g / t; dp = -g / t;
@ -1127,7 +1130,6 @@ cfs_tpfa_res_assemble(grid_t *G,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
void void
cfs_tpfa_res_flux(grid_t *G, cfs_tpfa_res_flux(grid_t *G,
flowbc_t *bc,
int np, int np,
const double *trans, const double *trans,
const double *pmobf, const double *pmobf,
@ -1136,7 +1138,7 @@ cfs_tpfa_res_flux(grid_t *G,
double *fflux) double *fflux)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
compute_flux(G, bc, np, trans, pmobf, gravcap_f, cpress, fflux); compute_flux(G, np, trans, pmobf, gravcap_f, cpress, fflux);
} }

3
src/cfs_tpfa_residual.h
View File

@ -30,7 +30,6 @@ struct cfs_tpfa_res_impl;
struct CSRMatrix; struct CSRMatrix;
struct compr_quantities_gen; struct compr_quantities_gen;
struct compr_src; struct compr_src;
struct compr_bc;
struct WellCompletions; struct WellCompletions;
struct WellControls; struct WellControls;
struct completion_data; struct completion_data;
@ -43,7 +42,6 @@ struct cfs_tpfa_res_wells {
struct cfs_tpfa_res_forces { struct cfs_tpfa_res_forces {
struct cfs_tpfa_res_wells *W ; struct cfs_tpfa_res_wells *W ;
struct compr_bc *bc ;
struct compr_src *src; struct compr_src *src;
}; };
@ -78,7 +76,6 @@ cfs_tpfa_res_assemble(grid_t *G,
void void
cfs_tpfa_res_flux(grid_t *G, cfs_tpfa_res_flux(grid_t *G,
flowbc_t *bc,
int np, int np,
const double *trans, const double *trans,
const double *pmobf, const double *pmobf,