From 429b312bc0b22d9e222d8df47db77af02caf74f8 Mon Sep 17 00:00:00 2001
From: Vegard Kippe <vkip@equinor.com>
Date: Fri, 27 Oct 2023 20:30:48 +0200
Subject: [PATCH] Re-introducing check for negative reportStepIdx and adding
 forgotten hasGroup check.

---
 opm/simulators/wells/BlackoilWellModelGeneric.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/opm/simulators/wells/BlackoilWellModelGeneric.cpp b/opm/simulators/wells/BlackoilWellModelGeneric.cpp
index 66d277629..fdfb59857 100644
--- a/opm/simulators/wells/BlackoilWellModelGeneric.cpp
+++ b/opm/simulators/wells/BlackoilWellModelGeneric.cpp
@@ -912,6 +912,7 @@ BlackoilWellModelGeneric::
 assignNodeValues(std::map<std::string, data::NodeData>& nodevalues, const int reportStepIdx) const
 {
     nodevalues.clear();
+    if (reportStepIdx < 0) return;
 
     for (const auto& [node, pressure] : node_pressures_) {
         nodevalues.emplace(node, data::NodeData{pressure});
@@ -938,7 +939,9 @@ assignNodeValues(std::map<std::string, data::NodeData>& nodevalues, const int re
         assert(it != nodevalues.end() );
         it->second.converged_pressure = converged_pressure;
         // Assign node values of group to GPR:WELLNAME
-        const auto& group = schedule().getGroup(node, reportStepIdx);
+        const auto& sched = schedule();
+        if (!sched.hasGroup(node, reportStepIdx)) continue;
+        const auto& group = sched.getGroup(node, reportStepIdx);
         for (const std::string& wellname : group.wells()) {
                 auto it2 = nodevalues.find(wellname);
                 assert(it2 != nodevalues.end());