Raise WELL_THP_UPDATE also for injectors

WCONINJE and WCONINJH, and WELTARG THP/VFP and WTMULT THP on injectors,
re-specify the injector THP limit and/or VFP table just like the
producer variants. Consumers gate on the well type where it matters.

Author: GitPaean

opm/input/eclipse/Schedule/Action/SimulatorUpdate.hpp

@@ -73,12 +73,13 @@ struct SimulatorUpdate
     std::unordered_set<std::string> welpi_wells{};
 
     /// Wells whose THP limit and/or VFP table has been (re)specified by
-    /// WCONPROD or WCONHIST for the named wells, by WELTARG with THP or VFP
-    /// control, or by WTMULT with THP control. Unlike affected_wells, this
-    /// set also includes wells for which the entered values are unchanged,
-    /// since re-specifying either input cancels a THP limit imposed
-    /// dynamically by the simulator (e.g. by network balancing). See also
-    /// the WELL_THP_UPDATE schedule event.
+    /// WCONPROD, WCONHIST, WCONINJE or WCONINJH for the named wells, by
+    /// WELTARG with THP or VFP control, or by WTMULT with THP control.
+    /// Producers and injectors alike are included. Unlike affected_wells,
+    /// this set also includes wells for which the entered values are
+    /// unchanged, since re-specifying either input cancels a THP limit
+    /// imposed dynamically by the simulator (e.g. by network balancing).
+    /// See also the WELL_THP_UPDATE schedule event.
     std::unordered_set<std::string> thp_respec_wells{};
 
     /// New well connections created as a result of a geomechanical

opm/input/eclipse/Schedule/Events.hpp

@@ -115,12 +115,14 @@ namespace Opm
             REQUEST_OPEN_COMPLETION = (UINT64_C(1) << 24),
 
             /// The well THP limit and/or VFP table has been (re)specified
-            /// by WCONPROD or WCONHIST for the named wells, by WELTARG with
-            /// THP or VFP control, or by WTMULT with THP control.  Unlike
-            /// PRODUCTION_UPDATE, the event is also triggered when the
-            /// entered values are unchanged, since re-specifying either
-            /// input cancels a THP limit imposed dynamically by the
-            /// simulator (e.g. by network balancing).
+            /// by WCONPROD, WCONHIST, WCONINJE or WCONINJH for the named
+            /// wells, by WELTARG with THP or VFP control, or by WTMULT with
+            /// THP control.  The event applies to producers and injectors
+            /// alike; consumers must check the well type where it matters.
+            /// Unlike PRODUCTION_UPDATE and INJECTION_UPDATE, the event is
+            /// also triggered when the entered values are unchanged, since
+            /// re-specifying either input cancels a THP limit imposed
+            /// dynamically by the simulator (e.g. by network balancing).
             WELL_THP_UPDATE = (UINT64_C(1) << 25),
         };
     } // namespace ScheduleEvents

opm/input/eclipse/Schedule/Well/WellKeywordHandlers.cpp

@@ -267,6 +267,12 @@ void handleWCONINJE(HandlerContext& handlerContext)
                 update_well = true;
             }
 
+            // The THP limit and VFP table (items 8 and 9) are re-specified
+            // by every WCONINJE, whether or not any value changed.
+            handlerContext.state().events().addEvent( ScheduleEvents::WELL_THP_UPDATE );
+            handlerContext.state().wellgroup_events().addEvent( well_name, ScheduleEvents::WELL_THP_UPDATE);
+            handlerContext.thp_respec_well(well_name);
+
             if (update_well) {
                 handlerContext.state().events().addEvent(ScheduleEvents::INJECTION_UPDATE);
                 handlerContext.state().wellgroup_events().addEvent( well_name, ScheduleEvents::INJECTION_UPDATE);
@@ -342,6 +348,12 @@ void handleWCONINJH(HandlerContext& handlerContext)
                 update_well = true;
             }
 
