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

small improvements in StandardWell

Browse Source 
there is not functional change.
This commit is contained in:
Kai Bao 2017-09-08 11:06:34 +02:00
parent 1e32b40837
commit 7b873d97c9
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/autodiff/StandardWell.hpp
View File

@ -165,7 +165,6 @@ namespace Opm
using Base::vfp_properties_; using Base::vfp_properties_;
using Base::gravity_; using Base::gravity_;
using Base::well_efficiency_factor_; using Base::well_efficiency_factor_;
using Base::phase_usage_;
using Base::first_perf_; using Base::first_perf_;
using Base::ref_depth_; using Base::ref_depth_;
using Base::perf_depth_; using Base::perf_depth_;

24
opm/autodiff/StandardWell_impl.hpp
View File

@ -400,14 +400,14 @@ namespace Opm
for (int componentIdx = 0; componentIdx < numComp; ++componentIdx) { for (int componentIdx = 0; componentIdx < numComp; ++componentIdx) {
cmix_s[componentIdx] = wellSurfaceVolumeFraction(componentIdx); cmix_s[componentIdx] = wellSurfaceVolumeFraction(componentIdx);
} }
auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
EvalWell pressure = extendEval(fs.pressure(FluidSystem::oilPhaseIdx)); const EvalWell pressure = extendEval(fs.pressure(FluidSystem::oilPhaseIdx));
EvalWell rs = extendEval(fs.Rs()); const EvalWell rs = extendEval(fs.Rs());
EvalWell rv = extendEval(fs.Rv()); const EvalWell rv = extendEval(fs.Rv());
std::vector<EvalWell> b_perfcells_dense(numComp, 0.0); std::vector<EvalWell> b_perfcells_dense(numComp, 0.0);
for (int phase = 0; phase < np; ++phase) { for (int phase = 0; phase < np; ++phase) {
int ebosPhaseIdx = flowPhaseToEbosPhaseIdx(phase); const int ebosPhaseIdx = flowPhaseToEbosPhaseIdx(phase);
b_perfcells_dense[phase] = extendEval(fs.invB(ebosPhaseIdx)); b_perfcells_dense[phase] = extendEval(fs.invB(ebosPhaseIdx));
} }
if (has_solvent) { if (has_solvent) {
@ -415,8 +415,8 @@ namespace Opm
} }
// Pressure drawdown (also used to determine direction of flow) // Pressure drawdown (also used to determine direction of flow)
EvalWell well_pressure = bhp + cdp; const EvalWell well_pressure = bhp + cdp;
EvalWell drawdown = pressure - well_pressure; const EvalWell drawdown = pressure - well_pressure;
// producing perforations // producing perforations
if ( drawdown.value() > 0 ) { if ( drawdown.value() > 0 ) {
@ -1126,7 +1126,7 @@ namespace Opm
const int nperf = number_of_perforations_; const int nperf = number_of_perforations_;
// TODO: can make this a member? // TODO: can make this a member?
const int numComp = numComponents(); const int numComp = numComponents();
const PhaseUsage& pu = *phase_usage_; const PhaseUsage& pu = phaseUsage();
b_perf.resize(nperf*numComp); b_perf.resize(nperf*numComp);
surf_dens_perf.resize(nperf*numComp); surf_dens_perf.resize(nperf*numComp);
const int w = index_of_well_; const int w = index_of_well_;
@ -1234,7 +1234,7 @@ namespace Opm
const int np = number_of_phases_; const int np = number_of_phases_;
const int nperf = number_of_perforations_; const int nperf = number_of_perforations_;
const int num_comp = numComponents(); const int num_comp = numComponents();
const PhaseUsage* phase_usage = phase_usage_; const PhaseUsage& phase_usage = phaseUsage();
// 1. Compute the flow (in surface volume units for each // 1. Compute the flow (in surface volume units for each
// component) exiting up the wellbore from each perforation, // component) exiting up the wellbore from each perforation,
@ -1262,8 +1262,8 @@ namespace Opm
// absolute values of the surface rates divided by their sum. // absolute values of the surface rates divided by their sum.
// Then compute volume ratios (formation factors) for each perforation. // Then compute volume ratios (formation factors) for each perforation.
// Finally compute densities for the segments associated with each perforation. // Finally compute densities for the segments associated with each perforation.
const int gaspos = phase_usage->phase_pos[BlackoilPhases::Vapour]; const int gaspos = phase_usage.phase_pos[BlackoilPhases::Vapour];
const int oilpos = phase_usage->phase_pos[BlackoilPhases::Liquid]; const int oilpos = phase_usage.phase_pos[BlackoilPhases::Liquid];
std::vector<double> mix(num_comp,0.0); std::vector<double> mix(num_comp,0.0);
std::vector<double> x(num_comp); std::vector<double> x(num_comp);
std::vector<double> surf_dens(num_comp); std::vector<double> surf_dens(num_comp);
@ -1673,7 +1673,7 @@ namespace Opm
for (int ctrl_index = 0; ctrl_index < nwc; ++ctrl_index) { for (int ctrl_index = 0; ctrl_index < nwc; ++ctrl_index) {
if (well_controls_iget_type(well_controls_, ctrl_index) == THP) { if (well_controls_iget_type(well_controls_, ctrl_index) == THP) {
const Opm::PhaseUsage& pu = *phase_usage_; const Opm::PhaseUsage& pu = phaseUsage();
std::vector<double> rates(3, 0.0); std::vector<double> rates(3, 0.0);
if (active()[ Water ]) { if (active()[ Water ]) {

4
opm/autodiff/WellInterface_impl.hpp
View File

@ -471,7 +471,7 @@ namespace Opm
checkRateEconLimits(const WellEconProductionLimits& econ_production_limits, checkRateEconLimits(const WellEconProductionLimits& econ_production_limits,
const WellState& well_state) const const WellState& well_state) const
{ {
const Opm::PhaseUsage& pu = *phase_usage_; const Opm::PhaseUsage& pu = phaseUsage();
const int np = number_of_phases_; const int np = number_of_phases_;
if (econ_production_limits.onMinOilRate()) { if (econ_production_limits.onMinOilRate()) {
@ -528,7 +528,7 @@ namespace Opm
double violation_extent = -1.0; double violation_extent = -1.0;
const int np = number_of_phases_; const int np = number_of_phases_;
const Opm::PhaseUsage& pu = *phase_usage_; const Opm::PhaseUsage& pu = phaseUsage();
const int well_number = index_of_well_; const int well_number = index_of_well_;
assert(active()[Oil]); assert(active()[Oil]);