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

Merge pull request #899 from joakim-hove/invalid-group-rate

Browse Source 
Remove #define INVALID_GROUP_RATE - just use 0
This commit is contained in:
Joakim Hove
2019-07-24 08:10:50 +02:00
committed by GitHub
parent 5b1020151b 5a39b0e249
commit 28e0b1cc3a
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/opm/parser/eclipse/EclipseState/Schedule/Group/Group.cpp
View File

@@ -22,19 +22,16 @@
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
#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) :

4
tests/parser/ScheduleTests.cpp
View File

@@ -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) {