OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-26 19:36:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed: tidy up computeBhpAtThpLimitProdWithAlq interface

Browse Source 
put deferred_logger at the end of the parameter list.
similar to the rest of this family of methods
This commit is contained in:
Arne Morten Kvarving 2022-10-19 12:23:02 +02:00
parent 42fff132b0
commit e8152a1b65
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/wells/GasLiftSingleWell_impl.hpp
View File

@ -130,8 +130,8 @@ computeBhpAtThpLimit_(double alq) const
auto bhp_at_thp_limit = this->well_.computeBhpAtThpLimitProdWithAlq(
this->ebos_simulator_,
this->summary_state_,
this->deferred_logger_,
alq);
alq,
this->deferred_logger_);
if (bhp_at_thp_limit) {
if (*bhp_at_thp_limit < this->controls_.bhp_limit) {
const std::string msg = fmt::format(

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

@ -161,11 +161,11 @@ namespace Opm
double* connII,
DeferredLogger& deferred_logger) const;
virtual std::optional<double> computeBhpAtThpLimitProdWithAlq(
const Simulator& ebos_simulator,
const SummaryState& summary_state,
DeferredLogger& deferred_logger,
double alq_value) const override;
std::optional<double>
computeBhpAtThpLimitProdWithAlq(const Simulator& ebos_simulator,
const SummaryState& summary_state,
const double alq_value,
DeferredLogger& deferred_logger) const override;
protected:
int number_segments_;

8
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -1875,8 +1875,8 @@ namespace Opm
return this->MultisegmentWell<TypeTag>::computeBhpAtThpLimitProdWithAlq(
ebos_simulator,
summary_state,
deferred_logger,
this->getALQ(well_state));
this->getALQ(well_state),
deferred_logger);
}
@ -1886,8 +1886,8 @@ namespace Opm
MultisegmentWell<TypeTag>::
computeBhpAtThpLimitProdWithAlq(const Simulator& ebos_simulator,
const SummaryState& summary_state,
DeferredLogger& deferred_logger,
double alq_value) const
const double alq_value,
DeferredLogger& deferred_logger) const
{
// Make the frates() function.
auto frates = [this, &ebos_simulator, &deferred_logger](const double bhp) {

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

@ -218,11 +218,11 @@ namespace Opm
std::vector<double> &potentials,
double alq) const;
virtual std::optional<double> computeBhpAtThpLimitProdWithAlq(
std::optional<double> computeBhpAtThpLimitProdWithAlq(
const Simulator& ebos_simulator,
const SummaryState& summary_state,
DeferredLogger& deferred_logger,
double alq_value) const override;
const double alq_value,
DeferredLogger& deferred_logger) const override;
virtual void computeWellRatesWithBhp(
const Simulator& ebosSimulator,

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

@ -1929,7 +1929,7 @@ namespace Opm
{
double bhp;
auto bhp_at_thp_limit = computeBhpAtThpLimitProdWithAlq(
ebos_simulator, summary_state, deferred_logger, alq);
ebos_simulator, summary_state, alq, deferred_logger);
if (bhp_at_thp_limit) {
const auto& controls = this->well_ecl_.productionControls(summary_state);
bhp = std::max(*bhp_at_thp_limit, controls.bhp_limit);
@ -2569,8 +2569,8 @@ namespace Opm
{
return computeBhpAtThpLimitProdWithAlq(ebos_simulator,
summary_state,
deferred_logger,
this->getALQ(well_state));
this->getALQ(well_state),
deferred_logger);
}
template<typename TypeTag>
@ -2578,8 +2578,8 @@ namespace Opm
StandardWell<TypeTag>::
computeBhpAtThpLimitProdWithAlq(const Simulator& ebos_simulator,
const SummaryState& summary_state,
DeferredLogger& deferred_logger,
double alq_value) const
const double alq_value,
DeferredLogger& deferred_logger) const
{
// Make the frates() function.
auto frates = [this, &ebos_simulator, &deferred_logger](const double bhp) {

4
opm/simulators/wells/WellInterface.hpp
View File

@ -171,8 +171,8 @@ public:
virtual std::optional<double> computeBhpAtThpLimitProdWithAlq(
const Simulator& ebos_simulator,
const SummaryState& summary_state,
DeferredLogger& deferred_logger,
double alq_value
const double alq_value,
DeferredLogger& deferred_logger
) const = 0;
/// using the solution x to recover the solution xw for wells and applying