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

Merge pull request #1836 from joakim-hove/restartview

Browse Source 
Restartview
This commit is contained in:
Bård Skaflestad
2020-06-24 14:13:17 +02:00
committed by GitHub
parent c07aec9c68 cbe9bf2470
commit 1a0b3b418c
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/opm/output/eclipse/LoadRestart.cpp
View File

@@ -94,11 +94,21 @@ namespace {
static Opm::EclIO::eclArrType T;
};
Opm::EclIO::eclArrType ArrayType<int>::T = ::Opm::EclIO::eclArrType::INTE;
Opm::EclIO::eclArrType ArrayType<float>::T = ::Opm::EclIO::eclArrType::REAL;
Opm::EclIO::eclArrType ArrayType<double>::T = ::Opm::EclIO::eclArrType::DOUB;
template<>
struct ArrayType<std::string>
{
static Opm::EclIO::eclArrType T;
};
Opm::EclIO::eclArrType ArrayType<int>::T = ::Opm::EclIO::eclArrType::INTE;
Opm::EclIO::eclArrType ArrayType<float>::T = ::Opm::EclIO::eclArrType::REAL;
Opm::EclIO::eclArrType ArrayType<double>::T = ::Opm::EclIO::eclArrType::DOUB;
Opm::EclIO::eclArrType ArrayType<std::string>::T = ::Opm::EclIO::eclArrType::CHAR;
}
class RestartFileView
{
public:
@@ -128,8 +138,8 @@ public:
{
if (this->rst_file_ == nullptr) { return false; }
return this->vectors_
.at(ArrayType<ElmType>::T).count(vector) > 0;
const auto& coll_iter = this->vectors_.find(ArrayType<ElmType>::T);
return (coll_iter != this->vectors_.end() && this->collectionContains(coll_iter->second, vector));
}
template <typename ElmType>
@@ -164,6 +174,13 @@ private:
int report_step_;
std::size_t sim_step_;
TypedColl vectors_;
bool collectionContains(const VectorColl& coll,
const std::string& vector) const
{
return coll.find(vector) != coll.end();
}
};
RestartFileView::RestartFileView(const std::string& filename,
@@ -183,7 +200,6 @@ RestartFileView::RestartFileView(const std::string& filename,
const auto& type = std::get<1>(vector);
switch (type) {
case ::Opm::EclIO::eclArrType::CHAR:
case ::Opm::EclIO::eclArrType::LOGI:
case ::Opm::EclIO::eclArrType::MESS:
// Currently ignored