This is a combination of 3 commits.

autochoke producers control mode set to THP

simplyfying code as some logic is moved to the parser

minor repair work

opm/simulators/wells/BlackoilWellModelGeneric.cpp

@@ -1562,9 +1562,6 @@ updateNetworkPressures(const int reportStepIdx, const Scalar damping_factor)
                 if (thp_is_limit) {
                     ws.thp = well->getTHPConstraint(summaryState_);
                 }
-                //PJPE: Set thp of wells belonging to a subsea manifold equal to the node_pressure
-                if (network.node(well->wellEcl().groupName()).as_choke())
-                    ws.thp = new_limit;
             }
         }
     }