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

replacing BlackoilPhases:: with Oil Water Gas in well model

Browse Source 
and also WellStateFullyImplicitBlackoil.

There are more places to do so, while it might be easier to create a
header file for this.
This commit is contained in:
Kai Bao 2017-11-16 11:42:34 +01:00
parent 3d0c6da513
commit 8274fc9275
6 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -32,7 +32,6 @@
#include <opm/autodiff/GridHelpers.hpp> #include <opm/autodiff/GridHelpers.hpp>
#include <opm/autodiff/GeoProps.hpp> #include <opm/autodiff/GeoProps.hpp>
#include <opm/autodiff/BlackoilDetails.hpp> #include <opm/autodiff/BlackoilDetails.hpp>
#include <opm/autodiff/BlackoilModelEnums.hpp>
#include <opm/autodiff/NewtonIterationBlackoilInterface.hpp> #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
#include <opm/autodiff/RateConverter.hpp> #include <opm/autodiff/RateConverter.hpp>

1
opm/autodiff/BlackoilWellModel.hpp
View File

@ -40,7 +40,6 @@
#include <opm/core/simulator/SimulatorReport.hpp> #include <opm/core/simulator/SimulatorReport.hpp>
#include <opm/autodiff/VFPProperties.hpp> #include <opm/autodiff/VFPProperties.hpp>
#include <opm/autodiff/WellHelpers.hpp> #include <opm/autodiff/WellHelpers.hpp>
#include <opm/autodiff/BlackoilModelEnums.hpp>
#include <opm/autodiff/WellDensitySegmented.hpp> #include <opm/autodiff/WellDensitySegmented.hpp>
#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp> #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
#include <opm/autodiff/BlackoilDetails.hpp> #include <opm/autodiff/BlackoilDetails.hpp>

2
opm/autodiff/BlackoilWellModel_impl.hpp
View File

@ -61,7 +61,7 @@ namespace Opm {
dynamic_list_econ_limited_, dynamic_list_econ_limited_,
grid.comm().size() > 1, grid.comm().size() > 1,
defunct_well_names) ); defunct_well_names) );
// Wells are active if they are active wells on at least // Wells are active if they are active wells on at least
// one process. // one process.
wells_active_ = localWellsActive() ? 1 : 0; wells_active_ = localWellsActive() ? 1 : 0;

39
opm/autodiff/MultisegmentWell_impl.hpp
View File

