From 60f0c3f260b8e2b25ff382b431228e3f30e4282b Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Thu, 7 Oct 2021 15:12:06 +0200 Subject: [PATCH] WellTestState::closeWell -> WellTestState::close_well --- .../Schedule/Well/WellTestState.hpp | 2 +- .../Schedule/Well/WellTestState.cpp | 2 +- tests/parser/WTEST.cpp | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp index e5c95eb20..78de63f21 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.hpp @@ -141,7 +141,7 @@ public: The simulator has decided to close a particular well; we then add it here as a closed well with a particualar reason. */ - void closeWell(const std::string& well_name, WellTestConfig::Reason reason, double sim_time); + void close_well(const std::string& well_name, WellTestConfig::Reason reason, double sim_time); /* The simulator has decided to close a particular completion in a well; we then add it here diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp index cc738be78..a9676df55 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Well/WellTestState.cpp @@ -26,7 +26,7 @@ namespace Opm { - void WellTestState::closeWell(const std::string& well_name, WellTestConfig::Reason reason, double sim_time) { + void WellTestState::close_well(const std::string& well_name, WellTestConfig::Reason reason, double sim_time) { WTestWell* well_ptr = getWell(well_name, reason); diff --git a/tests/parser/WTEST.cpp b/tests/parser/WTEST.cpp index 578b957b3..fb0beb7ca 100644 --- a/tests/parser/WTEST.cpp +++ b/tests/parser/WTEST.cpp @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(WTEST_STATE2) { WellTestConfig wc; WellTestState st; wc.add_well("WELL_NAME", "P", 0, 0, 0, 0); - st.closeWell("WELL_NAME", WellTestConfig::Reason::PHYSICAL, 100); + st.close_well("WELL_NAME", WellTestConfig::Reason::PHYSICAL, 100); BOOST_CHECK_EQUAL(st.num_closed_wells(), 1U); const UnitSystem us{}; @@ -91,19 +91,19 @@ BOOST_AUTO_TEST_CASE(WTEST_STATE2) { BOOST_AUTO_TEST_CASE(WTEST_STATE) { const double day = 86400.; WellTestState st; - st.closeWell("WELL_NAME", WellTestConfig::Reason::ECONOMIC, 100. * day); + st.close_well("WELL_NAME", WellTestConfig::Reason::ECONOMIC, 100. * day); BOOST_CHECK_EQUAL(st.num_closed_wells(), 1U); st.openWell("WELL_NAME", WellTestConfig::Reason::ECONOMIC); BOOST_CHECK_EQUAL(st.num_closed_wells(), 0); - st.closeWell("WELL_NAME", WellTestConfig::Reason::ECONOMIC, 100. * day); + st.close_well("WELL_NAME", WellTestConfig::Reason::ECONOMIC, 100. * day); BOOST_CHECK_EQUAL(st.num_closed_wells(), 1U); - st.closeWell("WELL_NAME", WellTestConfig::Reason::PHYSICAL, 100. * day); + st.close_well("WELL_NAME", WellTestConfig::Reason::PHYSICAL, 100. * day); BOOST_CHECK_EQUAL(st.num_closed_wells(), 2U); - st.closeWell("WELLX", WellTestConfig::Reason::PHYSICAL, 100. * day); + st.close_well("WELLX", WellTestConfig::Reason::PHYSICAL, 100. * day); BOOST_CHECK_EQUAL(st.num_closed_wells(), 3U); const UnitSystem us{}; @@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(WTEST_STATE) { st.openWell("WELL_NAME", WellTestConfig::Reason::PHYSICAL); - st.closeWell("WELL_NAME", WellTestConfig::Reason::PHYSICAL, 1900. * day); + st.close_well("WELL_NAME", WellTestConfig::Reason::PHYSICAL, 1900. * day); // We should not test it: BOOST_CHECK_EQUAL( st.updateWells(wc, wells, 2400. * day).size(), 0U); @@ -202,9 +202,9 @@ BOOST_AUTO_TEST_CASE(WTEST_PACK_UNPACK) { st.close_completion("WELL_NAME", 3, 100); st.close_completion("WELLX", 3, 100); - st.closeWell("WELL_NAME", WellTestConfig::Reason::ECONOMIC, 100); - st.closeWell("WELL_NAME", WellTestConfig::Reason::PHYSICAL, 100); - st.closeWell("WELLX", WellTestConfig::Reason::PHYSICAL, 100); + st.close_well("WELL_NAME", WellTestConfig::Reason::ECONOMIC, 100); + st.close_well("WELL_NAME", WellTestConfig::Reason::PHYSICAL, 100); + st.close_well("WELLX", WellTestConfig::Reason::PHYSICAL, 100); BOOST_CHECK(!(st == st2));