diff --git a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp b/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp index 1992406da..a871a2ae8 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp @@ -135,8 +135,8 @@ public: int update(const UDQConfig& udq_config, const UDAValue& uda, const std::string& wgname, UDAControl control); explicit operator bool() const; - const std::vector& get_iuad() const; - std::vector get_iuap() const; + const std::vector& iuad() const; + std::vector iuap() const; bool operator==(const UDQActive& data) const; diff --git a/src/opm/output/eclipse/AggregateUDQData.cpp b/src/opm/output/eclipse/AggregateUDQData.cpp index 416b88432..43d729681 100644 --- a/src/opm/output/eclipse/AggregateUDQData.cpp +++ b/src/opm/output/eclipse/AggregateUDQData.cpp @@ -825,7 +825,7 @@ captureDeclaredUDQData(const Opm::Schedule& sched, const auto& udq_active = sched[simStep].udq_active.get(); if (udq_active) { - const auto& udq_records = udq_active.get_iuad(); + const auto& udq_records = udq_active.iuad(); int cnt_iuad = 0; for (std::size_t index = 0; index < udq_records.size(); index++) { const auto& record = udq_records[index]; @@ -841,7 +841,7 @@ captureDeclaredUDQData(const Opm::Schedule& sched, if (cnt_iuad != inteHead[VI::intehead::NO_IUADS]) OpmLog::error(fmt::format("Inconsistent number of iuad's: {} number of iuads from intehead {}", cnt_iuad, inteHead[VI::intehead::NO_IUADS])); - const auto& iuap_records = udq_active.get_iuap(); + const auto& iuap_records = udq_active.iuap(); int cnt_iuap = 0; const auto iuap_vect = iuap_data(sched, simStep,iuap_records); for (std::size_t index = 0; index < iuap_vect.size(); index++) { diff --git a/src/opm/output/eclipse/CreateInteHead.cpp b/src/opm/output/eclipse/CreateInteHead.cpp index a45598e17..ac4569b1c 100755 --- a/src/opm/output/eclipse/CreateInteHead.cpp +++ b/src/opm/output/eclipse/CreateInteHead.cpp @@ -172,7 +172,7 @@ namespace { } const auto& udqAct = sched[simStep].udq_active.get(); - const auto& iuad = udqAct.get_iuad(); + const auto& iuad = udqAct.iuad(); return std::count_if(iuad.begin(), iuad.end(), [](const Opm::UDQActive::Record rec) { return (!(((Opm::UDQ::keyword(rec.control) == Opm::UDAKeyword::GCONPROD) || (Opm::UDQ::keyword(rec.control) == Opm::UDAKeyword::GCONINJE)) @@ -188,7 +188,7 @@ namespace { } const auto& udqAct = sched[simStep].udq_active.get(); - const auto& iuap = udqAct.get_iuap(); + const auto& iuap = udqAct.iuap(); return std::count_if(iuap.begin(), iuap.end(), [](const Opm::UDQActive::InputRecord rec) { return (!(((Opm::UDQ::keyword(rec.control) == Opm::UDAKeyword::GCONPROD) || (Opm::UDQ::keyword(rec.control) == Opm::UDAKeyword::GCONINJE)) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp index 5d7ab3b12..95801d2ea 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.cpp @@ -121,7 +121,7 @@ int UDQActive::update(const UDQConfig& udq_config, const UDAValue& uda, const st } -const std::vector& UDQActive::get_iuad() const { +const std::vector& UDQActive::iuad() const { if (this->output_data.empty()) { for (const auto& input_record : this->input_data) { const auto& udq = input_record.udq; @@ -150,7 +150,7 @@ const std::vector& UDQActive::get_iuad() const { return this->output_data; } -std::vector UDQActive::get_iuap() const { +std::vector UDQActive::iuap() const { std::vector iuap_data; auto input_rcpy = this->input_data; while (!input_rcpy.empty()) { diff --git a/tests/parser/UDQTests.cpp b/tests/parser/UDQTests.cpp index b3577ea47..cc14dd838 100644 --- a/tests/parser/UDQTests.cpp +++ b/tests/parser/UDQTests.cpp @@ -1485,18 +1485,18 @@ BOOST_AUTO_TEST_CASE(UDQ_USAGE) { UDQActive usage; UDQParams params; UDQConfig conf(params); - BOOST_CHECK_EQUAL( usage.get_iuad().size(), 0U ); + BOOST_CHECK_EQUAL( usage.iuad().size(), 0U ); UDAValue uda1("WUX"); conf.add_assign(uda1.get(), std::vector{}, 100, 0); - const auto& iuad = usage.get_iuad(); + const auto& iuad = usage.iuad(); usage.update(conf, uda1, "W1", UDAControl::WCONPROD_ORAT); - BOOST_CHECK_EQUAL( usage.get_iuad().size(), 1U); + BOOST_CHECK_EQUAL( usage.iuad().size(), 1U); BOOST_CHECK_EQUAL( iuad[0].use_count, 1U); usage.update(conf, uda1, "W1", UDAControl::WCONPROD_GRAT); - BOOST_CHECK_EQUAL( usage.get_iuad().size(), 2U); + BOOST_CHECK_EQUAL( usage.iuad().size(), 2U); BOOST_CHECK_EQUAL( iuad[1].use_count, 1U); const auto& rec = iuad[0]; @@ -1504,7 +1504,7 @@ BOOST_AUTO_TEST_CASE(UDQ_USAGE) { BOOST_CHECK(rec.control == UDAControl::WCONPROD_ORAT); - for (std::size_t index = 0; index < usage.get_iuad().size(); index++) { + for (std::size_t index = 0; index < usage.iuad().size(); index++) { const auto& record = iuad[index]; BOOST_CHECK_EQUAL(record.input_index, 0U); @@ -1579,7 +1579,7 @@ BOOST_AUTO_TEST_CASE(IntegrationTest) { auto schedule = make_schedule(deck_string); { const auto& udq_active = schedule[1].udq_active.get(); - const auto& active = udq_active.get_iuad(); + const auto& active = udq_active.iuad(); BOOST_CHECK_EQUAL(active.size(), 6U); BOOST_CHECK(active[0].control == UDAControl::WCONPROD_ORAT); @@ -1662,7 +1662,7 @@ WCONPROD const auto& udq_active = schedule[0].udq_active.get(); BOOST_CHECK(udq_active); - const auto& iuad = udq_active.get_iuad(); + const auto& iuad = udq_active.iuad(); BOOST_CHECK_EQUAL(iuad.size(), 2U); const auto& record0 = iuad[0]; BOOST_CHECK_EQUAL( record0.uad_code, 300004); @@ -1683,7 +1683,7 @@ WCONPROD // - The new UDQs WUXO and WUXL are now used for the PROD2 well. const auto& udq_active = schedule[1].udq_active.get(); BOOST_CHECK(udq_active); - const auto& iuad = udq_active.get_iuad(); + const auto& iuad = udq_active.iuad(); BOOST_CHECK_EQUAL(iuad.size(), 4U); const auto& record0 = iuad[0]; @@ -1717,7 +1717,7 @@ WCONPROD // - The PROD1 well does not use UDQ const auto& udq_active = schedule[2].udq_active.get(); BOOST_CHECK(udq_active); - const auto& iuad = udq_active.get_iuad(); + const auto& iuad = udq_active.iuad(); BOOST_CHECK_EQUAL(iuad.size(), 2U); const auto& record0 = iuad[0];