OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Bjørn Spjelkavik 2012-02-27 11:16:41 +01:00
commit 1263c2f50f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/core/utility/cart_grid.c
View File

@ -707,14 +707,14 @@ fill_cart_geometry_2d(struct UnstructuredGrid *G,
/* Faces with x-normal */
for (j=0; j<ny; ++j) {
for (i=0; i<nx+1; ++i) {
*fnormals++ = 1;
dy = y[j + 1] - y[j];
*fnormals++ = dy;
*fnormals++ = 0;
*fcentroids++ = x[i];
*fcentroids++ = (y[j] + y[j + 1]) / 2.0;
dy = y[j + 1] - y[j];
*fareas++ = dy;
}
}
@ -722,14 +722,14 @@ fill_cart_geometry_2d(struct UnstructuredGrid *G,
/* Faces with y-normal */
for (j=0; j<ny+1; ++j) {
for (i=0; i<nx; ++i) {
dx = x[i + 1] - x[i];
*fnormals++ = 0;
*fnormals++ = 1;
*fnormals++ = dx;
*fcentroids++ = (x[i] + x[i + 1]) / 2.0;
*fcentroids++ = y[j];
dx = x[i + 1] - x[i];
*fareas++ = dx;
}
}

6
opm/core/utility/miscUtilities.cpp
View File

@ -65,7 +65,7 @@ namespace Opm
for (int cell = 0; cell < num_cells; ++cell) {
totmob[cell] = 0;
for (int phase = 0; phase < num_phases; ++phase) {
totmob[cell] += kr[2*cell + phase]/mu[phase];
totmob[cell] += kr[num_phases*cell + phase]/mu[phase];
}
}
}
@ -95,14 +95,14 @@ namespace Opm
for (int cell = 0; cell < num_cells; ++cell) {
totmob[cell] = 0.0;
for (int phase = 0; phase < num_phases; ++phase) {
totmob[cell] += kr[2*cell + phase]/mu[phase];
totmob[cell] += kr[num_phases*cell + phase]/mu[phase];
}
}
const double* rho = props.density();
for (int cell = 0; cell < num_cells; ++cell) {
omega[cell] = 0.0;
for (int phase = 0; phase < num_phases; ++phase) {
omega[cell] += rho[phase]*(kr[2*cell + phase]/mu[phase])/totmob[cell];
omega[cell] += rho[phase]*(kr[num_phases*cell + phase]/mu[phase])/totmob[cell];
}
}
}