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

Added ifs_tpfa_assemble_comprock() to handle compressible rock cases.

Browse Source 
This allows us to remove the hack from IncompTpfa.cpp.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-04-25 15:00:28 +02:00
parent ea0df38468
commit b107180272
3 changed files with 110 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
opm/core/pressure/IncompTpfa.cpp
View File

@ -208,27 +208,11 @@ namespace Opm
F.totmob = &totmob[0];
F.wdp = &wdp[0];
ifs_tpfa_assemble(gg, &F, &trans_[0], &gpress_omegaweighted_[0], h_);
// TODO: this is a hack, it would be better to handle this in a
// (variant of) ifs_tpfa_assemble().
if (!rock_comp.empty()) {
// We must compensate for adjustment made in ifs_tpfa_assemble()
// to make the system nonsingular.
h_->A->sa[0] *= 0.5;
// The extra term of the equation is
//
// porevol*rock_comp*(p - p0)/dt.
//
// The p part goes on the diagonal, the p0 on the rhs.
for (int c = 0; c < gg->number_of_cells; ++c) {
// Find diagonal
size_t j = csrmatrix_elm_index(c, c, h_->A);
double d = porevol[c] * rock_comp[c] / dt;
h_->A->sa[j] += d;
h_->b[c] += d * pressure[c];
}
if (rock_comp.empty()) {
ifs_tpfa_assemble(gg, &F, &trans_[0], &gpress_omegaweighted_[0], h_);
} else {
ifs_tpfa_assemble_comprock(gg, &F, &trans_[0], &gpress_omegaweighted_[0],
&porevol[0], &rock_comp[0], dt, &pressure[0], h_);
}
linsolver_.solve(h_->A, h_->b, h_->x);

136
opm/core/pressure/tpfa/ifs_tpfa.c
View File

@ -474,48 +474,15 @@ well_solution(const struct UnstructuredGrid *G ,
}
/* ======================================================================
* Public interface below separator.
* ====================================================================== */
/* ---------------------------------------------------------------------- */
struct ifs_tpfa_data *
ifs_tpfa_construct(struct UnstructuredGrid *G,
struct Wells *W)
/* ---------------------------------------------------------------------- */
{
struct ifs_tpfa_data *new;
new = malloc(1 * sizeof *new);
if (new != NULL) {
new->pimpl = impl_allocate(G, W);
new->A = ifs_tpfa_construct_matrix(G, W);
if ((new->pimpl == NULL) || (new->A == NULL)) {
ifs_tpfa_destroy(new);
new = NULL;
}
}
if (new != NULL) {
new->b = new->pimpl->ddata;
new->x = new->b + new->A->m;
new->pimpl->fgrav = new->x + new->A->m;
}
return new;
}
/* ---------------------------------------------------------------------- */
void
ifs_tpfa_assemble(struct UnstructuredGrid *G ,
const struct ifs_tpfa_forces *F ,
const double *trans ,
const double *gpress,
struct ifs_tpfa_data *h )
static int
assemble_incompressible(struct UnstructuredGrid *G ,
const struct ifs_tpfa_forces *F ,
const double *trans ,
const double *gpress,
struct ifs_tpfa_data *h )
/* ---------------------------------------------------------------------- */
{
int c1, c2, c, i, f, j1, j2;
@ -582,9 +549,96 @@ ifs_tpfa_assemble(struct UnstructuredGrid *G ,
}
}
if (res_is_neumann && wells_are_rate) {
return res_is_neumann && wells_are_rate;
}
/* ======================================================================
* Public interface below separator.
* ====================================================================== */
/* ---------------------------------------------------------------------- */
struct ifs_tpfa_data *
ifs_tpfa_construct(struct UnstructuredGrid *G,
struct Wells *W)
/* ---------------------------------------------------------------------- */
{
struct ifs_tpfa_data *new;
new = malloc(1 * sizeof *new);
if (new != NULL) {
new->pimpl = impl_allocate(G, W);
new->A = ifs_tpfa_construct_matrix(G, W);
if ((new->pimpl == NULL) || (new->A == NULL)) {
ifs_tpfa_destroy(new);
new = NULL;
}
}
if (new != NULL) {
new->b = new->pimpl->ddata;
new->x = new->b + new->A->m;
new->pimpl->fgrav = new->x + new->A->m;
}
return new;
}
/* ---------------------------------------------------------------------- */
void
ifs_tpfa_assemble(struct UnstructuredGrid *G ,
const struct ifs_tpfa_forces *F ,
const double *trans ,
const double *gpress,
struct ifs_tpfa_data *h )
/* ---------------------------------------------------------------------- */
{
int system_singular;
system_singular = assemble_incompressible(G, F, trans, gpress, h);
if (system_singular) {
/* Remove zero eigenvalue associated to constant pressure */
h->A->sa[0] *= 2;
h->A->sa[0] *= 2.0;
}
}
/* ---------------------------------------------------------------------- */
void
ifs_tpfa_assemble_comprock(struct UnstructuredGrid *G ,
const struct ifs_tpfa_forces *F ,
const double *trans ,
const double *gpress ,
const double *porevol ,
const double *rock_comp,
const double dt ,
const double *pressure ,
struct ifs_tpfa_data *h )
/* ---------------------------------------------------------------------- */
{
int c;
size_t j;
double d;
/* We don't need the return value, since the matrix always is nonsingular. */
assemble_incompressible(G, F, trans, gpress, h);
/*
* The extra term of the equation is
*
* porevol*rock_comp*(p - p0)/dt.
*
* The p part goes on the diagonal, the p0 on the rhs.
*/
for (c = 0; c < G->number_of_cells; ++c) {
j = csrmatrix_elm_index(c, c, h->A);
d = porevol[c] * rock_comp[c] / dt;
h->A->sa[j] += d;
h->b[c] += d * pressure[c];
}
}

10
opm/core/pressure/tpfa/ifs_tpfa.h
View File

@ -69,6 +69,16 @@ ifs_tpfa_assemble(struct UnstructuredGrid *G ,
struct ifs_tpfa_data *h );
void
ifs_tpfa_assemble_comprock(struct UnstructuredGrid *G ,
const struct ifs_tpfa_forces *F ,
const double *trans ,
const double *gpress ,
const double *porevol ,
const double *rock_comp,
const double dt ,
const double *pressure ,
struct ifs_tpfa_data *h );
void
ifs_tpfa_press_flux(struct UnstructuredGrid *G ,
const struct ifs_tpfa_forces *F ,
const double *trans,