OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-21 23:13:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Realign function prototypes. No functional changes.

Browse Source
This commit is contained in:
Bård Skaflestad 2012-05-24 14:36:53 +02:00
parent 7970d426ef
commit 4b6b8c0def
1 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
opm/core/pressure/tpfa/cfs_tpfa_residual.c
View File

@ -367,13 +367,13 @@ compute_darcyflux_and_deriv(int np,
static void static void
compute_compflux_and_deriv(struct UnstructuredGrid *G , compute_compflux_and_deriv(struct UnstructuredGrid *G ,
int np , int np ,
const double *cpress, const double *cpress,
const double *trans , const double *trans ,
const double *pmobf , const double *pmobf ,
const double *gcapf , const double *gcapf ,
const double *Af , const double *Af ,
struct cfs_tpfa_res_impl *pimpl ) struct cfs_tpfa_res_impl *pimpl )
{ {
int c1, c2, f, np2; int c1, c2, f, np2;
@ -488,12 +488,12 @@ count_internal_conn(struct UnstructuredGrid *G, int c)
static int static int
init_cell_contrib(struct UnstructuredGrid *G , init_cell_contrib(struct UnstructuredGrid *G ,
int c , int c ,
int np , int np ,
double pvol , double pvol ,
double dt , double dt ,
const double *z , const double *z ,
struct cfs_tpfa_res_impl *pimpl) struct cfs_tpfa_res_impl *pimpl)
{ {
int c1, c2, f, i, conn, nconn; int c1, c2, f, i, conn, nconn;
@ -536,14 +536,14 @@ init_cell_contrib(struct UnstructuredGrid *G ,
static void static void
compute_cell_contrib(struct UnstructuredGrid *G , compute_cell_contrib(struct UnstructuredGrid *G ,
int c , int c ,
int np , int np ,
double pvol , double pvol ,
double dt , double dt ,
const double *z , const double *z ,
const double *Ac , const double *Ac ,
const double *dAc , const double *dAc ,
struct cfs_tpfa_res_impl *pimpl) struct cfs_tpfa_res_impl *pimpl)
{ {
int c1, c2, f, i, off, nconn, p; int c1, c2, f, i, off, nconn, p;
@ -631,8 +631,8 @@ assemble_sources(double dt ,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static int static int
assemble_cell_contrib(struct UnstructuredGrid *G, assemble_cell_contrib(struct UnstructuredGrid *G,
int c, int c,
struct cfs_tpfa_res_data *h) struct cfs_tpfa_res_data *h)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
@ -915,15 +915,15 @@ assemble_well_contrib(struct cfs_tpfa_res_wells *wells ,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void static void
compute_fpress(struct UnstructuredGrid *G, compute_fpress(struct UnstructuredGrid *G ,
int np, int np ,
const double *htrans, const double *htrans ,
const double *pmobf, const double *pmobf ,
const double *gravcap_f, const double *gravcap_f,
const double *cpress, const double *cpress ,
const double *fflux, const double *fflux ,
double *fpress, double *fpress ,
double *scratch_f) double *scratch_f)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
int c, i, f; /* , c1, c2; */ int c, i, f; /* , c1, c2; */
@ -972,13 +972,13 @@ compute_fpress(struct UnstructuredGrid *G,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void static void
compute_flux(struct UnstructuredGrid *G, compute_flux(struct UnstructuredGrid *G ,
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) double *fflux )
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
int f, c1, c2, p; int f, c1, c2, p;
@ -1157,17 +1157,17 @@ cfs_tpfa_res_construct(struct UnstructuredGrid *G ,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
void void
cfs_tpfa_res_assemble(struct UnstructuredGrid *G, cfs_tpfa_res_assemble(struct UnstructuredGrid *G ,
double dt, double dt ,
struct cfs_tpfa_res_forces *forces, struct cfs_tpfa_res_forces *forces ,
const double *zc, const double *zc ,
struct compr_quantities_gen *cq, struct compr_quantities_gen *cq ,
const double *trans, const double *trans ,
const double *gravcap_f, const double *gravcap_f,
const double *cpress, const double *cpress ,
const double *wpress, const double *wpress ,
const double *porevol, const double *porevol ,
struct cfs_tpfa_res_data *h) struct cfs_tpfa_res_data *h )
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
int res_is_neumann, well_is_neumann, c, np2; int res_is_neumann, well_is_neumann, c, np2;
@ -1215,7 +1215,7 @@ cfs_tpfa_res_assemble(struct UnstructuredGrid *G,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
void void
cfs_tpfa_res_flux(struct UnstructuredGrid *G , cfs_tpfa_res_flux(struct UnstructuredGrid *G ,
struct cfs_tpfa_res_forces *forces , struct cfs_tpfa_res_forces *forces ,
int np , int np ,
const double *trans , const double *trans ,
@ -1240,15 +1240,15 @@ cfs_tpfa_res_flux(struct UnstructuredGrid *G ,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
void void
cfs_tpfa_res_fpress(struct UnstructuredGrid *G, cfs_tpfa_res_fpress(struct UnstructuredGrid *G ,
int np, int np ,
const double *htrans, const double *htrans ,
const double *pmobf, const double *pmobf ,
const double *gravcap_f, const double *gravcap_f,
struct cfs_tpfa_res_data *h, struct cfs_tpfa_res_data *h ,
const double *cpress, const double *cpress ,
const double *fflux, const double *fflux ,
double *fpress) double *fpress )
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
compute_fpress(G, np, htrans, pmobf, gravcap_f, compute_fpress(G, np, htrans, pmobf, gravcap_f,