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

Renamed rq_.head to rq_.dh, since it is used for head differences.

Browse Source 
Also moved multiplication with transmissibilities so that dh does not
include them (so it really is the head difference).
This commit is contained in:
Atgeirr Flø Rasmussen
2015-05-26 16:33:00 +02:00
parent 153c091aef
commit 3246fd479d
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilModelBase.hpp
View File

@@ -216,7 +216,7 @@ namespace Opm {
std::vector<ADB> accum; // Accumulations std::vector<ADB> accum; // Accumulations
ADB mflux; // Mass flux (surface conditions) ADB mflux; // Mass flux (surface conditions)
ADB b; // Reciprocal FVF ADB b; // Reciprocal FVF
ADB head; // Pressure drop across int. interfaces ADB dh; // Pressure drop across int. interfaces
ADB mob; // Phase mobility (per cell) ADB mob; // Phase mobility (per cell)
}; };

21
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@@ -286,7 +286,7 @@ namespace detail {
: accum(2, ADB::null()) : accum(2, ADB::null())
, mflux( ADB::null()) , mflux( ADB::null())
, b ( ADB::null()) , b ( ADB::null())
, head ( ADB::null()) , dh ( ADB::null())
, mob ( ADB::null()) , mob ( ADB::null())
{ {
} }
@@ -770,11 +770,11 @@ namespace detail {
const int pg = fluid_.phaseUsage().phase_pos[ Gas ]; const int pg = fluid_.phaseUsage().phase_pos[ Gas ];
const UpwindSelector<double> upwindOil(grid_, ops_, const UpwindSelector<double> upwindOil(grid_, ops_,
rq_[po].head.value()); rq_[po].dh.value());
const ADB rs_face = upwindOil.select(state.rs); const ADB rs_face = upwindOil.select(state.rs);
const UpwindSelector<double> upwindGas(grid_, ops_, const UpwindSelector<double> upwindGas(grid_, ops_,
rq_[pg].head.value()); rq_[pg].dh.value());
const ADB rv_face = upwindGas.select(state.rv); const ADB rv_face = upwindGas.select(state.rv);
residual_.material_balance_eq[ pg ] += ops_.div * (rs_face * rq_[po].mflux); residual_.material_balance_eq[ pg ] += ops_.div * (rs_face * rq_[po].mflux);
@@ -1606,18 +1606,17 @@ namespace detail {
// Compute head differentials. Gravity potential is done using the face average as in eclipse and MRST. // Compute head differentials. Gravity potential is done using the face average as in eclipse and MRST.
const ADB rho = fluidDensity(canonicalPhaseIdx, phasePressure, state.temperature, state.rs, state.rv, cond, cells_); const ADB rho = fluidDensity(canonicalPhaseIdx, phasePressure, state.temperature, state.rs, state.rv, cond, cells_);
const ADB rhoavg = ops_.caver * rho; const ADB rhoavg = ops_.caver * rho;
ADB dp = ops_.ngrad * phasePressure - geo_.gravity()[2] * (rhoavg * (ops_.ngrad * geo_.z().matrix())); rq_[ actph ].dh = ops_.ngrad * phasePressure - geo_.gravity()[2] * (rhoavg * (ops_.ngrad * geo_.z().matrix()));
if (use_threshold_pressure_) { if (use_threshold_pressure_) {
applyThresholdPressures(dp); applyThresholdPressures(rq_[ actph ].dh);
} }
ADB& head = rq_[ actph ].head;
head = transi*dp;
// Compute phase fluxes with upwinding of formation value factor and mobility. // Compute phase fluxes with upwinding of formation value factor and mobility.
UpwindSelector<double> upwind(grid_, ops_, head.value()); const ADB& b = rq_[ actph ].b;
const ADB& b = rq_[ actph ].b; const ADB& mob = rq_[ actph ].mob;
const ADB& mob = rq_[ actph ].mob; const ADB& dh = rq_[ actph ].dh;
rq_[ actph ].mflux = upwind.select(b * mob) * head; UpwindSelector<double> upwind(grid_, ops_, dh.value());
rq_[ actph ].mflux = upwind.select(b * mob) * transi * dh;
} }