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

Remove unused argument, silence warnings.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2016-12-29 14:34:16 +01:00
parent 7777fe6918
commit ae1d78f505
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilModelEbos.hpp
View File

@@ -698,13 +698,11 @@ namespace Opm {
sg = 0; sg = 0;
so = 1.0 - sw - sg; so = 1.0 - sw - sg;
const double& rsSat = FluidSystem::oilPvt().saturatedGasDissolutionFactor(fs.pvtRegionIndex(), reservoir_state.temperature()[cell_idx], reservoir_state.pressure()[cell_idx]); const double& rsSat = FluidSystem::oilPvt().saturatedGasDissolutionFactor(fs.pvtRegionIndex(), reservoir_state.temperature()[cell_idx], reservoir_state.pressure()[cell_idx]);
double& rs = reservoir_state.gasoilratio()[cell_idx];
rs = rsSat*(1-epsilon); rs = rsSat*(1-epsilon);
} else if (so <= 0.0 && has_vapoil_) { } else if (so <= 0.0 && has_vapoil_) {
reservoir_state.hydroCarbonState()[cell_idx] = HydroCarbonState::GasOnly; // sg --> rv reservoir_state.hydroCarbonState()[cell_idx] = HydroCarbonState::GasOnly; // sg --> rv
so = 0; so = 0;
sg = 1.0 - sw - so; sg = 1.0 - sw - so;
double& rv = reservoir_state.rv()[cell_idx];
// use gas pressure? // use gas pressure?
const double& rvSat = FluidSystem::gasPvt().saturatedOilVaporizationFactor(fs.pvtRegionIndex(), reservoir_state.temperature()[cell_idx], reservoir_state.pressure()[cell_idx]); const double& rvSat = FluidSystem::gasPvt().saturatedOilVaporizationFactor(fs.pvtRegionIndex(), reservoir_state.temperature()[cell_idx], reservoir_state.pressure()[cell_idx]);
rv = rvSat*(1-epsilon); rv = rvSat*(1-epsilon);

3
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@@ -242,8 +242,7 @@ public:
// Run a multiple steps of the solver depending on the time step control. // Run a multiple steps of the solver depending on the time step control.
solver_timer.start(); solver_timer.start();
const std::vector<double> pv(geo_.poreVolume().data(), geo_.poreVolume().data() + geo_.poreVolume().size()); const WellModel well_model(wells, model_param_, terminal_output_);
const WellModel well_model(wells, model_param_, terminal_output_, pv);
auto solver = createSolver(well_model); auto solver = createSolver(well_model);

4
opm/autodiff/StandardWellsDense.hpp
View File

@@ -83,8 +83,7 @@ enum WellVariablePositions {
// --------- Public methods --------- // --------- Public methods ---------
StandardWellsDense(const Wells* wells_arg, StandardWellsDense(const Wells* wells_arg,
const ModelParameters& param, const ModelParameters& param,
const bool terminal_output, const bool terminal_output)
const std::vector<double>& pv)
: wells_active_(wells_arg!=nullptr) : wells_active_(wells_arg!=nullptr)
, wells_(wells_arg) , wells_(wells_arg)
, param_(param) , param_(param)
@@ -1290,7 +1289,6 @@ enum WellVariablePositions {
} }
std::vector<double> g = {1,1,0.01}; std::vector<double> g = {1,1,0.01};
if (well_controls_iget_type(wc, current) == RESERVOIR_RATE) { if (well_controls_iget_type(wc, current) == RESERVOIR_RATE) {
const double* distr = well_controls_iget_distr(wc, current);
for (int phase = 0; phase < np; ++phase) { for (int phase = 0; phase < np; ++phase) {
g[phase] = distr[phase]; g[phase] = distr[phase];
} }