Back out cset 5e3d75476d64.

This commit is contained in:
Bård Skaflestad 2011-10-18 23:14:15 +02:00
commit 000f71e12c
2 changed files with 517 additions and 342 deletions

File diff suppressed because it is too large Load Diff

View File

@ -47,32 +47,38 @@ cfs_tpfa_construct(grid_t *G, well_t *W, int nphases);
void void
cfs_tpfa_assemble(grid_t *G, cfs_tpfa_assemble(grid_t *G,
double dt, double dt,
well_t *W,
flowbc_t *bc, flowbc_t *bc,
const double *src, const double *src,
const double *zc,
struct compr_quantities *cq, struct compr_quantities *cq,
const double *trans, const double *trans,
const double *gravcap_f, const double *gravcap_f,
const double *cpress, well_control_t *wctrl,
struct completion_data *wdata,
const double *cpress0,
const double *porevol, const double *porevol,
struct cfs_tpfa_data *h); struct cfs_tpfa_data *h);
void void
cfs_tpfa_press_increment(grid_t *G, cfs_tpfa_press_increment(grid_t *G,
well_t *W,
struct cfs_tpfa_data *h, struct cfs_tpfa_data *h,
double *cpress_inc); double *cpress_inc,
double *wpress_inc);
#if 0
void void
cfs_tpfa_flux(grid_t *G, cfs_tpfa_flux(grid_t *G,
flowbc_t *bc, flowbc_t *bc,
well_t *W,
int np, int np,
const double *trans, const double *trans,
const double *pmobf, const double *pmobf,
const double *gravcap_f, const double *gravcap_f,
const double *cpress, const double *cpress,
double *fflux); const double *wpress,
#endif struct completion_data *wdata,
double *fflux,
double *wflux);
void void
cfs_tpfa_fpress(grid_t *G, cfs_tpfa_fpress(grid_t *G,