mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-12-22 15:33:29 -06:00
Code improvment for the group control switching
Pass the controls as enums not strings Avoid pair as key in map
This commit is contained in:
Tor Harald Sandve
parent
738eb761c2
commit
095c0457bc
@ -562,8 +562,8 @@ bool BlackoilWellModelConstraints<Scalar>::
|
||||
updateGroupIndividualControl(const Group& group,
|
||||
const int reportStepIdx,
|
||||
const int max_number_of_group_switch,
|
||||
std::map<std::pair<std::string,Phase>,std::vector<std::string>>& switched_inj,
|
||||
std::map<std::string, std::vector<std::string>>& switched_prod,
|
||||
std::map<std::string, std::array<std::vector<Group::InjectionCMode>, 3>>& switched_inj,
|
||||
std::map<std::string, std::vector<Group::ProductionCMode>>& switched_prod,
|
||||
std::map<std::string, std::pair<std::string, std::string>>& closed_offending_wells,
|
||||
GroupState<Scalar>& group_state,
|
||||
WellState<Scalar>& well_state,
|
||||
@ -577,31 +577,32 @@ updateGroupIndividualControl(const Group& group,
|
||||
if (!group.hasInjectionControl(phase)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
bool group_is_oscillating = false;
|
||||
if (switched_inj.count({group.name(), phase}) > 0) {
|
||||
for (const auto& key : switched_inj[{group.name(), phase}]) {
|
||||
if (std::count(switched_inj[{group.name(), phase}].begin(), switched_inj[{group.name(), phase}].end(), key) >= max_number_of_group_switch) {
|
||||
const size_t sz = switched_inj[{group.name(), phase}].size();
|
||||
// only output if the two last keys are not the same.
|
||||
if (key != switched_inj[{group.name(), phase}][sz-2]) {
|
||||
if (wellModel_.comm().rank() == 0) {
|
||||
std::ostringstream os;
|
||||
os << phase;
|
||||
const std::string msg =
|
||||
fmt::format("Group control for {} injector group {} is oscillating. Group control kept at {}.",
|
||||
std::move(os).str(),
|
||||
group.name(),
|
||||
key);
|
||||
deferred_logger.info(msg);
|
||||
}
|
||||
switched_inj[{group.name(), phase}].push_back(key);
|
||||
}
|
||||
group_is_oscillating = true;
|
||||
break;
|
||||
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) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ctrls.back() != *(ctrls.end() - 2)) {
|
||||
if (wellModel_.comm().rank() == 0 ) {
|
||||
std::ostringstream os;
|
||||
os << phase;
|
||||
const std::string msg =
|
||||
fmt::format("Group control for {} injector group {} is oscillating. Group control kept at {}.",
|
||||
std::move(os).str(),
|
||||
group.name(),
|
||||
Group::InjectionCMode2String(ctrl));
|
||||
deferred_logger.info(msg);
|
||||
}
|
||||
ctrls.push_back(ctrl);
|
||||
}
|
||||
group_is_oscillating = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (group_is_oscillating) {
|
||||
continue;
|
||||
}
|
||||
@ -611,8 +612,8 @@ updateGroupIndividualControl(const Group& group,
|
||||
phase);
|
||||
if (changed_this.first != Group::InjectionCMode::NONE)
|
||||
{
|
||||
switched_inj[{group.name(), phase}].push_back(
|
||||
Group::InjectionCMode2String(changed_this.first));
|
||||
switched_inj[group.name()][static_cast<std::underlying_type_t<Phase>>(phase)].push_back(
|
||||
changed_this.first);
|
||||
|
||||
this->actionOnBrokenConstraints(group, changed_this.first, phase,
|
||||
group_state, deferred_logger);
|
||||
@ -629,23 +630,24 @@ updateGroupIndividualControl(const Group& group,
|
||||
}
|
||||
if (group.isProductionGroup()) {
|
||||
|
||||
if (switched_prod.count(group.name()) > 0) {
|
||||
for (const auto& key : switched_prod[group.name()]) {
|
||||
if (std::count(switched_prod[group.name()].begin(), switched_prod[group.name()].end(), key) >= max_number_of_group_switch) {
|
||||
const size_t sz = switched_prod[group.name()].size();
|
||||
// only output on rank 0 and if the two last keys are not the same.
|
||||
if (key != switched_prod[group.name()][sz-2]) {
|
||||
if (wellModel_.comm().rank() == 0) {
|
||||
const std::string msg =
|
||||
fmt::format("Group control for production group {} is oscillating. Group control kept at {}.",
|
||||
group.name(),
|
||||
key);
|
||||
deferred_logger.info(msg);
|
||||
}
|
||||
switched_prod[group.name()].push_back(key);
|
||||
}
|
||||
return false;
|
||||
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) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ctrls.back() != *(ctrls.end() - 2)) {
|
||||
if (wellModel_.comm().rank() == 0) {
|
||||
const std::string msg =
|
||||
fmt::format("Group control for production group {} is oscillating. Group control kept at {}.",
|
||||
group.name(),
|
||||
Group::ProductionCMode2String(ctrl));
|
||||
deferred_logger.info(msg);
|
||||
}
|
||||
ctrls.push_back(ctrl);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -664,8 +666,7 @@ updateGroupIndividualControl(const Group& group,
|
||||
group_state, deferred_logger);
|
||||
|
||||
if(changed) {
|
||||
switched_prod[group.name()].push_back(
|
||||
Group::ProductionCMode2String(changed_this.first));
|
||||
switched_prod[group.name()].push_back(changed_this.first);
|
||||
WellGroupHelpers<Scalar>::updateWellRatesFromGroupTargetScale(changed_this.second,
|
||||
group,
|
||||
wellModel_.schedule(),
|
||||
|
||||
@ -74,8 +74,8 @@ public:
|
||||
bool updateGroupIndividualControl(const Group& group,
|
||||
const int reportStepIdx,
|
||||
const int max_number_of_group_switch,
|
||||
std::map<std::pair<std::string,Phase>,std::vector<std::string>>& switched_inj,
|
||||
std::map<std::string, std::vector<std::string>>& switched_prod,
|
||||
std::map<std::string, std::array<std::vector<Group::InjectionCMode>, 3>>& switched_inj,
|
||||
std::map<std::string, std::vector<Group::ProductionCMode>>& switched_prod,
|
||||
std::map<std::string, std::pair<std::string, std::string>>& closed_offending_wells,
|
||||
GroupState<Scalar>& group_state,
|
||||
WellState<Scalar>& well_state,
|
||||
|
||||
@ -628,29 +628,31 @@ checkGroupHigherConstraints(const Group& group,
|
||||
const Phase all[] = { Phase::WATER, Phase::OIL, Phase::GAS };
|
||||
for (Phase phase : all) {
|
||||
bool group_is_oscillating = false;
|
||||
if (switched_inj_groups_.count({group.name(), phase}) > 0) {
|
||||
for (const auto& key : switched_inj_groups_[{group.name(), phase}]) {
|
||||
if (std::count(switched_inj_groups_[{group.name(), phase}].begin(), switched_inj_groups_[{group.name(), phase}].end(), key) >= max_number_of_group_switch) {
|
||||
const size_t sz = switched_inj_groups_[{group.name(), phase}].size();
|
||||
// only output if the two last keys are not the same.
|
||||
if (key != switched_inj_groups_[{group.name(), phase}][sz-2]) {
|
||||
if (comm_.rank() == 0 ) {
|
||||
std::ostringstream os;
|
||||
os << phase;
|
||||
const std::string msg =
|
||||
fmt::format("Group control for {} injector group {} is oscillating. Group control kept at {}.",
|
||||
std::move(os).str(),
|
||||
group.name(),
|
||||
key);
|
||||
deferred_logger.info(msg);
|
||||
}
|
||||
switched_inj_groups_[{group.name(), phase}].push_back(key);
|
||||
}
|
||||
group_is_oscillating = true;
|
||||
break;
|
||||
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) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ctrls.back() != *(ctrls.end() - 2)) {
|
||||
if (comm_.rank() == 0 ) {
|
||||
std::ostringstream os;
|
||||
os << phase;
|
||||
const std::string msg =
|
||||
fmt::format("Group control for {} injector group {} is oscillating. Group control kept at {}.",
|
||||
std::move(os).str(),
|
||||
group.name(),
|
||||
Group::InjectionCMode2String(ctrl));
|
||||
deferred_logger.info(msg);
|
||||
}
|
||||
ctrls.push_back(ctrl);
|
||||
}
|
||||
group_is_oscillating = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (group_is_oscillating) {
|
||||
continue;
|
||||
}
|
||||
@ -676,7 +678,7 @@ checkGroupHigherConstraints(const Group& group,
|
||||
resv_coeff_inj,
|
||||
deferred_logger);
|
||||
if (is_changed) {
|
||||
switched_inj_groups_[{group.name(), phase}].push_back(Group::InjectionCMode2String(Group::InjectionCMode::FLD));
|
||||
switched_inj_groups_[group.name()][static_cast<std::underlying_type_t<Phase>>(phase)].push_back(Group::InjectionCMode::FLD);
|
||||
BlackoilWellModelConstraints(*this).
|
||||
actionOnBrokenConstraints(group, Group::InjectionCMode::FLD,
|
||||
phase, this->groupState(),
|
||||
@ -700,23 +702,24 @@ checkGroupHigherConstraints(const Group& group,
|
||||
// So when checking constraints, current groups rate must also be subtracted it's reduction rate
|
||||
const std::vector<Scalar> reduction_rates = this->groupState().production_reduction_rates(group.name());
|
||||
|
||||
if (switched_prod_groups_.count(group.name()) > 0) {
|
||||
for (const auto& key : switched_prod_groups_[group.name()]) {
|
||||
if (std::count(switched_prod_groups_[group.name()].begin(), switched_prod_groups_[group.name()].end(), key) >= max_number_of_group_switch) {
|
||||
const size_t sz = switched_prod_groups_[group.name()].size();
|
||||
// only output on rank 0 and if the two last keys are not the same.
|
||||
if (key != switched_prod_groups_[group.name()][sz-2]) {
|
||||
if (comm_.rank() == 0) {
|
||||
const std::string msg =
|
||||
fmt::format("Group control for production group {} is oscillating. Group control kept at {}.",
|
||||
group.name(),
|
||||
key);
|
||||
deferred_logger.info(msg);
|
||||
}
|
||||
switched_prod_groups_[group.name()].push_back(key);
|
||||
}
|
||||
return false;
|
||||
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) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ctrls.back() != *(ctrls.end() - 2)) {
|
||||
if (comm_.rank() == 0) {
|
||||
const std::string msg =
|
||||
fmt::format("Group control for production group {} is oscillating. Group control kept at {}.",
|
||||
group.name(),
|
||||
Group::ProductionCMode2String(ctrl));
|
||||
deferred_logger.info(msg);
|
||||
}
|
||||
ctrls.push_back(ctrl);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
for (int phasePos = 0; phasePos < phase_usage_.num_phases; ++phasePos) {
|
||||
@ -762,7 +765,7 @@ checkGroupHigherConstraints(const Group& group,
|
||||
deferred_logger);
|
||||
|
||||
if (changed) {
|
||||
switched_prod_groups_[group.name()].push_back(Group::ProductionCMode2String(Group::ProductionCMode::FLD));
|
||||
switched_prod_groups_[group.name()].push_back(Group::ProductionCMode::FLD);
|
||||
WellGroupHelpers<Scalar>::updateWellRatesFromGroupTargetScale(scaling_factor,
|
||||
group,
|
||||
schedule(),
|
||||
|
||||
@ -599,8 +599,8 @@ protected:
|
||||
bool wellStructureChangedDynamically_{false};
|
||||
|
||||
// Store maps of group name and new group controls for output
|
||||
std::map<std::string, std::vector<std::string>> switched_prod_groups_;
|
||||
std::map<std::pair<std::string, Phase>, std::vector<std::string>> switched_inj_groups_;
|
||||
std::map<std::string, std::vector<Group::ProductionCMode>> switched_prod_groups_;
|
||||
std::map<std::string, std::array<std::vector<Group::InjectionCMode>, 3>> switched_inj_groups_;
|
||||
// Store map of group name and close offending well for output
|
||||
std::map<std::string, std::pair<std::string, std::string>> closed_offending_wells_;
|
||||
|
||||
|
||||
@ -749,29 +749,42 @@ namespace Opm {
|
||||
// report group switching
|
||||
if (this->terminal_output_) {
|
||||
|
||||
for (const auto& [name, to] : this->switched_prod_groups_) {
|
||||
for (const auto& [name, ctrls] : this->switched_prod_groups_) {
|
||||
const Group::ProductionCMode& oldControl = this->prevWGState().group_state.production_control(name);
|
||||
std::string from = Group::ProductionCMode2String(oldControl);
|
||||
if (to.back() != from) {
|
||||
std::string to = Group::ProductionCMode2String(ctrls.back());
|
||||
if (ctrls.back() != oldControl) {
|
||||
std::string msg = " Production Group " + name
|
||||
+ " control mode changed from ";
|
||||
msg += from;
|
||||
msg += " to " + to.back();
|
||||
msg += " to " + to;
|
||||
local_deferredLogger.info(msg);
|
||||
}
|
||||
}
|
||||
for (const auto& [key, to] : this->switched_inj_groups_) {
|
||||
const std::string& name = key.first;
|
||||
const Opm::Phase& phase = key.second;
|
||||
|
||||
const Group::InjectionCMode& oldControl = this->prevWGState().group_state.injection_control(name, phase);
|
||||
std::string from = Group::InjectionCMode2String(oldControl);
|
||||
if (to.back() != from) {
|
||||
std::string msg = " Injection Group " + name
|
||||
+ " control mode changed from ";
|
||||
msg += from;
|
||||
msg += " to " + to.back();
|
||||
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)];
|
||||
|
||||
if (ctrls.empty()) {
|
||||
continue;
|
||||
}
|
||||
if ( !this->prevWGState().group_state.has_injection_control(grname, phase))
|
||||
continue;
|
||||
|
||||
const Group::InjectionCMode& oldControl = this->prevWGState().group_state.injection_control(grname, phase);
|
||||
std::string from = Group::InjectionCMode2String(oldControl);
|
||||
std::string to = Group::InjectionCMode2String(ctrls.back());
|
||||
if (ctrls.back() != oldControl) {
|
||||
std::string msg = " Injection Group " + grname
|
||||
+ " control mode changed from ";
|
||||
msg += from;
|
||||
msg += " to " + to;
|
||||
local_deferredLogger.info(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -332,8 +332,9 @@ public:
|
||||
last_valid_wgstate_ = WGState<double>::serializationTestObject(dummy);
|
||||
nupcol_wgstate_ = WGState<double>::serializationTestObject(dummy);
|
||||
last_glift_opt_time_ = 5.0;
|
||||
switched_prod_groups_ = {{"test4", {"test5", "test6"}}};
|
||||
switched_inj_groups_ = {{{"test4", Phase::SOLVENT}, {"test5", "test6"}}};
|
||||
switched_prod_groups_ = {{"test4", {Group::ProductionCMode::NONE, Group::ProductionCMode::ORAT}}};
|
||||
const auto controls = {Group::InjectionCMode::NONE, Group::InjectionCMode::RATE, Group::InjectionCMode::RATE };
|
||||
switched_inj_groups_ = {{"test4", {controls, {}, controls} }};
|
||||
closed_offending_wells_ = {{"test4", {"test5", "test6"}}};
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user