OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-22 15:33:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5791 from totto82/allow3

Browse Source 
Allow for the third group switch
This commit is contained in:
Tor Harald Sandve 2024-12-10 10:31:38 +01:00 committed by GitHub
commit c1f16bd981
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/wells/BlackoilWellModelConstraints.cpp
View File

@ -581,7 +581,7 @@ updateGroupIndividualControl(const Group& group,
if (auto groupPos = switched_inj.find(group.name()); groupPos != switched_inj.end()) {
auto& ctrls = groupPos->second[static_cast<std::underlying_type_t<Phase>>(phase)];
for (const auto& ctrl : ctrls) {
if (std::count(ctrls.begin(), ctrls.end(), ctrl) < max_number_of_group_switch) {
if (std::count(ctrls.begin(), ctrls.end(), ctrl) <= max_number_of_group_switch) {
continue;
}
@ -633,7 +633,7 @@ updateGroupIndividualControl(const Group& group,
if (auto groupPos = switched_prod.find(group.name()); groupPos != switched_prod.end()) {
auto& ctrls = groupPos->second;
for (const auto& ctrl : ctrls) {
if (std::count(ctrls.begin(), ctrls.end(), ctrl) < max_number_of_group_switch) {
if (std::count(ctrls.begin(), ctrls.end(), ctrl) <= max_number_of_group_switch) {
continue;
}

4
opm/simulators/wells/BlackoilWellModelGeneric.cpp
View File

@ -631,7 +631,7 @@ checkGroupHigherConstraints(const Group& group,
if (auto groupPos = switched_inj_groups_.find(group.name()); groupPos != switched_inj_groups_.end()) {
auto& ctrls = groupPos->second[static_cast<std::underlying_type_t<Phase>>(phase)];
for (const auto& ctrl : ctrls) {
if (std::count(ctrls.begin(), ctrls.end(), ctrl) < max_number_of_group_switch) {
if (std::count(ctrls.begin(), ctrls.end(), ctrl) <= max_number_of_group_switch) {
continue;
}
@ -705,7 +705,7 @@ checkGroupHigherConstraints(const Group& group,
if (auto groupPos = switched_prod_groups_.find(group.name()); groupPos != switched_prod_groups_.end()) {
auto& ctrls = groupPos->second;
for (const auto& ctrl : ctrls) {
if (std::count(ctrls.begin(), ctrls.end(), ctrl) < max_number_of_group_switch) {
if (std::count(ctrls.begin(), ctrls.end(), ctrl) <= max_number_of_group_switch) {
continue;
}

3
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -761,10 +761,7 @@ namespace Opm {
local_deferredLogger.info(msg);
}
}
for (const auto& [grname, grdata] : this->switched_inj_groups_) {
//const std::string& name = key.first;
//const Opm::Phase& phase = key.second;
const Phase all[] = {Phase::WATER, Phase::OIL, Phase::GAS};
for (Phase phase : all) {
const auto& ctrls = grdata[static_cast<std::underlying_type_t<Phase>>(phase)];