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 Opm:: prefix for symbols

Browse Source 
we are already in the Opm:: namespace
This commit is contained in:
Arne Morten Kvarving
2021-05-12 08:50:04 +02:00
parent 9de5d077f6
commit d5cdbf38d6
2 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,11 +90,11 @@ namespace Opm
using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>; using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>; using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
using RateVector = GetPropType<TypeTag, Properties::RateVector>; using RateVector = GetPropType<TypeTag, Properties::RateVector>;
using GasLiftSingleWell = Opm::GasLiftSingleWell<TypeTag>; using GasLiftSingleWell = ::Opm::GasLiftSingleWell<TypeTag>;
using GLiftOptWells = typename Opm::BlackoilWellModel<TypeTag>::GLiftOptWells; using GLiftOptWells = typename BlackoilWellModel<TypeTag>::GLiftOptWells;
using GLiftProdWells = typename Opm::BlackoilWellModel<TypeTag>::GLiftProdWells; using GLiftProdWells = typename BlackoilWellModel<TypeTag>::GLiftProdWells;
using GLiftWellStateMap = using GLiftWellStateMap =
typename Opm::BlackoilWellModel<TypeTag>::GLiftWellStateMap; typename BlackoilWellModel<TypeTag>::GLiftWellStateMap;
static const int numEq = Indices::numEq; static const int numEq = Indices::numEq;
static const int numPhases = Indices::numPhases; static const int numPhases = Indices::numPhases;
@@ -126,13 +126,13 @@ namespace Opm
using RateConverterType = RateConverter:: using RateConverterType = RateConverter::
SurfaceToReservoirVoidage<FluidSystem, std::vector<int> >; SurfaceToReservoirVoidage<FluidSystem, std::vector<int> >;
static const bool compositionSwitchEnabled = Indices::gasEnabled; static const bool compositionSwitchEnabled = Indices::gasEnabled;
using FluidState = Opm::BlackOilFluidState<Eval, using FluidState = BlackOilFluidState<Eval,
FluidSystem, FluidSystem,
has_temperature, has_temperature,
has_energy, has_energy,
compositionSwitchEnabled, compositionSwitchEnabled,
has_brine, has_brine,
Indices::numPhases >; Indices::numPhases >;
/// Constructor /// Constructor
WellInterface(const Well& well, WellInterface(const Well& well,
const ParallelWellInfo& pw_info, const ParallelWellInfo& pw_info,
@@ -176,15 +176,15 @@ namespace Opm
virtual void initPrimaryVariablesEvaluation() const = 0; virtual void initPrimaryVariablesEvaluation() const = 0;
virtual ConvergenceReport getWellConvergence(const WellState& well_state, const std::vector<double>& B_avg, Opm::DeferredLogger& deferred_logger, const bool relax_tolerance = false) const = 0; virtual ConvergenceReport getWellConvergence(const WellState& well_state, const std::vector<double>& B_avg, DeferredLogger& deferred_logger, const bool relax_tolerance = false) const = 0;
virtual void solveEqAndUpdateWellState(WellState& well_state, Opm::DeferredLogger& deferred_logger) = 0; virtual void solveEqAndUpdateWellState(WellState& well_state, DeferredLogger& deferred_logger) = 0;
void assembleWellEq(const Simulator& ebosSimulator, void assembleWellEq(const Simulator& ebosSimulator,
const double dt, const double dt,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
virtual void gasLiftOptimizationStage1 ( virtual void gasLiftOptimizationStage1 (
WellState& well_state, WellState& well_state,
@@ -199,7 +199,7 @@ namespace Opm
const double& simulationTime, const double& simulationTime,
const bool& writeMessageToOPMLog, const bool& writeMessageToOPMLog,
WellTestState& wellTestState, WellTestState& wellTestState,
Opm::DeferredLogger& deferred_logger) const; DeferredLogger& deferred_logger) const;
void setWellEfficiencyFactor(const double efficiency_factor); void setWellEfficiencyFactor(const double efficiency_factor);
@@ -209,7 +209,7 @@ namespace Opm
/// xw to update Well State /// xw to update Well State
virtual void recoverWellSolutionAndUpdateWellState(const BVector& x, virtual void recoverWellSolutionAndUpdateWellState(const BVector& x,
WellState& well_state, WellState& well_state,
Opm::DeferredLogger& deferred_logger) const = 0; DeferredLogger& deferred_logger) const = 0;
/// Ax = Ax - C D^-1 B x /// Ax = Ax - C D^-1 B x
virtual void apply(const BVector& x, BVector& Ax) const = 0; virtual void apply(const BVector& x, BVector& Ax) const = 0;
@@ -221,24 +221,24 @@ namespace Opm
virtual void computeWellPotentials(const Simulator& ebosSimulator, virtual void computeWellPotentials(const Simulator& ebosSimulator,
const WellState& well_state, const WellState& well_state,
std::vector<double>& well_potentials, std::vector<double>& well_potentials,
Opm::DeferredLogger& deferred_logger) = 0; DeferredLogger& deferred_logger) = 0;
void updateWellStateWithTarget(const Simulator& ebos_simulator, void updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state, WellState& well_state,
Opm::DeferredLogger& deferred_logger) const; DeferredLogger& deferred_logger) const;
enum class IndividualOrGroup { Individual, Group, Both }; enum class IndividualOrGroup { Individual, Group, Both };
bool updateWellControl(const Simulator& ebos_simulator, bool updateWellControl(const Simulator& ebos_simulator,
const IndividualOrGroup iog, const IndividualOrGroup iog,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger) /* const */; DeferredLogger& deferred_logger) /* const */;
virtual void updatePrimaryVariables(const WellState& well_state, Opm::DeferredLogger& deferred_logger) const = 0; virtual void updatePrimaryVariables(const WellState& well_state, DeferredLogger& deferred_logger) const = 0;
virtual void calculateExplicitQuantities(const Simulator& ebosSimulator, virtual void calculateExplicitQuantities(const Simulator& ebosSimulator,
const WellState& well_state, const WellState& well_state,
Opm::DeferredLogger& deferred_logger) = 0; // should be const? DeferredLogger& deferred_logger) = 0; // should be const?
virtual void updateProductivityIndex(const Simulator& ebosSimulator, virtual void updateProductivityIndex(const Simulator& ebosSimulator,
const WellProdIndexCalculator& wellPICalc, const WellProdIndexCalculator& wellPICalc,
@@ -283,17 +283,17 @@ namespace Opm
const double simulation_time, const int report_step, const double simulation_time, const int report_step,
const WellTestConfig::Reason testing_reason, const WellTestConfig::Reason testing_reason,
/* const */ WellState& well_state, const GroupState& group_state, WellTestState& welltest_state, /* const */ WellState& well_state, const GroupState& group_state, WellTestState& welltest_state,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
void updatePerforatedCell(std::vector<bool>& is_cell_perforated); void updatePerforatedCell(std::vector<bool>& is_cell_perforated);
void checkWellOperability(const Simulator& ebos_simulator, const WellState& well_state, Opm::DeferredLogger& deferred_logger); void checkWellOperability(const Simulator& ebos_simulator, const WellState& well_state, DeferredLogger& deferred_logger);
// check whether the well is operable under the current reservoir condition // check whether the well is operable under the current reservoir condition
// mostly related to BHP limit and THP limit // mostly related to BHP limit and THP limit
void updateWellOperability(const Simulator& ebos_simulator, void updateWellOperability(const Simulator& ebos_simulator,
const WellState& well_state, const WellState& well_state,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
// whether the well is operable // whether the well is operable
@@ -339,7 +339,7 @@ namespace Opm
void solveWellEquation(const Simulator& ebosSimulator, void solveWellEquation(const Simulator& ebosSimulator,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
const PhaseUsage& phaseUsage() const; const PhaseUsage& phaseUsage() const;
@@ -471,12 +471,12 @@ namespace Opm
bool checkRateEconLimits(const WellEconProductionLimits& econ_production_limits, bool checkRateEconLimits(const WellEconProductionLimits& econ_production_limits,
const std::vector<double>& well_rates, const std::vector<double>& well_rates,
Opm::DeferredLogger& deferred_logger) const; DeferredLogger& deferred_logger) const;
double getTHPConstraint(const SummaryState& summaryState) const; double getTHPConstraint(const SummaryState& summaryState) const;
template <class ValueType> template <class ValueType>
ValueType calculateBhpFromThp(const WellState& well_state, const std::vector<ValueType>& rates, const Well& well, const SummaryState& summaryState, Opm::DeferredLogger& deferred_logger) const; ValueType calculateBhpFromThp(const WellState& well_state, const std::vector<ValueType>& rates, const Well& well, const SummaryState& summaryState, DeferredLogger& deferred_logger) const;
double getALQ(const WellState& well_state) const; double getALQ(const WellState& well_state) const;
@@ -504,7 +504,7 @@ namespace Opm
void checkRatioEconLimits(const WellEconProductionLimits& econ_production_limits, void checkRatioEconLimits(const WellEconProductionLimits& econ_production_limits,
const WellState& well_state, const WellState& well_state,
RatioLimitCheckReport& report, RatioLimitCheckReport& report,
Opm::DeferredLogger& deferred_logger) const; DeferredLogger& deferred_logger) const;
template <typename RatioFunc> template <typename RatioFunc>
@@ -523,30 +523,30 @@ namespace Opm
std::vector<double> initialWellRateFrations(const Simulator& ebosSimulator, const std::vector<double>& potentials) const; std::vector<double> initialWellRateFrations(const Simulator& ebosSimulator, const std::vector<double>& potentials) const;
// whether a well is specified with a non-zero and valid VFP table number // whether a well is specified with a non-zero and valid VFP table number
bool isVFPActive(Opm::DeferredLogger& deferred_logger) const; bool isVFPActive(DeferredLogger& deferred_logger) const;
struct OperabilityStatus; struct OperabilityStatus;
OperabilityStatus operability_status_; OperabilityStatus operability_status_;
// check whether the well is operable under BHP limit with current reservoir condition // check whether the well is operable under BHP limit with current reservoir condition
virtual void checkOperabilityUnderBHPLimitProducer(const WellState& well_state, const Simulator& ebos_simulator, Opm::DeferredLogger& deferred_logger) =0; virtual void checkOperabilityUnderBHPLimitProducer(const WellState& well_state, const Simulator& ebos_simulator, DeferredLogger& deferred_logger) =0;
// check whether the well is operable under THP limit with current reservoir condition // check whether the well is operable under THP limit with current reservoir condition
virtual void checkOperabilityUnderTHPLimitProducer(const Simulator& ebos_simulator, const WellState& well_state, Opm::DeferredLogger& deferred_logger) =0; virtual void checkOperabilityUnderTHPLimitProducer(const Simulator& ebos_simulator, const WellState& well_state, DeferredLogger& deferred_logger) =0;
virtual void updateIPR(const Simulator& ebos_simulator, Opm::DeferredLogger& deferred_logger) const=0; virtual void updateIPR(const Simulator& ebos_simulator, DeferredLogger& deferred_logger) const=0;
void wellTestingEconomic(const Simulator& simulator, void wellTestingEconomic(const Simulator& simulator,
const double simulation_time, const WellState& well_state, const GroupState& group_state, const double simulation_time, const WellState& well_state, const GroupState& group_state,
WellTestState& welltest_state, Opm::DeferredLogger& deferred_logger); WellTestState& welltest_state, DeferredLogger& deferred_logger);
void wellTestingPhysical(const Simulator& simulator, void wellTestingPhysical(const Simulator& simulator,
const double simulation_time, const int report_step, const double simulation_time, const int report_step,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
WellTestState& welltest_state, Opm::DeferredLogger& deferred_logger); WellTestState& welltest_state, DeferredLogger& deferred_logger);
virtual void assembleWellEqWithoutIteration(const Simulator& ebosSimulator, virtual void assembleWellEqWithoutIteration(const Simulator& ebosSimulator,
@@ -555,7 +555,7 @@ namespace Opm
const Well::ProductionControls& prod_controls, const Well::ProductionControls& prod_controls,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger) = 0; DeferredLogger& deferred_logger) = 0;
// iterate well equations with the specified control until converged // iterate well equations with the specified control until converged
virtual bool iterateWellEqWithControl(const Simulator& ebosSimulator, virtual bool iterateWellEqWithControl(const Simulator& ebosSimulator,
@@ -564,28 +564,28 @@ namespace Opm
const Well::ProductionControls& prod_controls, const Well::ProductionControls& prod_controls,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger) = 0; DeferredLogger& deferred_logger) = 0;
bool iterateWellEquations(const Simulator& ebosSimulator, bool iterateWellEquations(const Simulator& ebosSimulator,
const double dt, const double dt,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
void updateWellTestStateEconomic(const WellState& well_state, void updateWellTestStateEconomic(const WellState& well_state,
const double simulation_time, const double simulation_time,
const bool write_message_to_opmlog, const bool write_message_to_opmlog,
WellTestState& well_test_state, WellTestState& well_test_state,
Opm::DeferredLogger& deferred_logger) const; DeferredLogger& deferred_logger) const;
void updateWellTestStatePhysical(const WellState& well_state, void updateWellTestStatePhysical(const WellState& well_state,
const double simulation_time, const double simulation_time,
const bool write_message_to_opmlog, const bool write_message_to_opmlog,
WellTestState& well_test_state, WellTestState& well_test_state,
Opm::DeferredLogger& deferred_logger) const; DeferredLogger& deferred_logger) const;
void solveWellForTesting(const Simulator& ebosSimulator, WellState& well_state, const GroupState& group_state, void solveWellForTesting(const Simulator& ebosSimulator, WellState& well_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
void initCompletions(); void initCompletions();
@@ -624,20 +624,20 @@ namespace Opm
void getGroupInjectionControl(const Group& group, void getGroupInjectionControl(const Group& group,
const WellState& well_state, const WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Opm::Schedule& schedule, const Schedule& schedule,
const SummaryState& summaryState, const SummaryState& summaryState,
const InjectorType& injectorType, const InjectorType& injectorType,
const EvalWell& bhp, const EvalWell& bhp,
const EvalWell& injection_rate, const EvalWell& injection_rate,
EvalWell& control_eq, EvalWell& control_eq,
double efficiencyFactor, double efficiencyFactor,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
template <class EvalWell> template <class EvalWell>
void getGroupProductionControl(const Group& group, void getGroupProductionControl(const Group& group,
const WellState& well_state, const WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Opm::Schedule& schedule, const Schedule& schedule,
const SummaryState& summaryState, const SummaryState& summaryState,
const EvalWell& bhp, const EvalWell& bhp,
const std::vector<EvalWell>& rates, const std::vector<EvalWell>& rates,
@@ -647,26 +647,26 @@ namespace Opm
template <class EvalWell, class BhpFromThpFunc> template <class EvalWell, class BhpFromThpFunc>
void assembleControlEqInj(const WellState& well_state, void assembleControlEqInj(const WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Opm::Schedule& schedule, const Schedule& schedule,
const SummaryState& summaryState, const SummaryState& summaryState,
const Well::InjectionControls& controls, const Well::InjectionControls& controls,
const EvalWell& bhp, const EvalWell& bhp,
const EvalWell& injection_rate, const EvalWell& injection_rate,
BhpFromThpFunc bhp_from_thp, BhpFromThpFunc bhp_from_thp,
EvalWell& control_eq, EvalWell& control_eq,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
template <class EvalWell, class BhpFromThpFunc> template <class EvalWell, class BhpFromThpFunc>
void assembleControlEqProd(const WellState& well_state, void assembleControlEqProd(const WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Opm::Schedule& schedule, const Schedule& schedule,
const SummaryState& summaryState, const SummaryState& summaryState,
const Well::ProductionControls& controls, const Well::ProductionControls& controls,
const EvalWell& bhp, const EvalWell& bhp,
const std::vector<EvalWell>& rates, // Always 3 canonical rates. const std::vector<EvalWell>& rates, // Always 3 canonical rates.
BhpFromThpFunc bhp_from_thp, BhpFromThpFunc bhp_from_thp,
EvalWell& control_eq, EvalWell& control_eq,
Opm::DeferredLogger& deferred_logger); DeferredLogger& deferred_logger);
}; };

58
opm/simulators/wells/WellInterface_impl.hpp
View File

@@ -517,7 +517,7 @@ namespace Opm
const IndividualOrGroup iog, const IndividualOrGroup iog,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger) /* const */ DeferredLogger& deferred_logger) /* const */
{ {
if (this->wellIsStopped()) { if (this->wellIsStopped()) {
return false; return false;
@@ -589,9 +589,9 @@ namespace Opm
WellInterface<TypeTag>:: WellInterface<TypeTag>::
checkRateEconLimits(const WellEconProductionLimits& econ_production_limits, checkRateEconLimits(const WellEconProductionLimits& econ_production_limits,
const std::vector<double>& well_rates, const std::vector<double>& well_rates,
Opm::DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
const Opm::PhaseUsage& pu = phaseUsage(); const PhaseUsage& pu = phaseUsage();
const int np = number_of_phases_; const int np = number_of_phases_;
if (econ_production_limits.onMinOilRate()) { if (econ_production_limits.onMinOilRate()) {
@@ -641,7 +641,7 @@ namespace Opm
const std::vector<ValueType>& rates, const std::vector<ValueType>& rates,
const Well& well, const Well& well,
const SummaryState& summaryState, const SummaryState& summaryState,
Opm::DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
// TODO: when well is under THP control, the BHP is dependent on the rates, // TODO: when well is under THP control, the BHP is dependent on the rates,
// the well rates is also dependent on the BHP, so it might need to do some iteration. // the well rates is also dependent on the BHP, so it might need to do some iteration.
@@ -843,7 +843,7 @@ namespace Opm
checkRatioEconLimits(const WellEconProductionLimits& econ_production_limits, checkRatioEconLimits(const WellEconProductionLimits& econ_production_limits,
const WellState& well_state, const WellState& well_state,
RatioLimitCheckReport& report, RatioLimitCheckReport& report,
Opm::DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
// TODO: not sure how to define the worst-offending completion when more than one // TODO: not sure how to define the worst-offending completion when more than one
// ratio related limit is violated. // ratio related limit is violated.
@@ -965,7 +965,7 @@ namespace Opm
const double& simulationTime, const double& simulationTime,
const bool& writeMessageToOPMLog, const bool& writeMessageToOPMLog,
WellTestState& wellTestState, WellTestState& wellTestState,
Opm::DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
// currently, we only updateWellTestState for producers // currently, we only updateWellTestState for producers
@@ -999,7 +999,7 @@ namespace Opm
const double simulation_time, const double simulation_time,
const bool write_message_to_opmlog, const bool write_message_to_opmlog,
WellTestState& well_test_state, WellTestState& well_test_state,
Opm::DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
if (!isOperable()) { if (!isOperable()) {
if (well_test_state.hasWellClosed(name(), WellTestConfig::Reason::ECONOMIC) || if (well_test_state.hasWellClosed(name(), WellTestConfig::Reason::ECONOMIC) ||
@@ -1029,7 +1029,7 @@ namespace Opm
const double simulation_time, const double simulation_time,
const bool write_message_to_opmlog, const bool write_message_to_opmlog,
WellTestState& well_test_state, WellTestState& well_test_state,
Opm::DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
if (this->wellIsStopped()) if (this->wellIsStopped())
return; return;
@@ -1173,7 +1173,7 @@ namespace Opm
/* const */ WellState& well_state, /* const */ WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
WellTestState& well_test_state, WellTestState& well_test_state,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
if (testing_reason == WellTestConfig::Reason::PHYSICAL) { if (testing_reason == WellTestConfig::Reason::PHYSICAL) {
wellTestingPhysical(simulator, simulation_time, report_step, wellTestingPhysical(simulator, simulation_time, report_step,
@@ -1195,7 +1195,7 @@ namespace Opm
WellInterface<TypeTag>:: WellInterface<TypeTag>::
wellTestingEconomic(const Simulator& simulator, wellTestingEconomic(const Simulator& simulator,
const double simulation_time, const WellState& well_state, const GroupState& group_state, const double simulation_time, const WellState& well_state, const GroupState& group_state,
WellTestState& welltest_state, Opm::DeferredLogger& deferred_logger) WellTestState& welltest_state, DeferredLogger& deferred_logger)
{ {
deferred_logger.info(" well " + name() + " is being tested for economic limits"); deferred_logger.info(" well " + name() + " is being tested for economic limits");
@@ -1314,7 +1314,7 @@ namespace Opm
template<typename TypeTag> template<typename TypeTag>
bool bool
WellInterface<TypeTag>::isVFPActive(Opm::DeferredLogger& deferred_logger) const WellInterface<TypeTag>::isVFPActive(DeferredLogger& deferred_logger) const
{ {
// since the well_controls only handles the VFP number when THP constraint/target is there. // since the well_controls only handles the VFP number when THP constraint/target is there.
// we need to get the table number through the parser, in case THP constraint/target is not there. // we need to get the table number through the parser, in case THP constraint/target is not there.
@@ -1359,7 +1359,7 @@ namespace Opm
const double dt, const double dt,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
const auto& summary_state = ebosSimulator.vanguard().summaryState(); const auto& summary_state = ebosSimulator.vanguard().summaryState();
const auto inj_controls = well_ecl_.isInjector() ? well_ecl_.injectionControls(summary_state) : Well::InjectionControls(0); const auto inj_controls = well_ecl_.isInjector() ? well_ecl_.injectionControls(summary_state) : Well::InjectionControls(0);
@@ -1413,7 +1413,7 @@ namespace Opm
void void
WellInterface<TypeTag>:: WellInterface<TypeTag>::
solveWellForTesting(const Simulator& ebosSimulator, WellState& well_state, const GroupState& group_state, solveWellForTesting(const Simulator& ebosSimulator, WellState& well_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
// keep a copy of the original well state // keep a copy of the original well state
const WellState well_state0 = well_state; const WellState well_state0 = well_state;
@@ -1435,7 +1435,7 @@ namespace Opm
solveWellEquation(const Simulator& ebosSimulator, solveWellEquation(const Simulator& ebosSimulator,
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
if (!this->isOperable()) if (!this->isOperable())
return; return;
@@ -1517,7 +1517,7 @@ namespace Opm
WellState& well_state, WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
WellTestState& welltest_state, WellTestState& welltest_state,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
deferred_logger.info(" well " + name() + " is being tested for physical limits"); deferred_logger.info(" well " + name() + " is being tested for physical limits");
@@ -1577,7 +1577,7 @@ namespace Opm
WellInterface<TypeTag>:: WellInterface<TypeTag>::
checkWellOperability(const Simulator& ebos_simulator, checkWellOperability(const Simulator& ebos_simulator,
const WellState& well_state, const WellState& well_state,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
const bool checkOperability = EWOMS_GET_PARAM(TypeTag, bool, EnableWellOperabilityCheck); const bool checkOperability = EWOMS_GET_PARAM(TypeTag, bool, EnableWellOperabilityCheck);
@@ -1630,7 +1630,7 @@ namespace Opm
WellInterface<TypeTag>:: WellInterface<TypeTag>::
updateWellOperability(const Simulator& ebos_simulator, updateWellOperability(const Simulator& ebos_simulator,
const WellState& well_state, const WellState& well_state,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
this->operability_status_.reset(); this->operability_status_.reset();
@@ -1653,7 +1653,7 @@ namespace Opm
WellInterface<TypeTag>:: WellInterface<TypeTag>::
updateWellStateWithTarget(const Simulator& ebos_simulator, updateWellStateWithTarget(const Simulator& ebos_simulator,
WellState& well_state, WellState& well_state,
Opm::DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
// only bhp and wellRates are used to initilize the primaryvariables for standard wells // only bhp and wellRates are used to initilize the primaryvariables for standard wells
@@ -1697,7 +1697,7 @@ namespace Opm
OPM_DEFLOG_THROW(std::runtime_error, "Expected WATER, OIL or GAS as type for injectors " + name(), deferred_logger ); OPM_DEFLOG_THROW(std::runtime_error, "Expected WATER, OIL or GAS as type for injectors " + name(), deferred_logger );
} }
const Opm::Well::InjectorCMode& current = well_state.currentInjectionControls()[well_index]; const Well::InjectorCMode& current = well_state.currentInjectionControls()[well_index];
switch(current) { switch(current) {
case Well::InjectorCMode::RATE: case Well::InjectorCMode::RATE:
@@ -2047,7 +2047,7 @@ namespace Opm
if (well.isInjector()) { if (well.isInjector()) {
const auto controls = well.injectionControls(summaryState); const auto controls = well.injectionControls(summaryState);
Opm::Well::InjectorCMode& currentControl = well_state.currentInjectionControls()[well_index]; Well::InjectorCMode& currentControl = well_state.currentInjectionControls()[well_index];
if (controls.hasControl(Well::InjectorCMode::BHP) && currentControl != Well::InjectorCMode::BHP) if (controls.hasControl(Well::InjectorCMode::BHP) && currentControl != Well::InjectorCMode::BHP)
{ {
@@ -2242,7 +2242,7 @@ namespace Opm
const int well_index = index_of_well_; const int well_index = index_of_well_;
if (well.isInjector()) { if (well.isInjector()) {
Opm::Well::InjectorCMode& currentControl = well_state.currentInjectionControls()[well_index]; Well::InjectorCMode& currentControl = well_state.currentInjectionControls()[well_index];
if (currentControl != Well::InjectorCMode::GRUP) { if (currentControl != Well::InjectorCMode::GRUP) {
// This checks only the first encountered group limit, // This checks only the first encountered group limit,
@@ -2401,16 +2401,16 @@ namespace Opm
void void
WellInterface<TypeTag>::assembleControlEqInj(const WellState& well_state, WellInterface<TypeTag>::assembleControlEqInj(const WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Opm::Schedule& schedule, const Schedule& schedule,
const SummaryState& summaryState, const SummaryState& summaryState,
const Well::InjectionControls& controls, const Well::InjectionControls& controls,
const EvalWell& bhp, const EvalWell& bhp,
const EvalWell& injection_rate, const EvalWell& injection_rate,
BhpFromThpFunc bhp_from_thp, BhpFromThpFunc bhp_from_thp,
EvalWell& control_eq, EvalWell& control_eq,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
const Opm::Well::InjectorCMode& current = well_state.currentInjectionControls()[index_of_well_]; const Well::InjectorCMode& current = well_state.currentInjectionControls()[index_of_well_];
const InjectorType injectorType = controls.injector_type; const InjectorType injectorType = controls.injector_type;
const auto& pu = phaseUsage(); const auto& pu = phaseUsage();
const double efficiencyFactor = well_ecl_.getEfficiencyFactor(); const double efficiencyFactor = well_ecl_.getEfficiencyFactor();
@@ -2484,14 +2484,14 @@ namespace Opm
void void
WellInterface<TypeTag>::assembleControlEqProd(const WellState& well_state, WellInterface<TypeTag>::assembleControlEqProd(const WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Opm::Schedule& schedule, const Schedule& schedule,
const SummaryState& summaryState, const SummaryState& summaryState,
const Well::ProductionControls& controls, const Well::ProductionControls& controls,
const EvalWell& bhp, const EvalWell& bhp,
const std::vector<EvalWell>& rates, // Always 3 canonical rates. const std::vector<EvalWell>& rates, // Always 3 canonical rates.
BhpFromThpFunc bhp_from_thp, BhpFromThpFunc bhp_from_thp,
EvalWell& control_eq, EvalWell& control_eq,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
const Well::ProducerCMode& current = well_state.currentProductionControls()[index_of_well_]; const Well::ProducerCMode& current = well_state.currentProductionControls()[index_of_well_];
const auto& pu = phaseUsage(); const auto& pu = phaseUsage();
@@ -2600,14 +2600,14 @@ namespace Opm
WellInterface<TypeTag>::getGroupInjectionControl(const Group& group, WellInterface<TypeTag>::getGroupInjectionControl(const Group& group,
const WellState& well_state, const WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Opm::Schedule& schedule, const Schedule& schedule,
const SummaryState& summaryState, const SummaryState& summaryState,
const InjectorType& injectorType, const InjectorType& injectorType,
const EvalWell& bhp, const EvalWell& bhp,
const EvalWell& injection_rate, const EvalWell& injection_rate,
EvalWell& control_eq, EvalWell& control_eq,
double efficiencyFactor, double efficiencyFactor,
Opm::DeferredLogger& deferred_logger) DeferredLogger& deferred_logger)
{ {
// Setting some defaults to silence warnings below. // Setting some defaults to silence warnings below.
// Will be overwritten in the switch statement. // Will be overwritten in the switch statement.
@@ -2720,7 +2720,7 @@ namespace Opm
WellInterface<TypeTag>::getGroupProductionControl(const Group& group, WellInterface<TypeTag>::getGroupProductionControl(const Group& group,
const WellState& well_state, const WellState& well_state,
const GroupState& group_state, const GroupState& group_state,
const Opm::Schedule& schedule, const Schedule& schedule,
const SummaryState& summaryState, const SummaryState& summaryState,
const EvalWell& bhp, const EvalWell& bhp,
const std::vector<EvalWell>& rates, const std::vector<EvalWell>& rates,