OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-25 23:20:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update api for checking availability for group control

Browse Source
This commit is contained in:
Joakim Hove committed 2020-04-17 13:03:56 +02:00
1 parent 745be42682
commit 6260bb7851
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/simulators/wells/WellGroupHelpers.cpp
+2 -2
View File
@@ -859,7 +859,7 @@ namespace WellGroupHelpers
= wellState.currentInjectionGroupControl(injectionPhase, group.name());
if (currentGroupControl == Group::InjectionCMode::FLD || currentGroupControl == Group::InjectionCMode::NONE) {
// Return if we are not available for parent group.
if (!group.isAvailableForGroupControl()) {
if (!group.injectionGroupControlAvailable(injectionPhase)) {
return std::make_pair(false, 1.0);
}
// Otherwise: check injection share of parent's control.
@@ -1085,7 +1085,7 @@ namespace WellGroupHelpers
if (currentGroupControl == Group::ProductionCMode::FLD || currentGroupControl == Group::ProductionCMode::NONE) {
// Return if we are not available for parent group.
if (!group.isAvailableForGroupControl()) {
if (!group.productionGroupControlAvailable()) {
return std::make_pair(false, 1);
}
// Otherwise: check production share of parent's control.
opm/simulators/wells/WellInterface_impl.hpp
+2 -2
View File
@@ -2075,7 +2075,7 @@ namespace Opm
if (currentGroupControl == Group::InjectionCMode::FLD ||
currentGroupControl == Group::InjectionCMode::NONE) {
if (!group.isAvailableForGroupControl()) {
if (!group.injectionGroupControlAvailable(injectionPhase)) {
// We cannot go any further up the hierarchy. This could
// be the FIELD group, or any group for which this has
// been set in GCONINJE or GCONPROD. If we are here
@@ -2214,7 +2214,7 @@ namespace Opm
const Group::ProductionCMode& currentGroupControl = well_state.currentProductionGroupControl(group.name());
if (currentGroupControl == Group::ProductionCMode::FLD ||
currentGroupControl == Group::ProductionCMode::NONE) {
if (!group.isAvailableForGroupControl()) {
if (!group.productionGroupControlAvailable()) {
// We cannot go any further up the hierarchy. This could
// be the FIELD group, or any group for which this has
// been set in GCONINJE or GCONPROD. If we are here