Change argument type in utility functions

This commit is contained in:
Joakim Hove 2021-10-28 10:21:05 +02:00
parent 8fb66ef908
commit 5b2712490e

View File

@ -549,14 +549,14 @@ inline bool
has_vfp_table(const Opm::ScheduleState& sched_state, has_vfp_table(const Opm::ScheduleState& sched_state,
int vfp_table_number) int vfp_table_number)
{ {
return sched_state.vfpprod.has(pc.vfp_table_number); return sched_state.vfpprod.has(vfp_table_number);
} }
inline Opm::VFPProdTable::ALQ_TYPE inline Opm::VFPProdTable::ALQ_TYPE
alq_type(const Opm::ScheduleState& sched_state, alq_type(const Opm::ScheduleState& sched_state,
const Opm::Well::ProductionControls& pc) int vfp_table_number)
{ {
return sched_state.vfpprod(pc.vfp_table_number).getALQType(); return sched_state.vfpprod(vfp_table_number).getALQType();
} }
inline quantity artificial_lift_quantity( const fn_args& args ) { inline quantity artificial_lift_quantity( const fn_args& args ) {
@ -630,11 +630,11 @@ inline quantity glir( const fn_args& args ) {
} }
const auto& production = well->productionControls(args.st); const auto& production = well->productionControls(args.st);
if (! has_alq_vfp_table(sched_state, production.vfp_table_number)) { if (! has_vfp_table(sched_state, production.vfp_table_number)) {
continue; continue;
} }
const auto thisAlqType = alq_type(sched_state, production); const auto thisAlqType = alq_type(sched_state, production.vfp_table_number);
if (thisAlqType != Opm::VFPProdTable::ALQ_TYPE::ALQ_GRAT) { if (thisAlqType != Opm::VFPProdTable::ALQ_TYPE::ALQ_GRAT) {
continue; continue;
} }