From 5fc17a2ead650cdee3ea25527e48903e67428651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Fri, 25 Nov 2011 15:27:08 +0100 Subject: [PATCH] Expand flux calculation interface to account for presence of wells. --- src/cfs_tpfa_residual.c | 21 ++++++++++++++------- src/cfs_tpfa_residual.h | 17 ++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/cfs_tpfa_residual.c b/src/cfs_tpfa_residual.c index 85a0ce99..9eb8e469 100644 --- a/src/cfs_tpfa_residual.c +++ b/src/cfs_tpfa_residual.c @@ -1128,15 +1128,22 @@ cfs_tpfa_res_assemble(grid_t *G, /* ---------------------------------------------------------------------- */ void -cfs_tpfa_res_flux(grid_t *G, - int np, - const double *trans, - const double *pmobf, - const double *gravcap_f, - const double *cpress, - double *fflux) +cfs_tpfa_res_flux(grid_t *G , + struct cfs_tpfa_res_forces *forces , + int np , + const double *trans , + const double *pmobf , + const double *gravcap_f, + const double *cpress , + const double *wpress , + double *fflux , + double *wflux ) /* ---------------------------------------------------------------------- */ { + (void) forces; + (void) wpress; + (void) wflux; + compute_flux(G, np, trans, pmobf, gravcap_f, cpress, fflux); } diff --git a/src/cfs_tpfa_residual.h b/src/cfs_tpfa_residual.h index 03fa16a3..a3a14f67 100644 --- a/src/cfs_tpfa_residual.h +++ b/src/cfs_tpfa_residual.h @@ -75,13 +75,16 @@ cfs_tpfa_res_assemble(grid_t *G, struct cfs_tpfa_res_data *h); void -cfs_tpfa_res_flux(grid_t *G, - int np, - const double *trans, - const double *pmobf, - const double *gravcap_f, - const double *cpress, - double *fflux); +cfs_tpfa_res_flux(grid_t *G , + struct cfs_tpfa_res_forces *forces , + int np , + const double *trans , + const double *pmobf , + const double *gravcap_f, + const double *cpress , + const double *wpress , + double *fflux , + double *wflux ); void cfs_tpfa_res_fpress(grid_t *G,