Include checking for zero targets from groups where required

OPM · Mar 19, 2024 · 2355c4c · 2355c4c
1 parent aa15e2c
commit 2355c4c
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 80 deletions.
diff --git a/opm/simulators/wells/BlackoilWellModel_impl.hpp b/opm/simulators/wells/BlackoilWellModel_impl.hpp
@@ -475,7 +475,7 @@ namespace Opm {
             // This is done only for producers, as injectors will only have a single
             // nonzero phase anyway.
             for (auto& well : well_container_) {
-                const bool zero_target = well->stopppedOrZeroRateTarget(summaryState, this->wellState());
+                const bool zero_target = well->stoppedOrZeroRateTarget(simulator_, this->wellState(), local_deferredLogger);
                 if (well->isProducer() && !zero_target) {
                     well->updateWellStateRates(simulator_, this->wellState(), local_deferredLogger);
                 }

diff --git a/opm/simulators/wells/MultisegmentWellAssemble.cpp b/opm/simulators/wells/MultisegmentWellAssemble.cpp
@@ -92,6 +92,7 @@ assembleControlEq(const WellState& well_state,
                   const double rho,
                   const PrimaryVariables& primary_variables,
                   Equations& eqns1,
+                  const bool stopped_or_zero_target,
                   DeferredLogger& deferred_logger) const
 {
     static constexpr int Gas = BlackoilPhases::Vapour;
@@ -116,7 +117,7 @@ assembleControlEq(const WellState& well_state,
         return rates;
     };
 
-    if (well_.stopppedOrZeroRateTarget(summaryState, well_state)) {
+    if (stopped_or_zero_target) {
         control_eq = primary_variables.getWQTotal();
     } else if (well_.isInjector() ) {
         // Find scaling factor to get injection rate,

diff --git a/opm/simulators/wells/MultisegmentWellAssemble.hpp b/opm/simulators/wells/MultisegmentWellAssemble.hpp
@@ -79,6 +79,7 @@ class MultisegmentWellAssemble
                            const double rho,
                            const PrimaryVariables& primary_variables,
                            Equations& eqns,
+                           const bool stopped_or_zero_target,
                            DeferredLogger& deferred_logger) const;
 
     //! \brief Assemble piece of the acceleration term

diff --git a/opm/simulators/wells/MultisegmentWell_impl.hpp b/opm/simulators/wells/MultisegmentWell_impl.hpp
@@ -159,7 +159,7 @@ namespace Opm
                            const WellState& well_state,
                            DeferredLogger& /* deferred_logger */)
     {
-        const bool stop_or_zero_rate_target = this->stopppedOrZeroRateTarget(summary_state, well_state);
+        const bool stop_or_zero_rate_target = this->stoppedOrZeroRateTargetIndividual(summary_state, well_state);
         this->primary_variables_.update(well_state, stop_or_zero_rate_target);
     }
 
@@ -684,7 +684,7 @@ namespace Opm
 
         const double dFLimit = this->param_.dwell_fraction_max_;
         const double max_pressure_change = this->param_.max_pressure_change_ms_wells_;
-        const bool stop_or_zero_rate_target = this->stopppedOrZeroRateTarget(summary_state, well_state);
+        const bool stop_or_zero_rate_target = this->stoppedOrZeroRateTargetIndividual(summary_state, well_state);
         this->primary_variables_.updateNewton(dwells,
                                               relaxation_factor,
                                               dFLimit,
@@ -1625,7 +1625,7 @@ namespace Opm
         const bool allow_open =  this->well_ecl_.getStatus() == WellStatus::OPEN &&
                                  well_state.well(this->index_of_well_).status == WellStatus::OPEN;
         // don't allow switcing for wells under zero rate target or requested fixed status and control
-        const bool allow_switching = !this->wellUnderZeroRateTarget(summary_state, well_state) &&
+        const bool allow_switching = !this->wellUnderZeroRateTarget(simulator, well_state, deferred_logger) &&
                                      (!fixed_control || !fixed_status) && allow_open;
         bool changed = false;
         bool final_check = false;
@@ -1894,10 +1894,11 @@ namespace Opm
                 }
             }
 
-            // the fourth dequation, the pressure drop equation
+            // the fourth equation, the pressure drop equation
             if (seg == 0) { // top segment, pressure equation is the control equation
                 const auto& summaryState = simulator.vanguard().summaryState();
                 const Schedule& schedule = simulator.vanguard().schedule();
+                const bool stopped_or_zero_target = this->stoppedOrZeroRateTarget(simulator, well_state, deferred_logger);
                 MultisegmentWellAssemble(*this).
                         assembleControlEq(well_state,
                                         group_state,
@@ -1908,6 +1909,7 @@ namespace Opm
                                         getRefDensity(),
                                         this->primary_variables_,
                                         this->linSys_,
+                                        stopped_or_zero_target,
                                         deferred_logger);
             } else {
                 const UnitSystem& unit_system = simulator.vanguard().eclState().getDeckUnitSystem();

diff --git a/opm/simulators/wells/StandardWellAssemble.cpp b/opm/simulators/wells/StandardWellAssemble.cpp
@@ -93,6 +93,7 @@ assembleControlEq(const WellState& well_state,
                   const PrimaryVariables& primary_variables,
                   const double rho,
                   StandardWellEquations<Scalar,Indices::numEq>& eqns1,
+                  const bool stopped_or_zero_target, 
                   DeferredLogger& deferred_logger) const
 {
     static constexpr int Water = BlackoilPhases::Aqua;
@@ -119,7 +120,7 @@ assembleControlEq(const WellState& well_state,
         return rates;
     };
 
-    if (well_.stopppedOrZeroRateTarget(summaryState, well_state)) {
+    if (stopped_or_zero_target) {
         control_eq = primary_variables.eval(PrimaryVariables::WQTotal);
     } else if (well_.isInjector()) {
         // Find injection rate.

diff --git a/opm/simulators/wells/StandardWellAssemble.hpp b/opm/simulators/wells/StandardWellAssemble.hpp
@@ -61,6 +61,7 @@ class StandardWellAssemble
                            const PrimaryVariables& primary_variables,
                            const double rho,
                            StandardWellEquations<Scalar,Indices::numEq>& eqns,
+                           const bool stopped_or_zero_target,
                            DeferredLogger& deferred_logger) const;
 
     //! \brief Assemble injectivity equation.

diff --git a/opm/simulators/wells/StandardWell_impl.hpp b/opm/simulators/wells/StandardWell_impl.hpp
@@ -455,13 +455,15 @@ namespace Opm
 
         const auto& summaryState = simulator.vanguard().summaryState();
         const Schedule& schedule = simulator.vanguard().schedule();
+        const bool stopped_or_zero_target = this->stoppedOrZeroRateTarget(simulator, well_state, deferred_logger);
         StandardWellAssemble<FluidSystem,Indices>(*this).
             assembleControlEq(well_state, group_state,
                               schedule, summaryState,
                               inj_controls, prod_controls,
                               this->primary_variables_,
                               this->connections_.rho(),
                               this->linSys_,
+                              stopped_or_zero_target,
                               deferred_logger);
 
 
@@ -692,7 +694,7 @@ namespace Opm
     {
         if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
-        const bool stop_or_zero_rate_target = this->stopppedOrZeroRateTarget(summary_state, well_state);
+        const bool stop_or_zero_rate_target = this->stoppedOrZeroRateTargetIndividual(summary_state, well_state);
         updatePrimaryVariablesNewton(dwells, stop_or_zero_rate_target, deferred_logger);
 
         updateWellStateFromPrimaryVariables(stop_or_zero_rate_target, well_state, summary_state, deferred_logger);
@@ -1183,7 +1185,7 @@ namespace Opm
         constexpr double stopped_factor = 1.e-4;
         // use stricter tolerance for dynamic thp to ameliorate network convergence
         constexpr double dynamic_thp_factor = 1.e-1;
-        if (this->stopppedOrZeroRateTarget(summary_state, well_state)) {
+        if (this->stoppedOrZeroRateTargetIndividual(summary_state, well_state)) {
             tol_wells = tol_wells*stopped_factor;
         } else if (this->getDynamicThpLimit()) {
             tol_wells = tol_wells*dynamic_thp_factor;
@@ -1771,7 +1773,7 @@ namespace Opm
     {
         if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
-        const bool stop_or_zero_rate_target = this->stopppedOrZeroRateTarget(summary_state, well_state);
+        const bool stop_or_zero_rate_target = this->stoppedOrZeroRateTargetIndividual(summary_state, well_state);
         this->primary_variables_.update(well_state, stop_or_zero_rate_target, deferred_logger);
 
         // other primary variables related to polymer injection
@@ -2357,9 +2359,7 @@ namespace Opm
         const bool allow_open =  this->well_ecl_.getStatus() == WellStatus::OPEN &&
                                  well_state.well(this->index_of_well_).status == WellStatus::OPEN;
         // don't allow switcing for wells under zero rate target or requested fixed status and control
-        //const bool allow_switching = !this->wellUnderZeroRateTarget(summary_state, well_state) &&
-         //                            (!fixed_control || !fixed_status) && allow_open;
-        const bool allow_switching = !this->wellUnderZeroRateTargetVersion(ebosSimulator, well_state, deferred_logger) &&
+        const bool allow_switching = !this->wellUnderZeroRateTarget(simulator, well_state, deferred_logger) &&
                                      (!fixed_control || !fixed_status) && allow_open;
 
         bool changed = false;

diff --git a/opm/simulators/wells/WellInterface.hpp b/opm/simulators/wells/WellInterface.hpp
@@ -230,13 +230,18 @@ class WellInterface : public WellInterfaceIndices<GetPropType<TypeTag, Propertie
                                                    std::vector<double>& well_flux,
                                                    DeferredLogger& deferred_logger) const = 0;
 
-    bool wellUnderZeroRateTargetVersion(const Simulator& ebos_simulator,
-                                        const WellState& well_state,
-                                        DeferredLogger& deferred_logger) const;
-
-    bool stoppedOrZeroRateTargetVersion(const Simulator& ebos_simulator,
-                                        const WellState& well_state,
-                                        DeferredLogger& deferred_logger) const;
+    bool wellUnderZeroRateTargetGroup(const Simulator& simulator,
+                                      const WellState& well_state,
+                                      const GroupState& group_state,
+                                      DeferredLogger& deferred_logger) const;
+
+    bool wellUnderZeroRateTarget(const Simulator& simulator,
+                                 const WellState& well_state,
+                                 DeferredLogger& deferred_logger) const;
+
+    bool stoppedOrZeroRateTarget(const Simulator& simulator,
+                                 const WellState& well_state,
+                                 DeferredLogger& deferred_logger) const;
 
     bool updateWellStateWithTHPTargetProd(const Simulator& simulator,
                                           WellState& well_state,

diff --git a/opm/simulators/wells/WellInterfaceGeneric.cpp b/opm/simulators/wells/WellInterfaceGeneric.cpp
@@ -549,8 +549,8 @@ bool WellInterfaceGeneric::isPressureControlled(const WellState& well_state) con
 
 
 
-bool WellInterfaceGeneric::wellUnderZeroRateTarget(const SummaryState& summary_state,
-                                                   const WellState& well_state) const
+bool WellInterfaceGeneric::wellUnderZeroRateTargetIndividual(const SummaryState& summary_state,
+                                                             const WellState& well_state) const
 {
     if (this->isProducer()) { // producers
         const auto prod_controls = this->well_ecl_.productionControls(summary_state);
@@ -563,10 +563,10 @@ bool WellInterfaceGeneric::wellUnderZeroRateTarget(const SummaryState& summary_s
     }
 }
 
-bool WellInterfaceGeneric::stopppedOrZeroRateTarget(const SummaryState& summary_state,
-                                                    const WellState& well_state) const
+bool WellInterfaceGeneric::stoppedOrZeroRateTargetIndividual(const SummaryState& summary_state,
+                                                             const WellState& well_state) const
 {
-    return (this->wellIsStopped() || this->wellUnderZeroRateTarget(summary_state, well_state));
+    return (this->wellIsStopped() || this->wellUnderZeroRateTargetIndividual(summary_state, well_state));
 
 }
 

diff --git a/opm/simulators/wells/WellInterfaceGeneric.hpp b/opm/simulators/wells/WellInterfaceGeneric.hpp
@@ -207,8 +207,8 @@ class WellInterfaceGeneric {
 
     bool isPressureControlled(const WellState& well_state) const;
 
-    bool stopppedOrZeroRateTarget(const SummaryState& summary_state,
-                                  const WellState& well_state) const;
+    bool stoppedOrZeroRateTargetIndividual(const SummaryState& summary_state,
+                                           const WellState& well_state) const;
 
     double wellEfficiencyFactor() const
     { return well_efficiency_factor_; }
@@ -235,8 +235,8 @@ class WellInterfaceGeneric {
     int polymerInjTable_() const;
     int polymerWaterTable_() const;
 
-    bool wellUnderZeroRateTarget(const SummaryState& summary_state,
-                                 const WellState& well_state) const;
+    bool wellUnderZeroRateTargetIndividual(const SummaryState& summary_state,
+                                           const WellState& well_state) const;
 
     std::pair<bool,bool>
     computeWellPotentials(std::vector<double>& well_potentials,