Fix issues related to commiting wellstate after 1 iteration

These changes should be merged seperatly

Author: Tor Harald Sandve

opm/simulators/wells/BlackoilWellModelConstraints.cpp

@@ -606,14 +606,14 @@ updateGroupIndividualControl(const Group& group,
             if (group_is_oscillating) {
                 continue;
             }
-
+            const auto currentControl = wellModel_.groupState().injection_control(group.name(), phase);
             const auto& changed_this = this->checkGroupInjectionConstraints(group,
                                                                             reportStepIdx,
                                                                             phase);
             if (changed_this.first != Group::InjectionCMode::NONE)
             {
                 switched_inj[group.name()][static_cast<std::underlying_type_t<Phase>>(phase)].push_back(
-                             changed_this.first);
+                             currentControl);
 
                 this->actionOnBrokenConstraints(group, changed_this.first, phase,
                                                 group_state, deferred_logger);
@@ -658,6 +658,7 @@ updateGroupIndividualControl(const Group& group,
 
         if (changed_this.first != Group::ProductionCMode::NONE)
         {
+            const auto currentControl = wellModel_.groupState().production_control(group.name());
             std::optional<std::string> worst_offending_well = std::nullopt;
             changed = this->actionOnBrokenConstraints(group, reportStepIdx,              
                                             controls.group_limit_action,
@@ -666,7 +667,7 @@ updateGroupIndividualControl(const Group& group,
                                             group_state, deferred_logger);
 
             if(changed) {
-                switched_prod[group.name()].push_back(changed_this.first);
+                switched_prod[group.name()].push_back(currentControl);
                 WellGroupHelpers<Scalar>::updateWellRatesFromGroupTargetScale(changed_this.second,
                                                                               group,
                                                                               wellModel_.schedule(),

opm/simulators/wells/BlackoilWellModelGeneric.cpp

@@ -697,7 +697,7 @@ checkGroupHigherConstraints(const Group& group,
                                                                        resv_coeff_inj,
                                                                        deferred_logger);
                 if (is_changed) {
-                    switched_inj_groups_[group.name()][static_cast<std::underlying_type_t<Phase>>(phase)].push_back(Group::InjectionCMode::FLD);
+                    switched_inj_groups_[group.name()][static_cast<std::underlying_type_t<Phase>>(phase)].push_back(currentControl);
                     BlackoilWellModelConstraints(*this).
                         actionOnBrokenConstraints(group, Group::InjectionCMode::FLD,
                                                   phase, this->groupState(),
@@ -784,7 +784,7 @@ checkGroupHigherConstraints(const Group& group,
                                                   deferred_logger);
 
                 if (changed) {
-                    switched_prod_groups_[group.name()].push_back(Group::ProductionCMode::FLD);
+                    switched_prod_groups_[group.name()].push_back(currentControl);
                     WellGroupHelpers<Scalar>::updateWellRatesFromGroupTargetScale(scaling_factor,
                                                                                   group,
                                                                                   schedule(),
@@ -1388,7 +1388,7 @@ updateAndCommunicateGroupData(const int reportStepIdx,
     WellGroupHelpers<Scalar>::updateWellRates(fieldGroup,
                                               schedule(),
                                               reportStepIdx,
-                                              this->prevWellState(),
+                                              well_state_nupcol,
                                               well_state);
 
     // Set ALQ for off-process wells to zero
@@ -2033,36 +2033,36 @@ void BlackoilWellModelGeneric<Scalar>::
 reportGroupSwitching(DeferredLogger& local_deferredLogger) const
 {
     for (const auto& [name, ctrls] : this->switched_prod_groups_) {
-        const Group::ProductionCMode& oldControl =
-            this->prevWGState().group_state.production_control(name);
-        if (ctrls.back() != oldControl) {
+        const Group::ProductionCMode& newControl =
+            this->groupState().production_control(name);
+        if (ctrls[0] != newControl) {
             const std::string msg =
                 fmt::format("    Production Group {} control model changed from {} to {}",
                             name,
-                            Group::ProductionCMode2String(oldControl),
-                            Group::ProductionCMode2String(ctrls.back()));
+                            Group::ProductionCMode2String(ctrls[0]),
+                            Group::ProductionCMode2String(newControl));
             local_deferredLogger.info(msg);
         }
     }
     for (const auto& [grname, grdata] : this->switched_inj_groups_) {
         const Phase all[] = {Phase::WATER, Phase::OIL, Phase::GAS};
         for (Phase phase : all) {
-            if (!this->prevWGState().group_state.has_injection_control(grname, phase)) {
+            if (!this->groupState().has_injection_control(grname, phase)) {
                 continue;
             }
             const auto& ctrls = grdata[static_cast<std::underlying_type_t<Phase>>(phase)];
             if (ctrls.empty()) {
                 continue;
             }
 
-            const Group::InjectionCMode& oldControl =
-                this->prevWGState().group_state.injection_control(grname, phase);
-            if (ctrls.back() != oldControl) {
+            const Group::InjectionCMode& newControl =
+                this->groupState().injection_control(grname, phase);
+            if (ctrls[0] != newControl) {
                 const std::string msg =
                     fmt::format("    Injection Group {} control model changed from {} to {}",
                                 grname,
-                                Group::InjectionCMode2String(oldControl),
-                                Group::InjectionCMode2String(ctrls.back()));
+                                Group::InjectionCMode2String(ctrls[0]),
+                                Group::InjectionCMode2String(newControl));
                 local_deferredLogger.info(msg);
             }
         }