OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some warnings

Browse Source
This commit is contained in:
Kjetil Olsen Lye 2012-02-27 17:46:06 +01:00
parent f4df7aa1bd
commit c06401ef5b
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,13 +134,12 @@ impl_allocate(struct UnstructuredGrid *G ,
int np ) int np )
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
size_t nnu, ngconn, nwperf; size_t nnu, nwperf;
struct cfs_tpfa_res_impl *new; struct cfs_tpfa_res_impl *new;
size_t ddata_sz; size_t ddata_sz;
nnu = G->number_of_cells; nnu = G->number_of_cells;
ngconn = G->cell_facepos[ G->number_of_cells ];
nwperf = 0; nwperf = 0;
if (wconn != NULL) { if (wconn != NULL) {
@ -536,12 +535,10 @@ compute_cell_contrib(struct UnstructuredGrid *G ,
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, np2, p; int c1, c2, f, i, off, nconn, p;
MAT_SIZE_T nrhs; MAT_SIZE_T nrhs;
double s, dF1, dF2, *dv, *dv1, *dv2; double s, dF1, dF2, *dv, *dv1, *dv2;
np2 = np * np;
nconn = init_cell_contrib(G, c, np, pvol, dt, z, pimpl); nconn = init_cell_contrib(G, c, np, pvol, dt, z, pimpl);
nrhs = 1 + (1 + 2)*nconn; /* [z, Af*v, Af*dv] */ nrhs = 1 + (1 + 2)*nconn; /* [z, Af*v, Af*dv] */
@ -627,9 +624,6 @@ assemble_cell_contrib(struct UnstructuredGrid *G,
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
int c1, c2, i, f, j1, j2, off; int c1, c2, i, f, j1, j2, off;
int is_neumann;
is_neumann = 1;
j1 = csrmatrix_elm_index(c, c, h->J); j1 = csrmatrix_elm_index(c, c, h->J);
@ -1061,7 +1055,7 @@ cfs_tpfa_res_construct(struct UnstructuredGrid *G ,
int nphases) int nphases)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
size_t nc, nf, nwperf, ngconn; size_t nf, nwperf;
struct cfs_tpfa_res_data *h; struct cfs_tpfa_res_data *h;
h = malloc(1 * sizeof *h); h = malloc(1 * sizeof *h);
@ -1077,10 +1071,8 @@ cfs_tpfa_res_construct(struct UnstructuredGrid *G ,
} }
if (h != NULL) { if (h != NULL) {
nc = G->number_of_cells;
nf = G->number_of_faces; nf = G->number_of_faces;
nwperf = 0; nwperf = 0;
ngconn = G->cell_facepos[nc];
if (wconn != NULL) { if (wconn != NULL) {
nwperf = wconn->well_connpos[ wconn->number_of_wells ]; nwperf = wconn->well_connpos[ wconn->number_of_wells ];

2
opm/core/transport/reorder/TransportModelTwophase.cpp
View File

@ -355,7 +355,6 @@ namespace Opm
s0[i] = saturation_[cell]; s0[i] = saturation_[cell];
} }
do { do {
int max_change_cell = -1;
max_s_change = 0.0; max_s_change = 0.0;
for (int i = 0; i < num_cells; ++i) { for (int i = 0; i < num_cells; ++i) {
const int cell = cells[i]; const int cell = cells[i];
@ -365,7 +364,6 @@ namespace Opm
double s_change = std::fabs(saturation_[cell] - old_s); double s_change = std::fabs(saturation_[cell] - old_s);
// std::cout << "cell = " << cell << " delta s = " << s_change << std::endl; // std::cout << "cell = " << cell << " delta s = " << s_change << std::endl;
if (max_s_change < s_change) { if (max_s_change < s_change) {
max_change_cell = cell;
max_s_change = s_change; max_s_change = s_change;
} }
} }