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

Separately load active and requested group control from restart file

Browse Source 
Use named constants for access to IGRP vector
This commit is contained in:
Joakim Hove 2020-10-27 20:48:03 +01:00
parent 30a897e89d
commit 92bf4a96ea
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/io/eclipse/rst/group.hpp
View File

@ -41,7 +41,8 @@ struct RstGroup {
std::string name;
int parent_group;
int prod_cmode;
int prod_active_cmode;
int gconprod_cmode;
int winj_cmode;
int ginj_cmode;
int guide_rate_def;

3
opm/output/eclipse/VectorItems/group.hpp
View File

@ -56,9 +56,10 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
// Observe that these value should not be used as ordinary indices into
// the the IGRP vector, they should all be used as IGRP[NWGMAX + $index]
enum index : std::vector<int>::size_type {
ProdCMode = 1,
ProdActiveCMode = 1,
GuideRateDef = 6,
WInjCMode = 16,
GConProdCMode = 10,
GInjCMode = 21,
ParentGroup = 28,
};

3
src/opm/io/eclipse/rst/group.cpp
View File

@ -40,7 +40,8 @@ RstGroup::RstGroup(const ::Opm::UnitSystem& unit_system,
const double * xgrp) :
name(trim_copy(zwel[0])),
parent_group(igrp[header.nwgmax + VI::IGroup::ParentGroup] ),
prod_cmode(igrp[header.nwgmax + VI::IGroup::ProdCMode]),
prod_active_cmode(igrp[header.nwgmax + VI::IGroup::ProdActiveCMode]),
gconprod_cmode(igrp[header.nwgmax + VI::IGroup::GConProdCMode]),
winj_cmode(igrp[header.nwgmax + VI::IGroup::WInjCMode]),
ginj_cmode(igrp[header.nwgmax + VI::IGroup::GInjCMode]),
guide_rate_def(igrp[header.nwgmax + VI::IGroup::GuideRateDef]),

36
src/opm/output/eclipse/AggregateGroupData.cpp
View File

@ -574,73 +574,73 @@ void productionGroup(const Opm::Schedule& sched,
using IGroup = ::Opm::RestartIO::Helpers::VectorItems::IGroup::index;
namespace Value = ::Opm::RestartIO::Helpers::VectorItems::IGroup::Value;
if (higher_lev_ctrl > 0 && (group.getGroupType() != Opm::Group::GroupType::NONE)) {
iGrp[nwgmax + IGroup::ProdCMode]
iGrp[nwgmax + IGroup::ProdActiveCMode]
= (prod_guide_rate_def != Opm::Group::GuideRateTarget::NO_GUIDE_RATE) ? higher_lev_ctrl_mode : 0;
} else {
switch (pctl_mode) {
case Opm::Group::ProductionCMode::NONE:
iGrp[nwgmax + IGroup::ProdCMode] = 0;
iGrp[nwgmax + IGroup::ProdActiveCMode] = 0;
break;
case Opm::Group::ProductionCMode::ORAT:
iGrp[nwgmax + IGroup::ProdCMode] = 1;
iGrp[nwgmax + IGroup::ProdActiveCMode] = 1;
break;
case Opm::Group::ProductionCMode::WRAT:
iGrp[nwgmax + IGroup::ProdCMode] = 2;
iGrp[nwgmax + IGroup::ProdActiveCMode] = 2;
break;
case Opm::Group::ProductionCMode::GRAT:
iGrp[nwgmax + IGroup::ProdCMode] = 3;
iGrp[nwgmax + IGroup::ProdActiveCMode] = 3;
break;
case Opm::Group::ProductionCMode::LRAT:
iGrp[nwgmax + IGroup::ProdCMode] = 4;
iGrp[nwgmax + IGroup::ProdActiveCMode] = 4;
break;
case Opm::Group::ProductionCMode::RESV:
iGrp[nwgmax + IGroup::ProdCMode] = 5;
iGrp[nwgmax + IGroup::ProdActiveCMode] = 5;
break;
case Opm::Group::ProductionCMode::FLD:
iGrp[nwgmax + IGroup::ProdCMode] = 0; // need to be checked!!
iGrp[nwgmax + IGroup::ProdActiveCMode] = 0; // need to be checked!!
break;
default:
iGrp[nwgmax + IGroup::ProdCMode] = 0;
iGrp[nwgmax + IGroup::ProdActiveCMode] = 0;
}
}
iGrp[nwgmax + 9] = iGrp[nwgmax + IGroup::ProdCMode];
iGrp[nwgmax + 9] = iGrp[nwgmax + IGroup::ProdActiveCMode];
iGrp[nwgmax + IGroup::GuideRateDef] = Value::GuideRateMode::None;
switch (prod_cmode) {
case Opm::Group::ProductionCMode::NONE:
iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? 0 : 4;
iGrp[nwgmax + 10] = 0;
iGrp[nwgmax + IGroup::GConProdCMode] = 0;
break;
case Opm::Group::ProductionCMode::ORAT:
iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? -40000 : 4;
iGrp[nwgmax + 10] = 1;
iGrp[nwgmax + IGroup::GConProdCMode] = 1;
break;
case Opm::Group::ProductionCMode::WRAT:
iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? -4000 : 4;
iGrp[nwgmax + 10] = 2;
iGrp[nwgmax + IGroup::GConProdCMode] = 2;
break;
case Opm::Group::ProductionCMode::GRAT:
iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? -400 : 4;
iGrp[nwgmax + 10] = 3;
iGrp[nwgmax + IGroup::GConProdCMode] = 3;
break;
case Opm::Group::ProductionCMode::LRAT:
iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? -40 : 4;
iGrp[nwgmax + 10] = 4;
iGrp[nwgmax + IGroup::GConProdCMode] = 4;
break;
case Opm::Group::ProductionCMode::RESV:
iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? -4 : 4; // need to be checked
iGrp[nwgmax + 10] = 5;
iGrp[nwgmax + IGroup::GConProdCMode] = 5;
break;
case Opm::Group::ProductionCMode::FLD:
if ((higher_lev_ctrl > 0) && (prod_guide_rate_def != Opm::Group::GuideRateTarget::NO_GUIDE_RATE)) {
iGrp[nwgmax + IGroup::GuideRateDef] = Value::GuideRateMode::Form;
}
iGrp[nwgmax + 7] = (p_exceed_act == Opm::Group::ExceedAction::NONE) ? 4 : 4;
iGrp[nwgmax + 10] = 0; // need to be checked!!
iGrp[nwgmax + IGroup::GConProdCMode] = 0; // need to be checked!!
break;
default:
iGrp[nwgmax + 7] = 0;
iGrp[nwgmax + 10] = 0; // need to be checked!!
iGrp[nwgmax + IGroup::GConProdCMode] = 0; // need to be checked!!
}
}