+            // The VFP table (item 7) is re-specified by every WCONINJH,
+            // whether or not any value changed.
+            handlerContext.state().events().addEvent( ScheduleEvents::WELL_THP_UPDATE );
+            handlerContext.state().wellgroup_events().addEvent( well_name, ScheduleEvents::WELL_THP_UPDATE);
+            handlerContext.thp_respec_well(well_name);
+
             if (update_well) {
                 handlerContext.state().events().addEvent( ScheduleEvents::INJECTION_UPDATE );
                 handlerContext.state().wellgroup_events().addEvent( well_name, ScheduleEvents::INJECTION_UPDATE);
@@ -848,9 +860,7 @@ void handleWELTARG(HandlerContext& handlerContext)
 
             // The THP limit or VFP table is re-specified, whether or not
             // the value changed.
-            if (well2.isProducer() &&
-                (cmode == Well::WELTARGCMode::THP || cmode == Well::WELTARGCMode::VFP))
-            {
+            if (cmode == Well::WELTARGCMode::THP || cmode == Well::WELTARGCMode::VFP) {
                 handlerContext.state().events().addEvent( ScheduleEvents::WELL_THP_UPDATE );
                 handlerContext.state().wellgroup_events().addEvent( well_name, ScheduleEvents::WELL_THP_UPDATE);
                 handlerContext.thp_respec_well(well_name);

opm/input/eclipse/Schedule/Well/WellPropertiesKeywordHandlers.cpp

@@ -609,6 +609,17 @@ void handleWTMULT(HandlerContext& handlerContext)
         for (const auto& well_name : well_names) {
             auto well = handlerContext.state().wells.get(well_name);
 
+            // The THP limit is re-specified (multiplied).
+            if (cmode == Well::WELTARGCMode::THP) {
+                handlerContext.state().events()
+                    .addEvent(ScheduleEvents::WELL_THP_UPDATE);
+
+                handlerContext.state().wellgroup_events()
+                    .addEvent(well_name, ScheduleEvents::WELL_THP_UPDATE);
+
+                handlerContext.thp_respec_well(well_name);
+            }
+
             if (well.isInjector()) {
                 const bool update_well = true;
 
@@ -634,17 +645,6 @@ void handleWTMULT(HandlerContext& handlerContext)
 
                 well.updateProduction(properties);
 
-                // The THP limit is re-specified (multiplied).
-                if (cmode == Well::WELTARGCMode::THP) {
-                    handlerContext.state().events()
-                        .addEvent(ScheduleEvents::WELL_THP_UPDATE);
-
-                    handlerContext.state().wellgroup_events()
-                        .addEvent(well_name, ScheduleEvents::WELL_THP_UPDATE);
-
-                    handlerContext.thp_respec_well(well_name);
-                }
-
                 if (update_well) {
                     handlerContext.state().events()
                         .addEvent(ScheduleEvents::PRODUCTION_UPDATE);

tests/parser/ScheduleTests.cpp

@@ -7247,10 +7247,14 @@ SCHEDULE
 
 WELSPECS
     'P1' 'G1'  1 1 2500 'OIL' /
+    'I1' 'G1'  2 2 2500 'WAT' /
 /
 WCONPROD
     'P1' 'OPEN' 'ORAT' 1000 4* 50.0 /
 /
+WCONINJE
+    'I1' 'WATER' 'OPEN' 'RATE' 1000 /
+/
 
 DATES        -- 1
  10 JUN 1998 /
@@ -7299,6 +7303,38 @@ DATES        -- 6
 WCONHIST
     'P1' 'OPEN' 'ORAT' 100 0 0 /
 /
+
+DATES        -- 7
+ 10 DES 1998 /
+/
+
+WELTARG
+    'I1' 'THP' 30 /
+/
+
+DATES        -- 8
+ 10 JAN 1999 /
+/
+
+WELTARG
+    'I1' 'WRAT' 800 /
+/
+
+DATES        -- 9
+ 10 FEB 1999 /
+/
+
+WTMULT
+    'I1' 'THP' 2.0 /
+/
+
+DATES        -- 10
+ 10 MAR 1999 /
+/
+
+WCONINJH
+    'I1' 'WATER' 'OPEN' 100 /
+/
 )");
 
     // Initial WCONPROD specifies the THP limit and VFP table
@@ -7319,4 +7355,17 @@ WCONHIST
     BOOST_CHECK( schedule[5].wellgroup_events().hasEvent("P1", ScheduleEvents::WELL_THP_UPDATE));
     // WCONHIST re-specifies the VFP table
     BOOST_CHECK( schedule[6].wellgroup_events().hasEvent("P1", ScheduleEvents::WELL_THP_UPDATE));
+
+    // The event also applies to injectors:
+    // WCONINJE re-specifies the THP limit and VFP table
+    BOOST_CHECK( schedule[0].wellgroup_events().hasEvent("I1", ScheduleEvents::WELL_THP_UPDATE));
+    // WELTARG THP re-specifies the THP limit
+    BOOST_CHECK( schedule[7].wellgroup_events().hasEvent("I1", ScheduleEvents::WELL_THP_UPDATE));
+    // WELTARG WRAT does not touch the THP limit or VFP table
+    BOOST_CHECK(!schedule[8].wellgroup_events().hasEvent("I1", ScheduleEvents::WELL_THP_UPDATE));
+    BOOST_CHECK( schedule[8].wellgroup_events().hasEvent("I1", ScheduleEvents::INJECTION_UPDATE));
+    // WTMULT with THP control re-specifies (multiplies) the THP limit
+    BOOST_CHECK( schedule[9].wellgroup_events().hasEvent("I1", ScheduleEvents::WELL_THP_UPDATE));
+    // WCONINJH re-specifies the VFP table
+    BOOST_CHECK( schedule[10].wellgroup_events().hasEvent("I1", ScheduleEvents::WELL_THP_UPDATE));
 }