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

Merge pull request #2915 from tskille/esmry_fix

Browse Source 
ESmry - Ignore empty keys
This commit is contained in:
Bård Skaflestad
2021-12-29 00:54:54 +01:00
committed by GitHub
parent 5cdb5c7a6e 3e69167bf9
commit 722a375f1c
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,11 +376,13 @@ ESmry::ESmry(const std::string &filename, bool loadBaseRunData) :
for (int i = 0; i < nSpecFiles; i++)
arrayPos.push_back({});
// tskille: testing
std::map<std::string, int> keyIndex;
{
size_t m = 0;
for (auto key : keywList)
keyIndex[key] = m++;
if (!key.empty())
keyIndex[key] = m++;
}
int specInd = nSpecFiles - 1;
@@ -443,14 +445,19 @@ ESmry::ESmry(const std::string &filename, bool loadBaseRunData) :
int toReportStepNumber;
int step = 0;
specInd = nSpecFiles - 1;
nVect = keywList.size();
//nVect = keywList.size();
int index = 0;
for (const auto& keyw : keywList){
keyword.push_back(keyw);
keyword_index[keyw] = index++;
for (const auto& keyw : keywList) {
if (!keyw.empty()) {
keyword.push_back(keyw);
keyword_index[keyw] = index++;
}
}
nVect = keyword.size();
vectorData.reserve(nVect);
vectorLoaded.reserve(nVect);