OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename group production control mode variable

Browse Source
This commit is contained in:
Joakim Hove 2020-10-26 18:46:48 +01:00
parent 58e859fb11
commit 8e0928cc9d
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp
View File

@ -168,7 +168,7 @@ struct GroupProductionProperties {
{}
std::string name;
ProductionCMode cmode = ProductionCMode::NONE;
ProductionCMode gconprod_cmode = ProductionCMode::NONE;
ExceedAction exceed_action = ExceedAction::NONE;
UDAValue oil_target;
UDAValue water_target;
@ -189,7 +189,7 @@ struct GroupProductionProperties {
void serializeOp(Serializer& serializer)
{
serializer(name);
serializer(cmode);
serializer(gconprod_cmode);
serializer(exceed_action);
oil_target.serializeOp(serializer);
water_target.serializeOp(serializer);
@ -265,7 +265,7 @@ struct ProductionControls {
const GroupProductionProperties& productionProperties() const;
const std::map<Phase , GroupInjectionProperties>& injectionProperties() const;
const GroupType& getGroupType() const;
ProductionCMode production_cmode() const;
ProductionCMode gconprod_cmode() const;
InjectionCMode injection_cmode() const;
Phase injection_phase() const;
bool has_control(ProductionCMode control) const;

10
src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp
View File

@ -218,7 +218,7 @@ Group::GroupProductionProperties Group::GroupProductionProperties::serializeObje
{
Group::GroupProductionProperties result("Group123");
result.name = "Group123";
result.cmode = ProductionCMode::PRBL;
result.gconprod_cmode = ProductionCMode::PRBL;
result.exceed_action = ExceedAction::WELL;
result.oil_target = UDAValue(1.0);
result.water_target = UDAValue(2.0);
@ -236,7 +236,7 @@ Group::GroupProductionProperties Group::GroupProductionProperties::serializeObje
bool Group::GroupProductionProperties::operator==(const GroupProductionProperties& other) const {
return
this->name == other.name &&
this->cmode == other.cmode &&
this->gconprod_cmode == other.gconprod_cmode &&
this->exceed_action == other.exceed_action &&
this->oil_target == other.oil_target &&
this->water_target == other.water_target &&
@ -439,7 +439,7 @@ bool Group::updateParent(const std::string& parent) {
Group::ProductionControls Group::productionControls(const SummaryState& st) const {
Group::ProductionControls pc;
pc.cmode = this->production_properties.cmode;
pc.cmode = this->production_properties.gconprod_cmode;
pc.exceed_action = this->production_properties.exceed_action;
pc.oil_target = UDA::eval_group_uda(this->production_properties.oil_target, this->m_name, st, this->udq_undefined);
pc.water_target = UDA::eval_group_uda(this->production_properties.water_target, this->m_name, st, this->udq_undefined);
@ -479,8 +479,8 @@ bool Group::hasInjectionControl(Phase phase) const {
Group::ProductionCMode Group::production_cmode() const {
return this->production_properties.cmode;
Group::ProductionCMode Group::gconprod_cmode() const {
return this->production_properties.gconprod_cmode;
}
bool Group::ProductionControls::has_control(Group::ProductionCMode control) const {

10
src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp
View File

@ -366,7 +366,7 @@ namespace {
{
auto group_ptr = std::make_shared<Group>(this->getGroup(group_name, handlerContext.currentStep));
Group::GroupProductionProperties production(group_name);
production.cmode = controlMode;
production.gconprod_cmode = controlMode;
production.oil_target = oil_target;
production.gas_target = gas_target;
production.water_target = water_target;
@ -376,10 +376,10 @@ namespace {
production.resv_target = resv_target;
production.available_group_control = availableForGroupControl;
if ((production.cmode == Group::ProductionCMode::ORAT) ||
(production.cmode == Group::ProductionCMode::WRAT) ||
(production.cmode == Group::ProductionCMode::GRAT) ||
(production.cmode == Group::ProductionCMode::LRAT))
if ((production.gconprod_cmode == Group::ProductionCMode::ORAT) ||
(production.gconprod_cmode == Group::ProductionCMode::WRAT) ||
(production.gconprod_cmode == Group::ProductionCMode::GRAT) ||
(production.gconprod_cmode == Group::ProductionCMode::LRAT))
production.exceed_action = Group::ExceedAction::RATE;
else
production.exceed_action = exceedAction;