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

Rename getPerfPressure() -> getPerfCellPressure().

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2019-10-10 16:10:33 +02:00
parent d873ae165d
commit 2d9f41b1aa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/wells/StandardWell.hpp
View File

@ -294,7 +294,7 @@ namespace Opm
EvalWell extendEval(const Eval& in) const; EvalWell extendEval(const Eval& in) const;
Eval getPerfPressure(const FluidState& fs) const; Eval getPerfCellPressure(const FluidState& fs) const;
// xw = inv(D)*(rw - C*x) // xw = inv(D)*(rw - C*x)
void recoverSolutionWell(const BVector& x, BVectorWell& xw) const; void recoverSolutionWell(const BVector& x, BVectorWell& xw) const;

10
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -311,7 +311,7 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
typename StandardWell<TypeTag>::Eval typename StandardWell<TypeTag>::Eval
StandardWell<TypeTag>::getPerfPressure(const typename StandardWell<TypeTag>::FluidState& fs) const StandardWell<TypeTag>::getPerfCellPressure(const typename StandardWell<TypeTag>::FluidState& fs) const
{ {
Eval pressure; Eval pressure;
if (Indices::oilEnabled) { if (Indices::oilEnabled) {
@ -343,7 +343,7 @@ namespace Opm
{ {
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
const EvalWell pressure = extendEval(getPerfPressure(fs)); const EvalWell pressure = extendEval(getPerfCellPressure(fs));
const EvalWell rs = extendEval(fs.Rs()); const EvalWell rs = extendEval(fs.Rs());
const EvalWell rv = extendEval(fs.Rv()); const EvalWell rv = extendEval(fs.Rv());
std::vector<EvalWell> b_perfcells_dense(num_components_, EvalWell{numWellEq_ + numEq, 0.0}); std::vector<EvalWell> b_perfcells_dense(num_components_, EvalWell{numWellEq_ + numEq, 0.0});
@ -692,7 +692,7 @@ namespace Opm
const unsigned int compIdx = flowPhaseToEbosCompIdx(p); const unsigned int compIdx = flowPhaseToEbosCompIdx(p);
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
Eval perf_pressure = getPerfPressure(fs); Eval perf_pressure = getPerfCellPressure(fs);
const double drawdown = well_state.perfPress()[first_perf_ + perf] - perf_pressure.value(); const double drawdown = well_state.perfPress()[first_perf_ + perf] - perf_pressure.value();
const bool new_well = schedule.hasWellEvent(name(), ScheduleEvents::NEW_WELL, current_step_); const bool new_well = schedule.hasWellEvent(name(), ScheduleEvents::NEW_WELL, current_step_);
double productivity_index = cq_s[compIdx].value() / drawdown; double productivity_index = cq_s[compIdx].value() / drawdown;
@ -1364,7 +1364,7 @@ namespace Opm
const auto& int_quantities = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0)); const auto& int_quantities = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/ 0));
const auto& fs = int_quantities.fluidState(); const auto& fs = int_quantities.fluidState();
// the pressure of the reservoir grid block the well connection is in // the pressure of the reservoir grid block the well connection is in
Eval perf_pressure = getPerfPressure(fs); Eval perf_pressure = getPerfCellPressure(fs);
double p_r = perf_pressure.value(); double p_r = perf_pressure.value();
// calculating the b for the connection // calculating the b for the connection
@ -1591,7 +1591,7 @@ namespace Opm
const int cell_idx = well_cells_[perf]; const int cell_idx = well_cells_[perf];
const auto& intQuants = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0)); const auto& intQuants = *(ebos_simulator.model().cachedIntensiveQuantities(cell_idx, /*timeIdx=*/0));
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
Eval perf_pressure = getPerfPressure(fs); Eval perf_pressure = getPerfCellPressure(fs);
const double pressure = perf_pressure.value(); const double pressure = perf_pressure.value();
const double bhp = getBhp().value(); const double bhp = getBhp().value();