@ -668,22 +668,22 @@ namespace Opm
double sum_kr = 0.; double sum_kr = 0.;
const PhaseUsage& pu = phaseUsage(); const PhaseUsage& pu = phaseUsage();
if (pu.phase_used[BlackoilPhases::Aqua]) { if (pu.phase_used[Water]) {
const int water_pos = pu.phase_pos[BlackoilPhases::Aqua]; const int water_pos = pu.phase_pos[Water];
kr[water_pos] = intQuants.relativePermeability(FluidSystem::waterPhaseIdx).value(); kr[water_pos] = intQuants.relativePermeability(FluidSystem::waterPhaseIdx).value();
sum_kr += kr[water_pos]; sum_kr += kr[water_pos];
density[water_pos] = fs.density(FluidSystem::waterPhaseIdx).value(); density[water_pos] = fs.density(FluidSystem::waterPhaseIdx).value();
} }
if (pu.phase_used[BlackoilPhases::Liquid]) { if (pu.phase_used[Oil]) {
const int oil_pos = pu.phase_pos[BlackoilPhases::Liquid]; const int oil_pos = pu.phase_pos[Oil];
kr[oil_pos] = intQuants.relativePermeability(FluidSystem::oilPhaseIdx).value(); kr[oil_pos] = intQuants.relativePermeability(FluidSystem::oilPhaseIdx).value();
sum_kr += kr[oil_pos]; sum_kr += kr[oil_pos];
density[oil_pos] = fs.density(FluidSystem::oilPhaseIdx).value(); density[oil_pos] = fs.density(FluidSystem::oilPhaseIdx).value();
} }
if (pu.phase_used[BlackoilPhases::Vapour]) { if (pu.phase_used[Gas]) {
const int gas_pos = pu.phase_pos[BlackoilPhases::Vapour]; const int gas_pos = pu.phase_pos[Gas];
kr[gas_pos] = intQuants.relativePermeability(FluidSystem::gasPhaseIdx).value(); kr[gas_pos] = intQuants.relativePermeability(FluidSystem::gasPhaseIdx).value();
sum_kr += kr[gas_pos]; sum_kr += kr[gas_pos];
density[gas_pos] = fs.density(FluidSystem::gasPhaseIdx).value(); density[gas_pos] = fs.density(FluidSystem::gasPhaseIdx).value();
@ -1129,9 +1129,8 @@ namespace Opm
// it is the phase viscosities asked for // it is the phase viscosities asked for
std::vector<EvalWell> visc(number_of_phases_, 0.0); std::vector<EvalWell> visc(number_of_phases_, 0.0);
const EvalWell seg_pressure = getSegmentPressure(seg); const EvalWell seg_pressure = getSegmentPressure(seg);
if (pu.phase_used[BlackoilPhases::Aqua]) { if (pu.phase_used[Water]) {
// TODO: what is the difference between Water and BlackoilPhases::Aqua? const int water_pos = pu.phase_pos[Water];
const int water_pos = pu.phase_pos[BlackoilPhases::Aqua];
b[water_pos] = b[water_pos] =
FluidSystem::waterPvt().inverseFormationVolumeFactor(pvt_region_index, temperature, seg_pressure); FluidSystem::waterPvt().inverseFormationVolumeFactor(pvt_region_index, temperature, seg_pressure);
visc[water_pos] = visc[water_pos] =
@ -1140,10 +1139,10 @@ namespace Opm
EvalWell rv(0.0); EvalWell rv(0.0);
// gas phase // gas phase
if (pu.phase_used[BlackoilPhases::Vapour]) { if (pu.phase_used[Gas]) {
const int gaspos = pu.phase_pos[BlackoilPhases::Vapour]; const int gaspos = pu.phase_pos[Gas];
if (pu.phase_used[BlackoilPhases::Liquid]) { if (pu.phase_used[Oil]) {
const int oilpos = pu.phase_pos[BlackoilPhases::Liquid]; const int oilpos = pu.phase_pos[Oil];
const EvalWell rvmax = FluidSystem::gasPvt().saturatedOilVaporizationFactor(pvt_region_index, temperature, seg_pressure); const EvalWell rvmax = FluidSystem::gasPvt().saturatedOilVaporizationFactor(pvt_region_index, temperature, seg_pressure);
if (mix_s[oilpos] > 0.0) { if (mix_s[oilpos] > 0.0) {
if (mix_s[gaspos] > 0.0) { if (mix_s[gaspos] > 0.0) {
@ -1174,10 +1173,10 @@ namespace Opm
EvalWell rs(0.0); EvalWell rs(0.0);
// oil phase // oil phase
if (pu.phase_used[BlackoilPhases::Liquid]) { if (pu.phase_used[Oil]) {
const int oilpos = pu.phase_pos[BlackoilPhases::Liquid]; const int oilpos = pu.phase_pos[Oil];
if (pu.phase_used[BlackoilPhases::Liquid]) { if (pu.phase_used[Oil]) {
const int gaspos = pu.phase_pos[BlackoilPhases::Vapour]; const int gaspos = pu.phase_pos[Gas];
const EvalWell rsmax = FluidSystem::oilPvt().saturatedGasDissolutionFactor(pvt_region_index, temperature, seg_pressure); const EvalWell rsmax = FluidSystem::oilPvt().saturatedGasDissolutionFactor(pvt_region_index, temperature, seg_pressure);
if (mix_s[gaspos] > 0.0) { if (mix_s[gaspos] > 0.0) {
if (mix_s[oilpos] > 0.0) { if (mix_s[oilpos] > 0.0) {
@ -1207,9 +1206,9 @@ namespace Opm
} }
std::vector<EvalWell> mix(mix_s); std::vector<EvalWell> mix(mix_s);
if (pu.phase_used[BlackoilPhases::Liquid] && pu.phase_used[BlackoilPhases::Vapour]) { if (pu.phase_used[Oil] && pu.phase_used[Gas]) {
const int gaspos = pu.phase_pos[BlackoilPhases::Vapour]; const int gaspos = pu.phase_pos[Gas];
const int oilpos = pu.phase_pos[BlackoilPhases::Liquid]; const int oilpos = pu.phase_pos[Oil];
if (rs != 0.0) { // rs > 0.0? if (rs != 0.0) { // rs > 0.0?
mix[gaspos] = (mix_s[gaspos] - mix_s[oilpos] * rs) / (1. - rs * rv); mix[gaspos] = (mix_s[gaspos] - mix_s[oilpos] * rs) / (1. - rs * rv);
} }

30
opm/autodiff/StandardWell_impl.hpp
View File

@ -1133,7 +1133,7 @@ namespace Opm
const int w = index_of_well_; const int w = index_of_well_;
//rs and rv are only used if both oil and gas is present //rs and rv are only used if both oil and gas is present
if (pu.phase_used[BlackoilPhases::Vapour] && pu.phase_used[BlackoilPhases::Liquid]) { if (pu.phase_used[Gas] && pu.phase_used[Oil]) {
rsmax_perf.resize(nperf); rsmax_perf.resize(nperf);
rvmax_perf.resize(nperf); rvmax_perf.resize(nperf);
} }
@ -1150,17 +1150,17 @@ namespace Opm
const double p_avg = (xw.perfPress()[first_perf_ + perf] + p_above)/2; const double p_avg = (xw.perfPress()[first_perf_ + perf] + p_above)/2;
const double temperature = fs.temperature(FluidSystem::oilPhaseIdx).value(); const double temperature = fs.temperature(FluidSystem::oilPhaseIdx).value();
if (pu.phase_used[BlackoilPhases::Aqua]) { if (pu.phase_used[Water]) {
b_perf[ pu.phase_pos[BlackoilPhases::Aqua] + perf * numComp] = b_perf[ pu.phase_pos[Water] + perf * numComp] =
FluidSystem::waterPvt().inverseFormationVolumeFactor(fs.pvtRegionIndex(), temperature, p_avg); FluidSystem::waterPvt().inverseFormationVolumeFactor(fs.pvtRegionIndex(), temperature, p_avg);
} }
if (pu.phase_used[BlackoilPhases::Vapour]) { if (pu.phase_used[Gas]) {
const int gaspos = pu.phase_pos[BlackoilPhases::Vapour] + perf * numComp; const int gaspos = pu.phase_pos[Gas] + perf * numComp;
const int gaspos_well = pu.phase_pos[BlackoilPhases::Vapour] + w * pu.num_phases; const int gaspos_well = pu.phase_pos[Gas] + w * pu.num_phases;
if (pu.phase_used[BlackoilPhases::Liquid]) { if (pu.phase_used[Oil]) {
const int oilpos_well = pu.phase_pos[BlackoilPhases::Liquid] + w * pu.num_phases; const int oilpos_well = pu.phase_pos[Oil] + w * pu.num_phases;
const double oilrate = std::abs(xw.wellRates()[oilpos_well]); //in order to handle negative rates in producers const double oilrate = std::abs(xw.wellRates()[oilpos_well]); //in order to handle negative rates in producers
rvmax_perf[perf] = FluidSystem::gasPvt().saturatedOilVaporizationFactor(fs.pvtRegionIndex(), temperature, p_avg); rvmax_perf[perf] = FluidSystem::gasPvt().saturatedOilVaporizationFactor(fs.pvtRegionIndex(), temperature, p_avg);
if (oilrate > 0) { if (oilrate > 0) {
@ -1182,12 +1182,12 @@ namespace Opm
} }
} }
if (pu.phase_used[BlackoilPhases::Liquid]) { if (pu.phase_used[Oil]) {
const int oilpos = pu.phase_pos[BlackoilPhases::Liquid] + perf * numComp; const int oilpos = pu.phase_pos[Oil] + perf * numComp;
const int oilpos_well = pu.phase_pos[BlackoilPhases::Liquid] + w * pu.num_phases; const int oilpos_well = pu.phase_pos[Oil] + w * pu.num_phases;
if (pu.phase_used[BlackoilPhases::Vapour]) { if (pu.phase_used[Gas]) {
rsmax_perf[perf] = FluidSystem::oilPvt().saturatedGasDissolutionFactor(fs.pvtRegionIndex(), temperature, p_avg); rsmax_perf[perf] = FluidSystem::oilPvt().saturatedGasDissolutionFactor(fs.pvtRegionIndex(), temperature, p_avg);
const int gaspos_well = pu.phase_pos[BlackoilPhases::Vapour] + w * pu.num_phases; const int gaspos_well = pu.phase_pos[Gas] + w * pu.num_phases;
const double gasrate = std::abs(xw.wellRates()[gaspos_well]) - xw.solventWellRate(w); const double gasrate = std::abs(xw.wellRates()[gaspos_well]) - xw.solventWellRate(w);
if (gasrate > 0) { if (gasrate > 0) {
const double oilrate = std::abs(xw.wellRates()[oilpos_well]); const double oilrate = std::abs(xw.wellRates()[oilpos_well]);
@ -1263,8 +1263,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[Gas];
const int oilpos = phase_usage.phase_pos[BlackoilPhases::Liquid]; const int oilpos = phase_usage.phase_pos[Oil];
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);

21
opm/autodiff/WellStateFullyImplicitBlackoil.hpp
View File

@ -47,6 +47,11 @@ namespace Opm
public: public:
typedef BaseType :: WellMapType WellMapType; typedef BaseType :: WellMapType WellMapType;
// TODO: same definition with WellInterface, eventually they should go to a common header file.
static const int Water = BlackoilPhases::Aqua;
static const int Oil = BlackoilPhases::Liquid;
static const int Gas = BlackoilPhases::Vapour;
using BaseType :: wellRates; using BaseType :: wellRates;
using BaseType :: bhp; using BaseType :: bhp;
using BaseType :: perfPress; using BaseType :: perfPress;
@ -243,16 +248,16 @@ namespace Opm
using rt = data::Rates::opt; using rt = data::Rates::opt;
std::vector< rt > phs( np ); std::vector< rt > phs( np );
if( pu.phase_used[BlackoilPhases::Aqua] ) { if( pu.phase_used[Water] ) {
phs.at( pu.phase_pos[BlackoilPhases::Aqua] ) = rt::wat; phs.at( pu.phase_pos[Water] ) = rt::wat;
} }
if( pu.phase_used[BlackoilPhases::Liquid] ) { if( pu.phase_used[Oil] ) {
phs.at( pu.phase_pos[BlackoilPhases::Liquid] ) = rt::oil; phs.at( pu.phase_pos[Oil] ) = rt::oil;
} }
if( pu.phase_used[BlackoilPhases::Vapour] ) { if( pu.phase_used[Gas] ) {
phs.at( pu.phase_pos[BlackoilPhases::Vapour] ) = rt::gas; phs.at( pu.phase_pos[Gas] ) = rt::gas;
} }
if (pu.has_solvent) { if (pu.has_solvent) {
@ -374,8 +379,8 @@ namespace Opm
const int start_perf = wells->well_connpos[w]; const int start_perf = wells->well_connpos[w];
const int start_perf_next_well = wells->well_connpos[w + 1]; const int start_perf_next_well = wells->well_connpos[w + 1];
assert(nperf == (start_perf_next_well - start_perf)); // make sure the information from wells_ecl consistent with wells assert(nperf == (start_perf_next_well - start_perf)); // make sure the information from wells_ecl consistent with wells
if (pu.phase_used[BlackoilPhases::Vapour]) { if (pu.phase_used[Gas]) {
const int gaspos = pu.phase_pos[BlackoilPhases::Vapour]; const int gaspos = pu.phase_pos[Gas];
// scale the phase rates for Gas to avoid too bad initial guess for gas fraction // scale the phase rates for Gas to avoid too bad initial guess for gas fraction
// it will probably benefit the standard well too, while it needs to be justified // it will probably benefit the standard well too, while it needs to be justified
// TODO: to see if this strategy can benefit StandardWell too // TODO: to see if this strategy can benefit StandardWell too