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

Merge pull request #2868 from joakim-hove/tracer-optional

Browse Source 
Use std::optional<> for tracer details
This commit is contained in:
Joakim Hove 2021-11-24 09:41:58 +01:00 committed by GitHub
commit 685c8b06f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/parser/eclipse/EclipseState/TracerConfig.hpp
View File

@ -34,10 +34,10 @@ public:
std::string name;
std::string unit_string;
Phase phase = Phase::OIL;
std::vector<double> free_concentration;
std::vector<double> solution_concentration;
TracerVdTable free_tvdp;
TracerVdTable solution_tvdp;
std::optional<std::vector<double>> free_concentration;
std::optional<std::vector<double>> solution_concentration;
std::optional<TracerVdTable> free_tvdp;
std::optional<TracerVdTable> solution_tvdp;
TracerEntry() = default;
TracerEntry(const std::string& name_, const std::string& unit_string_,
@ -92,8 +92,8 @@ public:
serializer(phase);
serializer(free_concentration);
serializer(solution_concentration);
free_tvdp.serializeOp(serializer);
solution_tvdp.serializeOp(serializer);
serializer(this->free_tvdp);
serializer(this->solution_tvdp);
}
};

8
tests/parser/TracerTests.cpp
View File

@ -80,12 +80,12 @@ BOOST_AUTO_TEST_CASE(TracerConfigTest) {
auto it = tc.begin();
BOOST_CHECK_EQUAL(it->name, "SEA");
BOOST_CHECK_EQUAL(it->phase, Phase::WATER);
BOOST_CHECK(it->free_concentration.empty());
BOOST_CHECK_EQUAL(it->free_tvdp.numColumns(), 2U);
BOOST_CHECK(!it->free_concentration.has_value());
BOOST_CHECK_EQUAL(it->free_tvdp.value().numColumns(), 2U);
++it;
BOOST_CHECK_EQUAL(it->name, "OCE");
BOOST_CHECK_EQUAL(it->phase, Phase::GAS);
BOOST_CHECK_EQUAL(it->free_concentration.size(), 3U);
BOOST_CHECK_EQUAL(it->free_tvdp.numColumns(), 0U);
BOOST_CHECK_EQUAL(it->free_concentration.value().size(), 3U);
BOOST_CHECK(!it->free_tvdp.has_value());
}