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

Merge pull request #3059 from tskille/fix_esmry_load

Browse Source 
Prevent data vector loading twice
This commit is contained in:
Bård Skaflestad 2022-06-20 20:49:29 +02:00 committed by GitHub
commit 0d6dc717d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opm/io/eclipse/ExtESmry.cpp
View File

@ -531,7 +531,7 @@ void ExtESmry::loadData(const std::vector<std::string>& stringVect)
for (const auto& key: stringVect){ for (const auto& key: stringVect){
auto key_ind = m_keyword_index[0].at(key); auto key_ind = m_keyword_index[0].at(key);
if (!m_vectorLoaded[key_ind]){ if ((!m_vectorLoaded[key_ind]) && (std::find(keyIndexVect.begin(), keyIndexVect.end(), key_ind) == keyIndexVect.end() )){
keyIndexVect.push_back(key_ind); keyIndexVect.push_back(key_ind);
loadKeyIndex.push_back(keyCounter); loadKeyIndex.push_back(keyCounter);
} }

10
tests/test_ExtESmry.cpp
View File

@ -227,6 +227,15 @@ BOOST_AUTO_TEST_CASE(TestExtESmry_1) {
BOOST_CHECK_EQUAL(fopr3a.size(), fopr3b.size()); BOOST_CHECK_EQUAL(fopr3a.size(), fopr3b.size());
ExtESmry esmry4("SPE1CASE1.ESMRY");
// vector list holding two elements of FOPR, should not be loaded twice
std::vector<std::string> vect_list{"FOPR", "WBHP:PROD", "FOPR", "FGOR"};
esmry4.loadData(vect_list);
auto fopr4a = esmry4.get("FOPR");
auto fgor4a = esmry4.get("FGOR");
BOOST_CHECK_EQUAL(fopr4a.size(), fgor4a.size());
} }
BOOST_AUTO_TEST_CASE(TestExtESmry_2) { BOOST_AUTO_TEST_CASE(TestExtESmry_2) {
@ -406,4 +415,3 @@ BOOST_AUTO_TEST_CASE(TestESmry_3) {
for (size_t n = 63; n < fopt.size(); n++) for (size_t n = 63; n < fopt.size(); n++)
BOOST_REQUIRE_CLOSE(fopt[n], fopt_rst_ref[n-63], 0.01); BOOST_REQUIRE_CLOSE(fopt[n], fopt_rst_ref[n-63], 0.01);
} }