OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 10:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixing the mistakes in the code due to rebasing.

Browse Source
This commit is contained in:
Kai Bao 2017-01-12 16:15:09 +01:00
parent a95977e716
commit 01322b740e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/autodiff/StandardWellsDense.hpp
View File

@ -90,9 +90,6 @@ enum WellVariablePositions {
, well_collection_(well_collection) , well_collection_(well_collection)
, param_(param) , param_(param)
, terminal_output_(terminal_output) , terminal_output_(terminal_output)
, fluid_(nullptr)
, active_(nullptr)
, vfp_properties_(nullptr)
, well_perforation_efficiency_factors_((wells_!=nullptr ? wells_->well_connpos[wells_->number_of_wells] : 0), 1.0) , well_perforation_efficiency_factors_((wells_!=nullptr ? wells_->well_connpos[wells_->number_of_wells] : 0), 1.0)
, well_perforation_densities_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0) , well_perforation_densities_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0)
, well_perforation_pressure_diffs_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0) , well_perforation_pressure_diffs_( wells_ ? wells_arg->well_connpos[wells_arg->number_of_wells] : 0)
@ -546,7 +543,7 @@ enum WellVariablePositions {
void void
computeWellFlux(const int& w, const double& Tw, const intensiveQuants& intQuants, const EvalWell& bhp, const double& cdp, const bool& allow_cf, std::vector<EvalWell>& cq_s) const computeWellFlux(const int& w, const double& Tw, const intensiveQuants& intQuants, const EvalWell& bhp, const double& cdp, const bool& allow_cf, std::vector<EvalWell>& cq_s) const
{ {
const Opm::PhaseUsage& pu = fluid_->phaseUsage(); const Opm::PhaseUsage& pu = phase_usage_;
const int np = wells().number_of_phases; const int np = wells().number_of_phases;
std::vector<EvalWell> cmix_s(np,0.0); std::vector<EvalWell> cmix_s(np,0.0);
for (int phase = 0; phase < np; ++phase) { for (int phase = 0; phase < np; ++phase) {
@ -1551,15 +1548,15 @@ enum WellVariablePositions {
double liquid = 0.0; double liquid = 0.0;
double vapour = 0.0; double vapour = 0.0;
const Opm::PhaseUsage& pu = fluid_->phaseUsage(); const Opm::PhaseUsage& pu = phase_usage_;
if ((*active_)[ Water ]) { if (active_[ Water ]) {
aqua = well_state.wellRates()[w*np + pu.phase_pos[ Water ] ]; aqua = well_state.wellRates()[w*np + pu.phase_pos[ Water ] ];
} }
if ((*active_)[ Oil ]) { if (active_[ Oil ]) {
liquid = well_state.wellRates()[w*np + pu.phase_pos[ Oil ] ]; liquid = well_state.wellRates()[w*np + pu.phase_pos[ Oil ] ];
} }
if ((*active_)[ Gas ]) { if (active_[ Gas ]) {
vapour = well_state.wellRates()[w*np + pu.phase_pos[ Gas ] ]; vapour = well_state.wellRates()[w*np + pu.phase_pos[ Gas ] ];
} }