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

Reworks requiredRestartVectors for Opm::EclIO::SummaryNode.

Browse Source
This commit is contained in:
Williham Williham Totland 2020-03-20 11:18:44 +01:00
parent 35afdd5131
commit 99375eb5be
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/io/eclipse/SummaryNode.hpp
View File

@ -48,6 +48,8 @@ struct SummaryNode {
const std::string wgname;
const int number;
constexpr static int default_number { std::numeric_limits<int>::min() };
std::string unique_key() const;
};

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

@ -137,41 +137,33 @@ namespace {
};
}
std::vector<Opm::SummaryConfigNode>
std::vector<Opm::EclIO::SummaryNode>
requiredRestartVectors(const ::Opm::Schedule& sched)
{
std::vector<Opm::SummaryConfigNode> entities {} ;
std::vector<Opm::EclIO::SummaryNode> entities {} ;
const auto restartVectors { requiredRestartVectors() } ;
using SN = ::Opm::SummaryConfigNode;
static const std::vector<ParamCTorArgs> extra_well_vectors {
{ "WBHP", Opm::EclIO::SummaryNode::Type::Pressure },
{ "WGVIR", Opm::EclIO::SummaryNode::Type::Rate },
{ "WWVIR", Opm::EclIO::SummaryNode::Type::Rate },
};
auto makeEntities = [&restartVectors, &entities]
(const char kwpref,
const SN::Category cat,
const Opm::EclIO::SummaryNode::Category cat,
const std::string& name) -> void
{
for (const auto& restartVector : restartVectors) {
entities.emplace_back(kwpref + restartVector.keyword, cat, ::Opm::Location());
entities.back().namedEntity(name)
.parameterType(restartVector.type);
entities.push_back({kwpref + restartVector.keyword, cat, restartVector.type, name, Opm::EclIO::SummaryNode::default_number });
}
};
for (const auto& well_name : sched.wellNames()) {
makeEntities('W', SN::Category::Well, well_name);
makeEntities('W', Opm::EclIO::SummaryNode::Category::Well, well_name);
entities.emplace_back("WBHP", SN::Category::Well, ::Opm::Location());
entities.back().namedEntity(well_name)
.parameterType(SN::Type::Pressure);
entities.emplace_back("WGVIR", SN::Category::Well, ::Opm::Location());
entities.back().namedEntity(well_name)
.parameterType(SN::Type::Rate);
entities.emplace_back("WWVIR", SN::Category::Well, ::Opm::Location());
entities.back().namedEntity(well_name)
.parameterType(SN::Type::Rate);
for (const auto &well_vector : extra_well_vectors) {
entities.push_back({ well_vector.keyword, Opm::EclIO::SummaryNode::Category::Well, well_vector.type, well_name, Opm::EclIO::SummaryNode::default_number });
}
}
for (const auto& grp_name : sched.groupNames()) {
@ -192,7 +184,7 @@ namespace {
}
}
makeEntities('F', SN::Category::Field, "FIELD");
makeEntities('F', Opm::EclIO::SummaryNode::Category::Field, "FIELD");
entities.emplace_back("FMCTP", SN::Category::Field, ::Opm::Location());
entities.back().namedEntity("FIELD")