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

Use named index WInjCMode and GInjCMode

Browse Source
This commit is contained in:
Joakim Hove
2020-10-05 15:21:09 +02:00
parent 001b399d42
commit 96fdb150b1
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,8 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
namespace IGroup {
enum index : std::vector<int>::size_type {
ProdCMode = 1,
WInjCMode = 16,
GInjCMode = 21,
ParentGroup = 28,
};
}

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

@@ -661,6 +661,7 @@ void injectionGroup(const Opm::Schedule& sched,
const std::map<Opm::Group::InjectionCMode, int>& cmodeToNum,
IGrpArray& iGrp)
{
using IGroup = ::Opm::RestartIO::Helpers::VectorItems::IGroup::index;
const bool is_field = group.name() == "FIELD";
auto group_parent_list = groupParentSeqIndex(sched, group, simStep);
using IGroup = ::Opm::RestartIO::Helpers::VectorItems::IGroup::index;
@@ -742,9 +743,9 @@ void injectionGroup(const Opm::Schedule& sched,
: Opm::Group::InjectionCMode::NONE;
const auto it = cmodeToNum.find(inj_mode);
if (it != cmodeToNum.end()) {
iGrp[nwgmax + 16] = it->second;
iGrp[nwgmax + 18] = iGrp[nwgmax + 16];
iGrp[nwgmax + 19] = iGrp[nwgmax + 16];
iGrp[nwgmax + IGroup::WInjCMode] = it->second;
iGrp[nwgmax + 18] = iGrp[nwgmax + IGroup::WInjCMode];
iGrp[nwgmax + 19] = iGrp[nwgmax + IGroup::WInjCMode];
}
}
}
@@ -825,9 +826,9 @@ void injectionGroup(const Opm::Schedule& sched,
: Opm::Group::InjectionCMode::NONE;
const auto it = cmodeToNum.find(inj_mode);
if (it != cmodeToNum.end()) {
iGrp[nwgmax + 21] = it->second;
iGrp[nwgmax + 23] = iGrp[nwgmax + 21];
iGrp[nwgmax + 24] = iGrp[nwgmax + 21];
iGrp[nwgmax + IGroup::GInjCMode] = it->second;
iGrp[nwgmax + 23] = iGrp[nwgmax + IGroup::GInjCMode];
iGrp[nwgmax + 24] = iGrp[nwgmax + IGroup::GInjCMode];
}
}
}