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

Merge pull request #1670 from joakim-hove/esmry-rm-seqtime

Browse Source 
Esmry rm seqtime
This commit is contained in:
Joakim Hove
2020-04-02 13:59:05 +02:00
committed by GitHub
parent e3c491ad38 33ecf4215d
commit fd221bb949
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opm/io/eclipse/ESmry.hpp
View File

@@ -72,9 +72,6 @@ private:
std::unordered_map<std::string, std::string> kwunits;
std::vector<int> seqIndex;
std::vector<float> seqTime;
// start of simulation year, month, day, hr, min, microsec*1000000
std::vector<int> startdat;
std::vector<std::string> checkForMultipleResultFiles(const Opm::filesystem::path& rootN, bool formatted) const;
@@ -91,6 +88,19 @@ private:
std::string lookupKey(const SummaryNode&) const;
void write_block(std::ostream &, const std::vector<SummaryNode>&) const;
template <typename T>
std::vector<T> rstep_vector(const std::vector<T>& full_vector) const {
std::vector<T> rstep_vector;
rstep_vector.reserve(seqIndex.size());
for (const auto& ind : seqIndex){
rstep_vector.push_back(full_vector[ind]);
}
return rstep_vector;
}
};
}} // namespace Opm::EclIO

14
src/opm/io/eclipse/ESmry.cpp
View File

@@ -346,7 +346,6 @@ ESmry::ESmry(const std::string &filename, bool loadBaseRunData) :
time = tmpData[0];
if (time == 0.0) {
seqTime.push_back(time);
seqIndex.push_back(step);
}
@@ -356,12 +355,10 @@ ESmry::ESmry(const std::string &filename, bool loadBaseRunData) :
if (std::get<0>(arraySourceList[i]) == "SEQHDR") {
i++;
reportStepNumber++;
seqTime.push_back(time);
seqIndex.push_back(step);
}
} else {
reportStepNumber++;
seqTime.push_back(time);
seqIndex.push_back(step);
}
@@ -568,16 +565,7 @@ const std::vector<float>& ESmry::get(const std::string& name) const
std::vector<float> ESmry::get_at_rstep(const std::string& name) const
{
const std::vector<float> full_vector= this->get(name);
std::vector<float> rstep_vector;
rstep_vector.reserve(seqIndex.size());
for (const auto& ind : seqIndex){
rstep_vector.push_back(full_vector[ind]);
}
return rstep_vector;
return this->rstep_vector( this->get(name) );
}
int ESmry::timestepIdxAtReportstepStart(const int reportStep) const