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

Merge from jrn.

Browse Source
This commit is contained in:
Bård Skaflestad 2010-11-08 14:13:09 +01:00
commit 80f771d674
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mimetic.c
View File

@ -26,7 +26,7 @@
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
void void
mim_ip_simple_all(int ncells, int d, int max_nconn, int *ncf, mim_ip_simple_all(int ncells, int d, int max_nconn,
int *pconn, int *conn, int *pconn, int *conn,
int *fneighbour, double *fcentroid, double *fnormal, int *fneighbour, double *fcentroid, double *fnormal,
double *farea, double *ccentroid, double *cvol, double *farea, double *ccentroid, double *cvol,
@ -53,23 +53,21 @@ mim_ip_simple_all(int ncells, int d, int max_nconn, int *ncf,
cc[j] = ccentroid[j + c*d]; cc[j] = ccentroid[j + c*d];
} }
nf = ncf[c]; nconn = pconn[c + 1] - pconn[c];
for (i = 0; i < nf; i++) { for (i = 0; i < nconn; i++) {
f = conn[pconn[c] + i]; f = conn[pconn[c] + i];
s = 2.0*(fneighbour[2 * f] == c) - 1.0; s = 2.0*(fneighbour[2 * f] == c) - 1.0;
A[i] = farea[f]; A[i] = farea[f];
for (j = 0; j < d; j++) { for (j = 0; j < d; j++) {
C[i + j*nf] = fcentroid [j + f*d] - cc[j]; C[i + j*nconn] = fcentroid [j + f*d] - cc[j];
N[i + j*nf] = s * fnormal[j + f*d]; N[i + j*nconn] = s * fnormal[j + f*d];
} }
} }
nconn = pconn[c + 1] - pconn[c]; mim_ip_simple(nconn, nconn, d, cvol[c], &perm[c * d * d],
mim_ip_simple(nf, nconn, d, cvol[c], &perm[c * d * d],
C, A, N, &Binv[fpos2], work, lwork); C, A, N, &Binv[fpos2], work, lwork);
fpos2 += nconn * nconn; fpos2 += nconn * nconn;

2
src/mimetic.h
View File

@ -75,7 +75,7 @@ void mim_ip_simple(int nf, int nconn, int d,
* stored. Its size shall be equal to \f$\sum_i * stored. Its size shall be equal to \f$\sum_i
* n_i^2\f$. * n_i^2\f$.
*/ */
void mim_ip_simple_all(int ncells, int d, int max_ncf, int *ncf, void mim_ip_simple_all(int ncells, int d, int max_ncf,
int *pconn, int *conn, int *pconn, int *conn,
int *fneighbour, double *fcentroid, double *fnormal, int *fneighbour, double *fcentroid, double *fnormal,
double *farea, double *ccentroid, double *cvol, double *farea, double *ccentroid, double *cvol,