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

adding the has_solvent_ flag to StandardWellsSolvent

Browse Source 
flow_solvent is able to run cases without solvent.
This commit is contained in:
Kai Bao 2016-04-21 11:17:39 +02:00
parent 1f64f79f6d
commit cc79dff708
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@ -105,7 +105,7 @@ namespace Opm {
residual_.matbalscale.resize(fluid_.numPhases() + 1, 0.0031); // use the same as gas
stdWells().initSolvent(&solvent_props_, solvent_pos_);
stdWells().initSolvent(&solvent_props_, solvent_pos_, has_solvent_);
}
if (is_miscible_) {
mu_eff_.resize(fluid_.numPhases() + 1, ADB::null());

5
opm/autodiff/StandardWellsSolvent.hpp
View File

@ -39,7 +39,9 @@ namespace Opm {
explicit StandardWellsSolvent(const Wells* wells);
// added the Solvent related
void initSolvent(const SolventPropsAdFromDeck* solvent_props, const int solvent_pos);
void initSolvent(const SolventPropsAdFromDeck* solvent_props,
const int solvent_pos,
const bool has_solvent);
template <class SolutionState, class WellState>
void computePropertiesForWellConnectionPressures(const SolutionState& state,
@ -64,6 +66,7 @@ namespace Opm {
protected:
const SolventPropsAdFromDeck* solvent_props_;
int solvent_pos_;
bool has_solvent_;
};

11
opm/autodiff/StandardWellsSolvent_impl.hpp
View File

@ -36,6 +36,7 @@ namespace Opm
: Base(wells_arg)
, solvent_props_(nullptr)
, solvent_pos_(-1)
, has_solvent_(false)
{
}
@ -43,10 +44,14 @@ namespace Opm
void StandardWellsSolvent::initSolvent(const SolventPropsAdFromDeck* solvent_props, const int solvent_pos)
void
StandardWellsSolvent::initSolvent(const SolventPropsAdFromDeck* solvent_props,
const int solvent_pos,
const bool has_solvent)
{
solvent_props_ = solvent_props;
solvent_pos_ = solvent_pos;
has_solvent_ = has_solvent;
}
@ -135,7 +140,7 @@ namespace Opm
Vector bg = fluid.bGas(avg_press_ad, perf_temp, perf_rv, perf_cond, well_cells).value();
Vector rhog = fluid.surfaceDensity(pu.phase_pos[BlackoilPhases::Vapour], well_cells);
// to handle solvent related
{
if (has_solvent_) {
const Vector bs = solvent_props_->bSolvent(avg_press_ad,well_cells).value();
//const V bs_eff = subset(rq_[solvent_pos_].b,well_cells).value();
@ -205,7 +210,7 @@ namespace Opm
{
Base::extractWellPerfProperties(state, rq, np, fluid, active, mob_perfcells, b_perfcells);
// handle the solvent related
{
if (has_solvent_) {
int gas_pos = fluid.phaseUsage().phase_pos[Gas];
const std::vector<int>& well_cells = wellOps().well_cells;
const int nperf = well_cells.size();