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

reducing the number of arguments of computeWellConnectionPressures

Browse Source 
and computeWellConnectionDensitesPressures.

These functions need to be renamed.
This commit is contained in:
Kai Bao
2016-04-29 09:45:37 +02:00
parent 18a530f9be
commit 0667fceb35
6 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/StandardWells_impl.hpp
View File

@@ -261,7 +261,6 @@ namespace Opm
void
StandardWells::
computeWellConnectionDensitesPressures(const WellState& xw,
const BlackoilPropsAdInterface& fluid,
const std::vector<double>& b_perf,
const std::vector<double>& rsmax_perf,
const std::vector<double>& rvmax_perf,
@@ -272,7 +271,7 @@ namespace Opm
// Compute densities
std::vector<double> cd =
WellDensitySegmented::computeConnectionDensities(
wells(), xw, fluid.phaseUsage(),
wells(), xw, fluid_.phaseUsage(),
b_perf, rsmax_perf, rvmax_perf, surf_dens_perf);
const int nperf = wells().well_connpos[wells().number_of_wells];
@@ -296,9 +295,6 @@ namespace Opm
StandardWells::
computeWellConnectionPressures(const SolutionState& state,
const WellState& xw,
const BlackoilPropsAdInterface& fluid,
const std::vector<bool>& active,
const std::vector<PhasePresence>& phaseCondition,
const Vector& depth,
const double gravity)
{
@@ -318,7 +314,7 @@ namespace Opm
const int nperf = wells().well_connpos[wells().number_of_wells];
const std::vector<double> depth_perf(pdepth.data(), pdepth.data() + nperf);
computeWellConnectionDensitesPressures(xw, fluid, b_perf, rsmax_perf, rvmax_perf, surf_dens_perf, depth_perf, gravity);
computeWellConnectionDensitesPressures(xw, b_perf, rsmax_perf, rvmax_perf, surf_dens_perf, depth_perf, gravity);
}