From 91bb168ee58d40875c0f2598d4af205d50166767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Mon, 19 Oct 2020 21:16:55 +0200 Subject: [PATCH] Fix Shadowing Type Alias The local 'WellPI' type alias shadowed the name of the test. --- tests/parser/WellTests.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/parser/WellTests.cpp b/tests/parser/WellTests.cpp index e98978b55..b7288cab7 100644 --- a/tests/parser/WellTests.cpp +++ b/tests/parser/WellTests.cpp @@ -1199,7 +1199,7 @@ COMPDAT END )"); - using WellPI = Well::WellProductivityIndex; + using WellPIType = Well::WellProductivityIndex; const auto es = EclipseState{ deck }; const auto sched = Schedule{ deck, es }; @@ -1232,9 +1232,9 @@ END // / // // (ignoring units of measure) - BOOST_CHECK_MESSAGE(wellP.updateWellProductivityIndex(WellPI{ 2.0, Phase::GAS }), + BOOST_CHECK_MESSAGE(wellP.updateWellProductivityIndex(WellPIType{ 2.0, Phase::GAS }), "First call to updateWellProductivityIndex() must be a state change"); - BOOST_CHECK_MESSAGE(!wellP.updateWellProductivityIndex(WellPI{ 2.0, Phase::GAS }), + BOOST_CHECK_MESSAGE(!wellP.updateWellProductivityIndex(WellPIType{ 2.0, Phase::GAS }), "Second call to updateWellProductivityIndex() must NOT be a state change"); // Want PI=2, but actual/effective PI=1 => scale CF by 2.0/1.0. @@ -1270,7 +1270,7 @@ END } // New WELPI record does not reset the scaling factors - wellP.updateWellProductivityIndex(WellPI{ 3.0, Phase::GAS }); + wellP.updateWellProductivityIndex(WellPIType{ 3.0, Phase::GAS }); for (const auto& conn : wellP.getConnections()) { BOOST_CHECK_CLOSE(conn.CF(), 4.0*expectCF, 1.0e-10); } @@ -1291,9 +1291,9 @@ END } } - BOOST_CHECK_MESSAGE(wellP.updateWellProductivityIndex(WellPI{ 3.0, Phase::OIL }), + BOOST_CHECK_MESSAGE(wellP.updateWellProductivityIndex(WellPIType{ 3.0, Phase::OIL }), "Fourth call to updateWellProductivityIndex() must be a state change"); - BOOST_CHECK_MESSAGE(!wellP.updateWellProductivityIndex(WellPI{ 3.0, Phase::OIL }), + BOOST_CHECK_MESSAGE(!wellP.updateWellProductivityIndex(WellPIType{ 3.0, Phase::OIL }), "Fifth call to updateWellProductivityIndex() must NOT be a state change"); }