From 5a39b0e2492a86d462812c77d12d19cc2a9bf747 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Mon, 22 Jul 2019 09:18:17 +0200 Subject: [PATCH] Remove #define INVALID_GROUP_RATE - just use 0 --- .../eclipse/EclipseState/Schedule/Group/Group.cpp | 13 +++++-------- tests/parser/ScheduleTests.cpp | 4 ---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp index 1506137f7..9f3c26efe 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp @@ -22,19 +22,16 @@ #include #include -#define INVALID_GROUP_RATE -999e100 -#define INVALID_EFFICIENCY_FACTOR 0.0 - namespace Opm { GroupProduction::ProductionData::ProductionData(const TimeMap& timeMap) : controlMode( timeMap , GroupProduction::NONE ), exceedAction( timeMap , GroupProductionExceedLimit::NONE ), - oilTarget( timeMap , INVALID_GROUP_RATE), - waterTarget( timeMap , INVALID_GROUP_RATE ), - gasTarget( timeMap , INVALID_GROUP_RATE ), - liquidTarget( timeMap , INVALID_GROUP_RATE ), - reservoirVolumeTarget( timeMap , INVALID_GROUP_RATE ) + oilTarget( timeMap , 0), + waterTarget( timeMap , 0 ), + gasTarget( timeMap , 0 ), + liquidTarget( timeMap , 0 ), + reservoirVolumeTarget( timeMap , 0 ) {} GroupInjection::InjectionData::InjectionData(const TimeMap& timeMap) : diff --git a/tests/parser/ScheduleTests.cpp b/tests/parser/ScheduleTests.cpp index 70ca55594..e6ef23c2b 100644 --- a/tests/parser/ScheduleTests.cpp +++ b/tests/parser/ScheduleTests.cpp @@ -1156,13 +1156,9 @@ BOOST_AUTO_TEST_CASE(createDeckModifyMultipleGCONPROD) { BOOST_CHECK_EQUAL(g_g1.getOilTargetRate(2), 2000 * siFactorL); auto g_g2 = schedule.getGroup("G2"); - BOOST_CHECK_EQUAL(g_g2.getOilTargetRate(1), -999e100); // Invalid group rate - default BOOST_CHECK_EQUAL(g_g2.getOilTargetRate(2), 2000 * siFactorL); auto g_h1 = schedule.getGroup("H1"); - BOOST_CHECK_EQUAL(g_h1.getOilTargetRate(0), -999e100); - BOOST_CHECK_EQUAL(g_h1.getOilTargetRate(1), -999e100); - BOOST_CHECK_EQUAL(g_h1.getOilTargetRate(2), -999e100); } BOOST_AUTO_TEST_CASE(createDeckWithDRSDT) {