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

Some cleaning

Browse Source
This commit is contained in:
Tor Harald Sandve
2015-12-15 13:56:17 +01:00
parent 13117153a9
commit a38964c641
1 changed files with 31 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@@ -575,9 +575,9 @@ namespace Opm {
const SolutionState& state) const SolutionState& state)
{ {
// make a copy to make it possible to modify it
ADB kr_mod = kr; ADB kr_mod = kr;
if (has_solvent_) { if (has_solvent_) {
const int nc = Opm::UgGridHelpers::numCells(grid_); const int nc = Opm::UgGridHelpers::numCells(grid_);
const Opm::PhaseUsage& pu = fluid_.phaseUsage(); const Opm::PhaseUsage& pu = fluid_.phaseUsage();
const ADB zero = ADB::constant(V::Zero(nc)); const ADB zero = ADB::constant(V::Zero(nc));
@@ -589,7 +589,6 @@ namespace Opm {
? state.saturation[ pu.phase_pos[ Gas ] ] ? state.saturation[ pu.phase_pos[ Gas ] ]
: zero); : zero);
Selector<double> zero_selector(ss.value() + sg.value(), Selector<double>::Zero); Selector<double> zero_selector(ss.value() + sg.value(), Selector<double>::Zero);
const ADB F_solvent = zero_selector.select(zero, ss / (ss + sg)); const ADB F_solvent = zero_selector.select(zero, ss / (ss + sg));
@@ -632,72 +631,45 @@ namespace Opm {
const ADB& rv , const ADB& rv ,
const std::vector<PhasePresence>& cond) const const std::vector<PhasePresence>& cond) const
{ {
if (!is_miscible_) { const Opm::PhaseUsage& pu = fluid_.phaseUsage();
switch (phase) { if (phase == Solvent) {
case Water: if (!is_miscible_) {
return fluid_.muWat(p, temp, cells_); return solvent_props_.muSolvent(p, cells_);
case Oil: } else {
return fluid_.muOil(p, temp, rs, cond, cells_); return mu_eff_[solvent_pos_];
case Gas:
return fluid_.muGas(p, temp, rv, cond, cells_);
case Solvent:
return solvent_props_.muSolvent(p,cells_);
default:
OPM_THROW(std::runtime_error, "Unknown phase index " << phase);
} }
} else { } else {
const Opm::PhaseUsage& pu = fluid_.phaseUsage(); if (!is_miscible_) {
switch (phase) { return Base::fluidViscosity(phase, p, temp, rs, rv, cond);
case Water: } else {
case Oil:
case Gas:
return mu_eff_[pu.phase_pos[ phase ]]; return mu_eff_[pu.phase_pos[ phase ]];
case Solvent:
return mu_eff_[solvent_pos_];
default:
OPM_THROW(std::runtime_error, "Unknown phase index " << phase);
} }
} }
} }
template <class Grid> template <class Grid>
ADB ADB
BlackoilSolventModel<Grid>::fluidReciprocFVF(const int phase, BlackoilSolventModel<Grid>::fluidReciprocFVF(const int phase,
const ADB& p , const ADB& p ,
const ADB& temp , const ADB& temp ,
const ADB& rs , const ADB& rs ,
const ADB& rv , const ADB& rv ,
const std::vector<PhasePresence>& cond) const const std::vector<PhasePresence>& cond) const
{ {
if (!is_miscible_) { const Opm::PhaseUsage& pu = fluid_.phaseUsage();
switch (phase) { if (phase == Solvent) {
case Water: if (!is_miscible_) {
return fluid_.bWat(p, temp, cells_);
case Oil:
return fluid_.bOil(p, temp, rs, cond, cells_);
case Gas:
return fluid_.bGas(p, temp, rv, cond, cells_);
case Solvent:
return solvent_props_.bSolvent(p, cells_); return solvent_props_.bSolvent(p, cells_);
default: } else {
OPM_THROW(std::runtime_error, "Unknown phase index " << phase);
}
} else {
const Opm::PhaseUsage& pu = fluid_.phaseUsage();
switch (phase) {
case Water:
case Oil:
case Gas:
return b_eff_[pu.phase_pos[ phase ]];
case Solvent:
return b_eff_[solvent_pos_]; return b_eff_[solvent_pos_];
default: }
OPM_THROW(std::runtime_error, "Unknown phase index " << phase);
} else {
if (!is_miscible_) {
return Base::fluidReciprocFVF(phase, p, temp, rs, rv, cond);
} else {
return b_eff_[pu.phase_pos[ phase ]];
} }
} }
} }
@@ -710,19 +682,10 @@ namespace Opm {
const ADB& rv) const const ADB& rv) const
{ {
if (phase == Solvent && has_solvent_) { if (phase == Solvent && has_solvent_) {
return solvent_props_.solventSurfaceDensity(cells_) * rq_[solvent_pos_].b; return solvent_props_.solventSurfaceDensity(cells_) * b;
} else {
return Base::fluidDensity(phase, b, rs, rv);
} }
const V& rhos = fluid_.surfaceDensity(phase, cells_);
const Opm::PhaseUsage& pu = fluid_.phaseUsage();
ADB rho = rhos * b;
if (phase == Oil && active_[Gas]) {
rho += fluid_.surfaceDensity(pu.phase_pos[ Gas ], cells_) * rs * b;
}
if (phase == Gas && active_[Oil]) {
rho += fluid_.surfaceDensity(pu.phase_pos[ Oil ], cells_) * rv * b;
}
return rho;
} }
template <class Grid> template <class Grid>
@@ -798,7 +761,7 @@ namespace Opm {
void void
BlackoilSolventModel<Grid>::calculateEffectiveProperties(const SolutionState& state) BlackoilSolventModel<Grid>::calculateEffectiveProperties(const SolutionState& state)
{ {
// viscosity // Viscosity
const Opm::PhaseUsage& pu = fluid_.phaseUsage(); const Opm::PhaseUsage& pu = fluid_.phaseUsage();
const int np = fluid_.numPhases(); const int np = fluid_.numPhases();
const int nc = Opm::UgGridHelpers::numCells(grid_); const int nc = Opm::UgGridHelpers::numCells(grid_);