BlackoilWellModel: let network class handle wellTesting update

Author: akva2

opm/simulators/wells/BlackoilWellModelNetworkGeneric.cpp

@@ -266,18 +266,24 @@ initialize(const int report_step)
     const auto& network = well_model_.schedule()[report_step].network();
     if (network.active() && !node_pressures_.empty()) {
         for (auto& well : well_model_.genericWells()) {
-            // Producers only, since we so far only support the
-            // "extended" network model (properties defined by
-            // BRANPROP and NODEPROP) which only applies to producers.
-            if (well->isProducer()) {
-                const auto it = this->node_pressures_.find(well->wellEcl().groupName());
-                if (it != this->node_pressures_.end()) {
-                    // The well belongs to a group which has a network nodal pressure,
-                    // set the dynamic THP constraint based on the network nodal pressure
-                    const Scalar nodal_pressure = it->second;
-                    well->setDynamicThpLimit(nodal_pressure);
-                }
-            }
+            initializeWell(*well);
+        }
+    }
+}
+
+template<typename Scalar, typename IndexTraits>
+void BlackoilWellModelNetworkGeneric<Scalar, IndexTraits>::
+initializeWell(WellInterfaceGeneric<Scalar,IndexTraits>& well)
+{
+    // Producers only, since we so far only support the
+    // "extended" network model (properties defined by
+    // BRANPROP and NODEPROP) which only applies to producers.
+    if (well.isProducer() && !node_pressures_.empty()) {
+        const auto it = this->node_pressures_.find(well.wellEcl().groupName());
+        if (it != this->node_pressures_.end()) {
+            // The well belongs to a group which has a network nodal pressure,
+            // set the dynamic THP constraint based on the network nodal pressure
+            well.setDynamicThpLimit(it->second);
         }
     }
 }

opm/simulators/wells/BlackoilWellModelNetworkGeneric.hpp

@@ -34,6 +34,7 @@ namespace Opm {
     class Schedule;
     template<class Scalar, class IndexTraits> class BlackoilWellModelGeneric;
     template<typename Scalar, typename IndexTraits> class WellGroupHelpers;
+    template<typename Scalar, typename IndexTraits> class WellInterfaceGeneric;
 }
 
 namespace Opm {
@@ -65,6 +66,9 @@ class BlackoilWellModelNetworkGeneric
     //! \brief Initialize wells according to network configuration.
     void initialize(const int report_step);
 
+    //! \brief Initialize a single well according to network configuration.
+    void initializeWell(WellInterfaceGeneric<Scalar,IndexTraits>& well);
+
     /// Checks if network is active (at least one network well on prediction).
     void updateActiveState(const int report_step);
 

opm/simulators/wells/BlackoilWellModel_impl.hpp

@@ -575,17 +575,8 @@ namespace Opm {
             }
 
             const auto& network = this->schedule()[timeStepIdx].network();
-            const auto& node_pressures = this->network_.nodePressures();
-            if (network.active() && !node_pressures.empty()) {
-                if (well->isProducer()) {
-                    const auto it = node_pressures.find(well->wellEcl().groupName());
-                    if (it != node_pressures.end()) {
-                        // The well belongs to a group which has a network nodal pressure,
-                        // set the dynamic THP constraint based on the network nodal pressure
-                        const Scalar nodal_pressure = it->second;
-                        well->setDynamicThpLimit(nodal_pressure);
-                    }
-                }
+            if (network.active()) {
+                this->network_.initializeWell(*well);
             }
             try {
                 using GLiftEclWells = typename GasLiftGroupInfo<Scalar, IndexTraits>::GLiftEclWells;