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

Revert to original (fractional flow) model of perforation fluxes.

Browse Source
This commit is contained in:
Bård Skaflestad 2012-03-20 18:46:54 +01:00
parent fb6d7032bf
commit bf86cd9371
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ namespace Opm
}
}
ifs_tpfa_forces F = { NULL, NULL, 0, NULL, NULL };
ifs_tpfa_forces F = { NULL, NULL, NULL, NULL, NULL };
if (! src.empty()) { F.src = &src[0]; }
F.bc = bcs;
@ -172,7 +172,7 @@ namespace Opm
}
}
ifs_tpfa_forces F = { NULL, NULL, 0, NULL, NULL };
ifs_tpfa_forces F = { NULL, NULL, NULL, NULL, NULL };
if (! src.empty()) { F.src = &src[0]; }
F.bc = bcs;

2
opm/core/pressure/TPFAPressureSolver.hpp
View File

@ -148,9 +148,7 @@ public:
forces_.src = &src[0];
forces_.bc = 0;
forces_.nphase = 0; // Referenced only in models with wells.
forces_.W = 0;
forces_.Wdata = 0;
// Assemble the embedded linear system.
ifs_tpfa_assemble(g, &forces_, &eff_trans_[0], &gpress_[0], data_);

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

@ -30,7 +30,6 @@ struct ifs_tpfa_impl;
struct CSRMatrix;
struct FlowBoundaryConditions;
struct Wells;
struct CompletionData;
struct ifs_tpfa_data {
struct CSRMatrix *A;
@ -49,9 +48,9 @@ struct ifs_tpfa_forces {
const double *src;
const struct FlowBoundaryConditions *bc ;
int nphase; /* for Wdata->phasemob */
const struct Wells *W ;
const struct CompletionData *Wdata ;
const struct Wells *W ;
const double *totmob;
const double *wdp ;
};